You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/03/19 09:50:00 UTC

[01/28] struts git commit: Starting new development cycle

Repository: struts
Updated Branches:
  refs/heads/develop 4f0f7d138 -> 3e23f2191
  refs/heads/master 438d2ce24 -> 8cb1feb41


Starting new development cycle


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0b49c2c2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0b49c2c2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0b49c2c2

Branch: refs/heads/master
Commit: 0b49c2c2c95835d8c673191a9db7c081784255fb
Parents: 9bca437 f4b4ffb
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Dec 31 18:13:55 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Dec 31 18:13:55 2014 +0100

----------------------------------------------------------------------
 apps/blank/pom.xml                              | 2 +-
 apps/jboss-blank/pom.xml                        | 2 +-
 apps/mailreader/pom.xml                         | 2 +-
 apps/pom.xml                                    | 2 +-
 apps/portlet/pom.xml                            | 2 +-
 apps/rest-showcase/pom.xml                      | 4 ++--
 apps/showcase/pom.xml                           | 2 +-
 archetypes/pom.xml                              | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml      | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml     | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml    | 2 +-
 archetypes/struts2-archetype-starter/pom.xml    | 2 +-
 assembly/pom.xml                                | 2 +-
 bom/pom.xml                                     | 4 ++--
 bundles/admin/pom.xml                           | 2 +-
 bundles/demo/pom.xml                            | 2 +-
 bundles/pom.xml                                 | 2 +-
 core/pom.xml                                    | 2 +-
 plugins/cdi/pom.xml                             | 2 +-
 plugins/codebehind/pom.xml                      | 2 +-
 plugins/config-browser/pom.xml                  | 2 +-
 plugins/convention/pom.xml                      | 2 +-
 plugins/dojo/pom.xml                            | 2 +-
 plugins/dwr/pom.xml                             | 2 +-
 plugins/embeddedjsp/pom.xml                     | 2 +-
 plugins/gxp/pom.xml                             | 2 +-
 plugins/jasperreports/pom.xml                   | 2 +-
 plugins/java8-support/pom.xml                   | 5 ++---
 plugins/javatemplates/pom.xml                   | 2 +-
 plugins/jfreechart/pom.xml                      | 2 +-
 plugins/jsf/pom.xml                             | 2 +-
 plugins/json/pom.xml                            | 2 +-
 plugins/junit/pom.xml                           | 2 +-
 plugins/osgi/pom.xml                            | 2 +-
 plugins/oval/pom.xml                            | 2 +-
 plugins/pell-multipart/pom.xml                  | 2 +-
 plugins/plexus/pom.xml                          | 2 +-
 plugins/pom.xml                                 | 2 +-
 plugins/portlet-tiles/pom.xml                   | 2 +-
 plugins/portlet/pom.xml                         | 2 +-
 plugins/rest/pom.xml                            | 2 +-
 plugins/sitegraph/pom.xml                       | 2 +-
 plugins/sitemesh/pom.xml                        | 2 +-
 plugins/spring/pom.xml                          | 2 +-
 plugins/struts1/pom.xml                         | 2 +-
 plugins/testng/pom.xml                          | 2 +-
 plugins/tiles/pom.xml                           | 2 +-
 plugins/tiles3/pom.xml                          | 2 +-
 pom.xml                                         | 7 +++----
 xwork-core/pom.xml                              | 2 +-
 53 files changed, 58 insertions(+), 60 deletions(-)
----------------------------------------------------------------------



[25/28] struts git commit: [maven-release-plugin] prepare for next development iteration

Posted by lu...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3e23f219
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3e23f219
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3e23f219

Branch: refs/heads/develop
Commit: 3e23f2191ec2a9c16a5b77bf6a1c1c1dd589ddd4
Parents: 22573f8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 19 07:11:27 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 19 07:11:27 2015 +0100

----------------------------------------------------------------------
 apps/blank/pom.xml                              | 2 +-
 apps/jboss-blank/pom.xml                        | 2 +-
 apps/mailreader/pom.xml                         | 2 +-
 apps/pom.xml                                    | 2 +-
 apps/portlet/pom.xml                            | 2 +-
 apps/rest-showcase/pom.xml                      | 4 ++--
 apps/showcase/pom.xml                           | 2 +-
 archetypes/pom.xml                              | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml      | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml     | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml    | 2 +-
 archetypes/struts2-archetype-starter/pom.xml    | 2 +-
 assembly/pom.xml                                | 2 +-
 bom/pom.xml                                     | 8 ++------
 bundles/admin/pom.xml                           | 2 +-
 bundles/demo/pom.xml                            | 2 +-
 bundles/pom.xml                                 | 2 +-
 core/pom.xml                                    | 2 +-
 plugins/cdi/pom.xml                             | 2 +-
 plugins/codebehind/pom.xml                      | 2 +-
 plugins/config-browser/pom.xml                  | 2 +-
 plugins/convention/pom.xml                      | 2 +-
 plugins/dojo/pom.xml                            | 2 +-
 plugins/dwr/pom.xml                             | 2 +-
 plugins/embeddedjsp/pom.xml                     | 2 +-
 plugins/gxp/pom.xml                             | 2 +-
 plugins/jasperreports/pom.xml                   | 2 +-
 plugins/java8-support/pom.xml                   | 2 +-
 plugins/javatemplates/pom.xml                   | 2 +-
 plugins/jfreechart/pom.xml                      | 2 +-
 plugins/jsf/pom.xml                             | 2 +-
 plugins/json/pom.xml                            | 2 +-
 plugins/junit/pom.xml                           | 2 +-
 plugins/osgi/pom.xml                            | 2 +-
 plugins/oval/pom.xml                            | 2 +-
 plugins/pell-multipart/pom.xml                  | 2 +-
 plugins/plexus/pom.xml                          | 2 +-
 plugins/pom.xml                                 | 2 +-
 plugins/portlet-tiles/pom.xml                   | 2 +-
 plugins/portlet/pom.xml                         | 2 +-
 plugins/rest/pom.xml                            | 2 +-
 plugins/sitegraph/pom.xml                       | 2 +-
 plugins/sitemesh/pom.xml                        | 2 +-
 plugins/spring/pom.xml                          | 2 +-
 plugins/struts1/pom.xml                         | 2 +-
 plugins/testng/pom.xml                          | 2 +-
 plugins/tiles/pom.xml                           | 2 +-
 plugins/tiles3/pom.xml                          | 2 +-
 pom.xml                                         | 4 ++--
 xwork-core/pom.xml                              | 2 +-
 53 files changed, 56 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 48df955..4c6c6f6 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 13d5cc2..4f9a353 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jboss-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 47f0a0e..6081fae 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.3.22</version>
+      <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-mailreader</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 749f9b1..d0e67ca 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 2a2d6ec..ea5d5e7 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-portlet</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 6274423..689a3fe 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>2.3.22</version>
+    <version>2.3.23-SNAPSHOT</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 8a6966d..af5d3a1 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 137f93d..15f5f74 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-archetypes</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index 49f359b..c7d0396 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 5aace4a..e1001f9 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index 37cc459..b5c4fe2 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index 0cfe055..6440587 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 5a36f47..ac5c2f2 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 2274c56..636851c 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 121e0a5..0bc0d51 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f6486e7..dbafbc9 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index e264a1e..d337af7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>struts2-bom</artifactId>
-    <version>2.3.22</version>
+    <version>2.3.23-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -25,7 +25,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>2.3.22</struts-version.version>
+        <struts-version.version>2.3.23-SNAPSHOT</struts-version.version>
     </properties>
 
     <build>
@@ -195,8 +195,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>STRUTS_2_3_22</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 4cd5aeb..9b227f3 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 01e4f97..795868e 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index cfdf575..96105db 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-bundles</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d4b2b95..7d5f979 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 6867b8a..8ded080 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-cdi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 38b233c..7e16f92 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-codebehind-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index f152a4d..ee1c986 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-config-browser-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index f6d0bed..9f315d7 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-convention-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 90b4540..5a3e105 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>struts2-plugins</artifactId>
         <groupId>org.apache.struts</groupId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 2e3a501..40fcd16 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-dwr-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index e9d4523..d92e740 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-embeddedjsp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index a3cdd2d..9dfeb63 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-gxp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index c6452ec..422c1f7 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jasperreports-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/java8-support/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml
index d650deb..64fca31 100644
--- a/plugins/java8-support/pom.xml
+++ b/plugins/java8-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-java8-support-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 8b51fca..1710fe0 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-javatemplates-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index e65f3e0..c9fd615 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
    </parent>
 
     <artifactId>struts2-jfreechart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index ca6ebce..e7af785 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jsf-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index eb6d1db..223ca9b 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-json-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 1b37ef9..266a371 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-junit-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index c1f83e7..039e933 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 71860b2..f530ddc 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-oval-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 1ad008b..c77fbf6 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-pell-multipart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index f584393..81e5832 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-plexus-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 04d1367..864a9bd 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-plugins</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 71a43fc..4974c12 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-portlet-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index c290f6b..1386179 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-portlet-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 72aec33..3fea8c4 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 3bb22f6..935a4c4 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-sitegraph-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 09d59ce..cee9d8f 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-sitemesh-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 2ba9d25..66ce73b 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-spring-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 081dc33..c380359 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-struts1-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index ecfe46a..76b10aa 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-testng-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index bee4e72..312b77a 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 61ff58e..a21cb6e 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-tiles3-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5a2405..4580d52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-parent</artifactId>
-    <version>2.3.22</version>
+    <version>2.3.23-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/</url>
@@ -31,7 +31,7 @@
         <connection>scm:git:git://git.apache.org/struts.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
         <url>http://git.apache.org/struts.git</url>
-        <tag>STRUTS_2_3_22</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <issueManagement>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 3471d88..cc48e28 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.struts.xwork</groupId>


[28/28] struts git commit: Sets proper released version

Posted by lu...@apache.org.
Sets proper released version


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8cb1feb4
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8cb1feb4
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8cb1feb4

Branch: refs/heads/master
Commit: 8cb1feb418abe592d48d576a5b9d46d808048ded
Parents: 1a842d7
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 19 09:36:52 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 19 09:36:52 2015 +0100

----------------------------------------------------------------------
 apps/blank/pom.xml | 2 +-
 apps/pom.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/8cb1feb4/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index d0daec5..48df955 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.21</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/8cb1feb4/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 9b40d01..749f9b1 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.21</version>
+        <version>2.3.22</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>


[26/28] struts git commit: Merge branch 'release/2.3.22'

Posted by lu...@apache.org.
Merge branch 'release/2.3.22'

Conflicts:
	apps/blank/pom.xml
	apps/jboss-blank/pom.xml
	apps/mailreader/pom.xml
	apps/pom.xml
	apps/portlet/pom.xml
	apps/rest-showcase/pom.xml
	apps/showcase/pom.xml
	archetypes/pom.xml
	archetypes/struts2-archetype-angularjs/pom.xml
	archetypes/struts2-archetype-blank/pom.xml
	archetypes/struts2-archetype-convention/pom.xml
	archetypes/struts2-archetype-dbportlet/pom.xml
	archetypes/struts2-archetype-plugin/pom.xml
	archetypes/struts2-archetype-portlet/pom.xml
	archetypes/struts2-archetype-starter/pom.xml
	assembly/pom.xml
	bom/pom.xml
	bundles/admin/pom.xml
	bundles/demo/pom.xml
	bundles/pom.xml
	core/pom.xml
	plugins/cdi/pom.xml
	plugins/codebehind/pom.xml
	plugins/config-browser/pom.xml
	plugins/convention/pom.xml
	plugins/dojo/pom.xml
	plugins/dwr/pom.xml
	plugins/embeddedjsp/pom.xml
	plugins/gxp/pom.xml
	plugins/jasperreports/pom.xml
	plugins/java8-support/pom.xml
	plugins/javatemplates/pom.xml
	plugins/jfreechart/pom.xml
	plugins/jsf/pom.xml
	plugins/json/pom.xml
	plugins/junit/pom.xml
	plugins/osgi/pom.xml
	plugins/oval/pom.xml
	plugins/pell-multipart/pom.xml
	plugins/plexus/pom.xml
	plugins/pom.xml
	plugins/portlet-tiles/pom.xml
	plugins/portlet/pom.xml
	plugins/rest/pom.xml
	plugins/sitegraph/pom.xml
	plugins/sitemesh/pom.xml
	plugins/spring/pom.xml
	plugins/struts1/pom.xml
	plugins/testng/pom.xml
	plugins/tiles/pom.xml
	plugins/tiles3/pom.xml
	pom.xml
	xwork-core/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/aeed126a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/aeed126a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/aeed126a

Branch: refs/heads/master
Commit: aeed126a3eb353367855eb7de24d1f8880a31634
Parents: 438d2ce 3e23f21
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 19 09:33:17 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 19 09:33:17 2015 +0100

----------------------------------------------------------------------
 apps/jboss-blank/pom.xml                        |  2 +-
 apps/mailreader/pom.xml                         |  2 +-
 apps/pom.xml                                    |  2 +-
 apps/portlet/pom.xml                            |  2 +-
 apps/rest-showcase/pom.xml                      |  4 +-
 apps/showcase/pom.xml                           |  2 +-
 archetypes/pom.xml                              |  2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  |  2 +-
 archetypes/struts2-archetype-blank/pom.xml      |  2 +-
 archetypes/struts2-archetype-convention/pom.xml |  2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  |  2 +-
 archetypes/struts2-archetype-plugin/pom.xml     |  2 +-
 archetypes/struts2-archetype-portlet/pom.xml    |  2 +-
 archetypes/struts2-archetype-starter/pom.xml    |  2 +-
 assembly/pom.xml                                |  2 +-
 bom/pom.xml                                     |  4 +-
 bundles/admin/pom.xml                           |  2 +-
 bundles/demo/pom.xml                            |  2 +-
 bundles/pom.xml                                 |  2 +-
 core/pom.xml                                    |  2 +-
 .../org/apache/struts2/StrutsConstants.java     |  2 +
 .../apache/struts2/components/Component.java    |  8 +-
 .../org/apache/struts2/components/Date.java     |  8 ++
 .../org/apache/struts2/components/Hidden.java   |  6 --
 .../config/DefaultBeanSelectionProvider.java    |  8 ++
 .../apache/struts2/dispatcher/Dispatcher.java   |  2 +-
 .../dispatcher/ServletActionRedirectResult.java | 13 ++-
 .../dispatcher/ServletRedirectResult.java       |  6 +-
 .../struts2/dispatcher/StrutsResultSupport.java |  7 +-
 .../JakartaStreamMultiPartRequest.java          |  4 +-
 .../multipart/MultiPartRequestWrapper.java      | 11 ++-
 .../interceptor/FileUploadInterceptor.java      |  6 +-
 .../apache/struts2/util/ContentTypeMatcher.java | 16 ++++
 .../struts2/util/DefaultContentTypeMatcher.java | 20 +++++
 .../struts2/util/StrutsTestCaseHelper.java      | 30 ++++++-
 .../struts2/static/inputtransferselect.js       |  2 +-
 .../struts2/static/optiontransferselect.js      |  2 +-
 core/src/main/resources/struts-default.xml      |  2 +
 .../resources/template/css_xhtml/hidden.ftl     | 23 ++++++
 .../ServletActionRedirectResultTest.java        |  3 +-
 .../dispatcher/ServletRedirectResultTest.java   | 30 +++++++
 .../freemarker/FreemarkerResultMockedTest.java  | 84 +++++---------------
 plugins/cdi/pom.xml                             |  2 +-
 plugins/codebehind/pom.xml                      |  2 +-
 plugins/config-browser/pom.xml                  |  2 +-
 plugins/convention/pom.xml                      |  2 +-
 plugins/dojo/pom.xml                            |  2 +-
 plugins/dwr/pom.xml                             |  2 +-
 plugins/embeddedjsp/pom.xml                     |  2 +-
 plugins/gxp/pom.xml                             |  2 +-
 plugins/jasperreports/pom.xml                   |  2 +-
 plugins/java8-support/pom.xml                   |  2 +-
 plugins/javatemplates/pom.xml                   |  2 +-
 .../views/java/simple/SubmitHandler.java        |  4 +-
 plugins/jfreechart/pom.xml                      |  2 +-
 plugins/jsf/pom.xml                             |  2 +-
 plugins/json/pom.xml                            |  2 +-
 .../org/apache/struts2/json/JSONWriter.java     | 13 ++-
 plugins/junit/pom.xml                           |  2 +-
 plugins/osgi/pom.xml                            |  2 +-
 plugins/oval/pom.xml                            |  2 +-
 plugins/pell-multipart/pom.xml                  |  2 +-
 plugins/plexus/pom.xml                          |  2 +-
 plugins/pom.xml                                 |  2 +-
 plugins/portlet-tiles/pom.xml                   |  2 +-
 plugins/portlet/pom.xml                         |  2 +-
 plugins/rest/pom.xml                            |  2 +-
 plugins/sitegraph/pom.xml                       |  2 +-
 plugins/sitemesh/pom.xml                        |  2 +-
 plugins/spring/pom.xml                          |  2 +-
 plugins/struts1/pom.xml                         |  2 +-
 plugins/testng/pom.xml                          |  2 +-
 plugins/tiles/pom.xml                           |  2 +-
 plugins/tiles3/pom.xml                          |  2 +-
 pom.xml                                         |  2 +-
 xwork-core/pom.xml                              |  2 +-
 .../xwork2/ognl/OgnlValueStack.java             |  6 +-
 .../xwork2/ognl/SecurityMemberAccess.java       |  8 +-
 .../xwork2/ognl/OgnlValueStackTest.java         | 14 +++-
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 53 ++++++++++++
 80 files changed, 349 insertions(+), 150 deletions(-)
----------------------------------------------------------------------



[06/28] struts git commit: WW-4449 Extends JSONWriter to support Javassist 3.18.1 and Hibernate 4.3.7

Posted by lu...@apache.org.
WW-4449 Extends JSONWriter to support Javassist 3.18.1 and Hibernate 4.3.7


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d9973fee
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d9973fee
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d9973fee

Branch: refs/heads/master
Commit: d9973fee06eb07fee35226b5b9037c4ce3614aed
Parents: 0f44e11 b888275
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jan 21 08:54:09 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jan 21 08:54:09 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/struts2/json/JSONWriter.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[09/28] struts git commit: WW-4454 Adds dedicated hidden.ftl template to avoid problems with layout

Posted by lu...@apache.org.
WW-4454 Adds dedicated hidden.ftl template to avoid problems with layout


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5e74fcd9
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5e74fcd9
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5e74fcd9

Branch: refs/heads/master
Commit: 5e74fcd946b932725fe5f4640d1092bf6ea6d2f9
Parents: cd0d8de
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Feb 1 15:53:38 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Feb 1 15:53:38 2015 +0100

----------------------------------------------------------------------
 .../resources/template/css_xhtml/hidden.ftl     | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/5e74fcd9/core/src/main/resources/template/css_xhtml/hidden.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/css_xhtml/hidden.ftl b/core/src/main/resources/template/css_xhtml/hidden.ftl
new file mode 100644
index 0000000..640aa48
--- /dev/null
+++ b/core/src/main/resources/template/css_xhtml/hidden.ftl
@@ -0,0 +1,23 @@
+<#--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<#include "/${parameters.templateDir}/simple/hidden.ftl" />


[03/28] struts git commit: change findBaseAccessor method

Posted by lu...@apache.org.
change findBaseAccessor method

in hibernate4.3.7,because javassist3.18.1's class name generate rule is '_$$_jvst'+...

Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b8882758
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b8882758
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b8882758

Branch: refs/heads/master
Commit: b8882758036a1abe86c5405889410c55da958a80
Parents: 2433789
Author: aronshen <ss...@qq.com>
Authored: Tue Jan 20 11:54:10 2015 +0800
Committer: aronshen <ss...@qq.com>
Committed: Tue Jan 20 11:54:10 2015 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/struts2/json/JSONWriter.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/b8882758/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
----------------------------------------------------------------------
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
index fd9b844..dc53967 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
@@ -305,7 +305,18 @@ public class JSONWriter {
             } catch (Exception ex) {
                 LOG.debug(ex.getMessage(), ex);
             }
-        } else {
+            
+        //in hibernate4.3.7,because javassist3.18.1's class name generate rule is '_$$_jvst'+...
+        } else if(clazz.getName().contains("$$_jvst")){
+            try {
+                baseAccessor = Class.forName(
+                        clazz.getName().substring(0, clazz.getName().indexOf("_$$")))
+                        .getMethod(accessor.getName(), accessor.getParameterTypes());
+            } catch (Exception ex) {
+                LOG.debug(ex.getMessage(), ex);
+            }
+        }
+        else {
             return accessor;
         }
         return baseAccessor;


[22/28] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_22

Posted by lu...@apache.org.
[maven-release-plugin] prepare release STRUTS_2_3_22


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/22573f8d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/22573f8d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/22573f8d

Branch: refs/heads/master
Commit: 22573f8de8b33ead0fee88eb67817985464218bb
Parents: 4f0f7d1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 19 07:11:15 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 19 07:11:15 2015 +0100

----------------------------------------------------------------------
 apps/blank/pom.xml                              | 2 +-
 apps/jboss-blank/pom.xml                        | 2 +-
 apps/mailreader/pom.xml                         | 2 +-
 apps/pom.xml                                    | 2 +-
 apps/portlet/pom.xml                            | 2 +-
 apps/rest-showcase/pom.xml                      | 4 ++--
 apps/showcase/pom.xml                           | 2 +-
 archetypes/pom.xml                              | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml      | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml     | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml    | 2 +-
 archetypes/struts2-archetype-starter/pom.xml    | 2 +-
 assembly/pom.xml                                | 2 +-
 bom/pom.xml                                     | 8 ++++++--
 bundles/admin/pom.xml                           | 2 +-
 bundles/demo/pom.xml                            | 2 +-
 bundles/pom.xml                                 | 2 +-
 core/pom.xml                                    | 2 +-
 plugins/cdi/pom.xml                             | 2 +-
 plugins/codebehind/pom.xml                      | 2 +-
 plugins/config-browser/pom.xml                  | 2 +-
 plugins/convention/pom.xml                      | 2 +-
 plugins/dojo/pom.xml                            | 2 +-
 plugins/dwr/pom.xml                             | 2 +-
 plugins/embeddedjsp/pom.xml                     | 2 +-
 plugins/gxp/pom.xml                             | 2 +-
 plugins/jasperreports/pom.xml                   | 2 +-
 plugins/java8-support/pom.xml                   | 2 +-
 plugins/javatemplates/pom.xml                   | 2 +-
 plugins/jfreechart/pom.xml                      | 2 +-
 plugins/jsf/pom.xml                             | 2 +-
 plugins/json/pom.xml                            | 2 +-
 plugins/junit/pom.xml                           | 2 +-
 plugins/osgi/pom.xml                            | 2 +-
 plugins/oval/pom.xml                            | 2 +-
 plugins/pell-multipart/pom.xml                  | 2 +-
 plugins/plexus/pom.xml                          | 2 +-
 plugins/pom.xml                                 | 2 +-
 plugins/portlet-tiles/pom.xml                   | 2 +-
 plugins/portlet/pom.xml                         | 2 +-
 plugins/rest/pom.xml                            | 2 +-
 plugins/sitegraph/pom.xml                       | 2 +-
 plugins/sitemesh/pom.xml                        | 2 +-
 plugins/spring/pom.xml                          | 2 +-
 plugins/struts1/pom.xml                         | 2 +-
 plugins/testng/pom.xml                          | 2 +-
 plugins/tiles/pom.xml                           | 2 +-
 plugins/tiles3/pom.xml                          | 2 +-
 pom.xml                                         | 4 ++--
 xwork-core/pom.xml                              | 2 +-
 53 files changed, 60 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index a8d1cf8..48df955 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index e3da1b5..13d5cc2 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jboss-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index e239bdb..47f0a0e 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.3.22-SNAPSHOT</version>
+      <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-mailreader</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index ae0c017..749f9b1 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 38c45d2..2a2d6ec 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index dae55d4..6274423 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>2.3.22-SNAPSHOT</version>
+    <version>2.3.22</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index f5b7449..8a6966d 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index feccd52..137f93d 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-archetypes</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index ff146a1..49f359b 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 473faf7..5aace4a 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index 7706e25..37cc459 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index f0d08f0..0cfe055 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index d46db49..5a36f47 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 50e4fe6..2274c56 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 44688f2..121e0a5 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 75a1a13..f6486e7 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index ccd3e57..e264a1e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>struts2-bom</artifactId>
-    <version>2.3.22-SNAPSHOT</version>
+    <version>2.3.22</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -25,7 +25,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>2.3.22-SNAPSHOT</struts-version.version>
+        <struts-version.version>2.3.22</struts-version.version>
     </properties>
 
     <build>
@@ -195,4 +195,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>STRUTS_2_3_22</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index e4d4f3e..4cd5aeb 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index cdbe762..01e4f97 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 803015b..cfdf575 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-bundles</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c310c6a..d4b2b95 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 0de0e32..6867b8a 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-cdi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 61cad58..38b233c 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-codebehind-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 0a36c52..f152a4d 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-config-browser-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index a8a8a4e..f6d0bed 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-convention-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index c3a48ef..90b4540 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>struts2-plugins</artifactId>
         <groupId>org.apache.struts</groupId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 446db22..2e3a501 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-dwr-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 541db6c..e9d4523 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-embeddedjsp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index e2ca54e..a3cdd2d 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-gxp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 5bcf470..c6452ec 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jasperreports-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/java8-support/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml
index c99b368..d650deb 100644
--- a/plugins/java8-support/pom.xml
+++ b/plugins/java8-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-java8-support-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 5b0cb57..8b51fca 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-javatemplates-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 04dcef1..e65f3e0 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
    </parent>
 
     <artifactId>struts2-jfreechart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 616c39b..ca6ebce 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jsf-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 4050b44..eb6d1db 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-json-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 0a22bbf..1b37ef9 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-junit-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 6695e11..c1f83e7 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 7c3ad34..71860b2 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-oval-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 57bd06e..1ad008b 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-pell-multipart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index bf5b7d1..f584393 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-plexus-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2debf26..04d1367 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-plugins</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 146d577..71a43fc 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 88d06cb..c290f6b 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 7b183b8..72aec33 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-rest-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 0115612..3bb22f6 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-sitegraph-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 753ed3f..09d59ce 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-sitemesh-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index f2b1aff..2ba9d25 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-spring-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index c732a76..081dc33 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-struts1-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index bb68d55..ecfe46a 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-testng-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 0cd8283..bee4e72 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 209304f..61ff58e 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-tiles3-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 94f9fba..d5a2405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-parent</artifactId>
-    <version>2.3.22-SNAPSHOT</version>
+    <version>2.3.22</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/</url>
@@ -31,7 +31,7 @@
         <connection>scm:git:git://git.apache.org/struts.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
         <url>http://git.apache.org/struts.git</url>
-        <tag>HEAD</tag>
+        <tag>STRUTS_2_3_22</tag>
     </scm>
 
     <issueManagement>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index b642414..3471d88 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <groupId>org.apache.struts.xwork</groupId>


[14/28] struts git commit: made bufferSize optional, see WW-4466

Posted by lu...@apache.org.
made bufferSize optional, see WW-4466


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fbe7d513
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fbe7d513
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fbe7d513

Branch: refs/heads/master
Commit: fbe7d5138e7f4e67552f766c80cc033050660777
Parents: 76ea79f
Author: cnenning <cn...@apache.org>
Authored: Mon Feb 16 14:24:55 2015 +0100
Committer: cnenning <cn...@apache.org>
Committed: Mon Feb 16 14:24:55 2015 +0100

----------------------------------------------------------------------
 .../dispatcher/multipart/JakartaStreamMultiPartRequest.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/fbe7d513/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
index fa3dd2f..eae0039 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
@@ -97,7 +97,7 @@ public class JakartaStreamMultiPartRequest implements MultiPartRequest {
      *
      * @param bufferSize
      */
-    @Inject(StrutsConstants.STRUTS_MULTIPART_BUFFERSIZE)
+    @Inject(value = StrutsConstants.STRUTS_MULTIPART_BUFFERSIZE, required = false)
     public void setBufferSize(String bufferSize) {
         this.bufferSize = Integer.parseInt(bufferSize);
     }


[10/28] struts git commit: WW-4446 Adds wrapper around Dispatcher in tests to avoid overwhelming warnings

Posted by lu...@apache.org.
WW-4446 Adds wrapper around Dispatcher in tests to avoid overwhelming
 warnings


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/46b28e0b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/46b28e0b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/46b28e0b

Branch: refs/heads/master
Commit: 46b28e0b6365531bb25dac4a427258e70a2c24a9
Parents: 5e74fcd
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Feb 2 10:04:40 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Feb 2 10:04:40 2015 +0100

----------------------------------------------------------------------
 .../struts2/util/StrutsTestCaseHelper.java      | 30 ++++++-
 .../freemarker/FreemarkerResultMockedTest.java  | 84 +++++---------------
 2 files changed, 50 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/46b28e0b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
index b19e43e..546c74d 100644
--- a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
@@ -31,8 +31,11 @@ import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.apache.struts2.dispatcher.DispatcherErrorHandler;
 
 import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * Generic test setup methods to be used with any unit testing framework. 
@@ -51,7 +54,7 @@ public class StrutsTestCaseHelper {
         if (params == null) {
             params = new HashMap<String,String>();
         }
-        Dispatcher du = new Dispatcher(ctx, params);
+        Dispatcher du = new DispatcherWrapper(ctx, params);
         du.init();
         Dispatcher.setInstance(du);
 
@@ -68,4 +71,29 @@ public class StrutsTestCaseHelper {
         Dispatcher.setInstance(null);
         ActionContext.setContext(null);
     }
+
+    private static class DispatcherWrapper extends Dispatcher {
+
+        public DispatcherWrapper(ServletContext ctx, Map<String, String> params) {
+            super(ctx, params);
+            super.setDispatcherErrorHandler(new MockErrorHandler());
+        }
+
+        @Override
+        public void setDispatcherErrorHandler(DispatcherErrorHandler errorHandler) {
+            // ignore
+        }
+    }
+
+    private static class MockErrorHandler implements DispatcherErrorHandler {
+        public void init(ServletContext ctx) {
+            // ignore
+        }
+
+        public void handleError(HttpServletRequest request, HttpServletResponse response, int code, Exception e) {
+            System.out.println("Dispatcher#sendError: " + code);
+            e.printStackTrace(System.out);
+        }
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/46b28e0b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
index 9a9584a..3c19077 100644
--- a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
+++ b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
@@ -6,6 +6,7 @@ import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory;
 import freemarker.template.Configuration;
+import freemarker.template.TemplateException;
 import freemarker.template.TemplateExceptionHandler;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsInternalTestCase;
@@ -34,26 +35,17 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
     PrintWriter writer;
     StringWriter stringWriter;
     ServletContext servletContext;
-    FreemarkerManager mgr;
     MockHttpServletRequest request;
 
-    public void testActionThatThrowsExceptionTag() throws Exception {
-        //get fm config to use it in mock servlet context
-        FreemarkerManager freemarkerManager = container.getInstance(FreemarkerManager.class);
-        Configuration freemarkerConfig = freemarkerManager.getConfiguration(ServletActionContext.getServletContext());
-        freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+    Configuration freemarkerConfig;
 
-        servletContext = EasyMock.createNiceMock(ServletContext.class);
+    public void testActionThatThrowsExceptionTag() throws Exception {
         File file = new File(FreeMarkerResultTest.class.getResource("callActionFreeMarker2.ftl").toURI());
         EasyMock.expect(servletContext.getRealPath("/tutorial/org/apache/struts2/views/freemarker/callActionFreeMarker.ftl")).andReturn(file.getAbsolutePath());
         file = new File(FreeMarkerResultTest.class.getResource("nested.ftl").toURI());
         EasyMock.expect(servletContext.getRealPath("/tutorial/org/apache/struts2/views/freemarker/nested.ftl")).andReturn(file.getAbsolutePath());
-        EasyMock.expect(servletContext.getAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY)).andReturn(freemarkerConfig).anyTimes();
         EasyMock.replay(servletContext);
 
-        freemarkerConfig.setServletContextForTemplateLoading(servletContext, null);
-        ServletActionContext.setServletContext(servletContext);
-
         init();
 
         request.setRequestURI("/tutorial/test2.action");
@@ -63,22 +55,12 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
     }
 
     public void testActionThatSucceedsTag() throws Exception {
-        //get fm config to use it in mock servlet context
-        FreemarkerManager freemarkerManager = container.getInstance(FreemarkerManager.class);
-        Configuration freemarkerConfig = freemarkerManager.getConfiguration(ServletActionContext.getServletContext());
-        freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-
-        servletContext = EasyMock.createNiceMock(ServletContext.class);
         File file = new File(FreeMarkerResultTest.class.getResource("callActionFreeMarker2.ftl").toURI());
         EasyMock.expect(servletContext.getRealPath("/tutorial/org/apache/struts2/views/freemarker/callActionFreeMarker2.ftl")).andReturn(file.getAbsolutePath());
         file = new File(FreeMarkerResultTest.class.getResource("nested.ftl").toURI());
         EasyMock.expect(servletContext.getRealPath("/tutorial/org/apache/struts2/views/freemarker/nested.ftl")).andReturn(file.getAbsolutePath());
-        EasyMock.expect(servletContext.getAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY)).andReturn(freemarkerConfig).anyTimes();
         EasyMock.replay(servletContext);
 
-        freemarkerConfig.setServletContextForTemplateLoading(servletContext, null);
-        ServletActionContext.setServletContext(servletContext);
-
         init();
 
         request.setRequestURI("/tutorial/test5.action");
@@ -88,13 +70,6 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
     }
 
     public void testDynamicAttributesSupport() throws Exception {
-        //get fm config to use it in mock servlet context
-        FreemarkerManager freemarkerManager = container.getInstance(FreemarkerManager.class);
-        Configuration freemarkerConfig = freemarkerManager.getConfiguration(ServletActionContext.getServletContext());
-        freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-
-        servletContext = EasyMock.createNiceMock(ServletContext.class);
-
         File file = new File(FreeMarkerResultTest.class.getResource("dynaAttributes.ftl").toURI());
         EasyMock.expect(servletContext.getRealPath("/tutorial/org/apache/struts2/views/freemarker/dynaAttributes.ftl")).andReturn(file.getAbsolutePath());
 
@@ -117,12 +92,8 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
         EasyMock.expect(servletContext.getRealPath("/template/simple/dynamic-attributes.ftl")).andReturn(file.getAbsolutePath());
         EasyMock.expect(servletContext.getRealPath("/template/~~~simple/dynamic-attributes.ftl")).andReturn(file.getAbsolutePath());
 
-        EasyMock.expect(servletContext.getAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY)).andReturn(freemarkerConfig).anyTimes();
         EasyMock.replay(servletContext);
 
-        freemarkerConfig.setServletContextForTemplateLoading(servletContext, null);
-        ServletActionContext.setServletContext(servletContext);
-
         init();
 
         request.setRequestURI("/tutorial/test6.action");
@@ -150,12 +121,6 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
     }
 
     public void testManualListInTemplate() throws Exception {
-        FreemarkerManager freemarkerManager = container.getInstance(FreemarkerManager.class);
-        Configuration freemarkerConfig = freemarkerManager.getConfiguration(ServletActionContext.getServletContext());
-        freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-
-        servletContext = EasyMock.createNiceMock(ServletContext.class);
-
         File file = new File(FreeMarkerResultTest.class.getResource("manual-list.ftl").toURI());
         EasyMock.expect(servletContext.getRealPath("/tutorial/org/apache/struts2/views/freemarker/manual-list.ftl")).andReturn(file.getAbsolutePath());
 
@@ -178,12 +143,8 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
         EasyMock.expect(servletContext.getRealPath("/template/simple/dynamic-attributes.ftl")).andReturn(file.getAbsolutePath());
         EasyMock.expect(servletContext.getRealPath("/template/~~~simple/dynamic-attributes.ftl")).andReturn(file.getAbsolutePath());
 
-        EasyMock.expect(servletContext.getAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY)).andReturn(freemarkerConfig).anyTimes();
         EasyMock.replay(servletContext);
 
-        freemarkerConfig.setServletContextForTemplateLoading(servletContext, null);
-        ServletActionContext.setServletContext(servletContext);
-
         init();
 
         request.setRequestURI("/tutorial/test7.action");
@@ -198,24 +159,14 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
     }
 
     public void testDynamicAttributesInTheme() throws Exception {
-        FreemarkerManager freemarkerManager = container.getInstance(FreemarkerManager.class);
-        Configuration freemarkerConfig = freemarkerManager.getConfiguration(ServletActionContext.getServletContext());
-        freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-
-        servletContext = EasyMock.createNiceMock(ServletContext.class);
-
         File file = new File(FreeMarkerResultTest.class.getResource("customTextField.ftl").toURI());
         EasyMock.expect(servletContext.getRealPath("/tutorial/org/apache/struts2/views/freemarker/customTextField.ftl")).andReturn(file.getAbsolutePath());
 
         file = new File(ClassLoaderUtil.getResource("template/test/text.ftl", getClass()).toURI());
         EasyMock.expect(servletContext.getRealPath("/template/test/text.ftl")).andReturn(file.getAbsolutePath());
 
-        EasyMock.expect(servletContext.getAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY)).andReturn(freemarkerConfig).anyTimes();
         EasyMock.replay(servletContext);
 
-        freemarkerConfig.setServletContextForTemplateLoading(servletContext, null);
-        ServletActionContext.setServletContext(servletContext);
-
         init();
 
         request.setRequestURI("/tutorial/test8.action");
@@ -226,17 +177,6 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
     }
 
     private void init() throws MalformedURLException, URISyntaxException {
-        mgr = new FreemarkerManager();
-        mgr.setEncoding("UTF-8");
-
-        DefaultFileManagerFactory factory = new DefaultFileManagerFactory();
-        container.inject(factory);
-        mgr.setFileManagerFactory(factory);
-
-        FreemarkerThemeTemplateLoader themeLoader = new FreemarkerThemeTemplateLoader();
-        container.inject(themeLoader);
-        mgr.setThemeTemplateLoader(themeLoader);
-
         stringWriter = new StringWriter();
         writer = new PrintWriter(stringWriter);
         response = new StrutsMockHttpServletResponse();
@@ -257,6 +197,24 @@ public class FreemarkerResultMockedTest extends StrutsInternalTestCase {
         invocation = new MockActionInvocation();
         invocation.setStack(stack);
         invocation.setInvocationContext(context);
+
+        //get fm config to use it in mock servlet context
+        FreemarkerManager freemarkerManager = container.getInstance(FreemarkerManager.class);
+
+        freemarkerConfig = freemarkerManager.getConfiguration(ServletActionContext.getServletContext());
+        freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+        freemarkerConfig.setServletContextForTemplateLoading(servletContext, null);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        servletContext = EasyMock.createNiceMock(ServletContext.class);
+        EasyMock.expect(servletContext.getInitParameter("TemplatePath")).andReturn(null);
+        EasyMock.expect(servletContext.getInitParameter("templatePath")).andReturn(null);
+
+        EasyMock.expect(servletContext.getAttribute(FreemarkerManager.CONFIG_SERVLET_CONTEXT_KEY)).andReturn(freemarkerConfig).anyTimes();
     }
 
 }


[19/28] struts git commit: WW-4468 Switched to buildError on file limit excided

Posted by lu...@apache.org.
WW-4468 Switched to buildError on file limit excided


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5665dd52
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5665dd52
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5665dd52

Branch: refs/heads/master
Commit: 5665dd52b5a6b430d74d6c9f1ca7b85ee2709007
Parents: a1d277f
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 6 21:40:10 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 6 21:40:10 2015 +0100

----------------------------------------------------------------------
 .../dispatcher/multipart/JakartaStreamMultiPartRequest.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/5665dd52/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
index eae0039..6fbd2c3 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
@@ -357,7 +357,7 @@ public class JakartaStreamMultiPartRequest implements MultiPartRequest {
     private void addFileSkippedError(String fileName, HttpServletRequest request) {
         String exceptionMessage = "Skipped file " + fileName + "; request size limit exceeded.";
         FileSizeLimitExceededException exception = new FileUploadBase.FileSizeLimitExceededException(exceptionMessage, getRequestSize(request), maxSize);
-        String message = buildMessage(exception, new Object[]{fileName, getRequestSize(request), maxSize});
+        String message = buildErrorMessage(exception, new Object[]{fileName, getRequestSize(request), maxSize});
         if (!errors.contains(message))
             errors.add(message);
     }


[21/28] struts git commit: Adds additional use case to check access to values of int type

Posted by lu...@apache.org.
Adds additional use case to check access to values of int type


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4f0f7d13
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4f0f7d13
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4f0f7d13

Branch: refs/heads/master
Commit: 4f0f7d13849d65445bb9f86c19b6eb217019123f
Parents: 54c6423
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sat Mar 7 07:39:44 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sat Mar 7 07:39:44 2015 +0100

----------------------------------------------------------------------
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/4f0f7d13/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 53f4246..5db20fc 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -285,12 +285,28 @@ public class SecurityMemberAccessTest extends TestCase {
         assertTrue("Invalid test! Access to static method of excluded class is blocked!", actual);
     }
 
+    public void testAccessPrimitiveInt() throws Exception {
+        // given
+        SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+        String propertyName = "intField";
+        Member member = FooBar.class.getMethod("get" + propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1));
+
+        // when
+        boolean accessible = sma.isAccessible(context, target, member, propertyName);
+
+        // then
+        assertTrue(accessible);
+    }
+
 }
 
 class FooBar implements FooBarInterface {
 
     private String stringField;
 
+    private int intField;
+
     public String getStringField() {
         return stringField;
     }
@@ -312,6 +328,13 @@ class FooBar implements FooBarInterface {
         return 1;
     }
 
+    public int getIntField() {
+        return intField;
+    }
+
+    public void setIntField(int intField) {
+        this.intField = intField;
+    }
 }
 
 interface FooInterface {


[18/28] struts git commit: WW-4467 disableRequestAttributeValueStackLookup applied to MultiPartRequestWrapper

Posted by lu...@apache.org.
WW-4467 disableRequestAttributeValueStackLookup applied
to MultiPartRequestWrapper


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a1d277fa
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a1d277fa
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a1d277fa

Branch: refs/heads/master
Commit: a1d277fac53e8567dae28842599b8ab92872a92b
Parents: 4ad0232
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 6 21:20:08 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 6 21:20:08 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/struts2/dispatcher/Dispatcher.java   |  2 +-
 .../dispatcher/multipart/MultiPartRequestWrapper.java    | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/a1d277fa/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index c18d055..3a4e305 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -835,7 +835,7 @@ public class Dispatcher {
         if (content_type != null && content_type.contains("multipart/form-data")) {
             MultiPartRequest mpr = getMultiPartRequest();
             LocaleProvider provider = getContainer().getInstance(LocaleProvider.class);
-            request = new MultiPartRequestWrapper(mpr, request, getSaveDir(), provider);
+            request = new MultiPartRequestWrapper(mpr, request, getSaveDir(), provider, disableRequestAttributeValueStackLookup);
         } else {
             request = new StrutsRequestWrapper(request, disableRequestAttributeValueStackLookup);
         }

http://git-wip-us.apache.org/repos/asf/struts/blob/a1d277fa/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
index 0bff59d..ddc4275 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
@@ -21,6 +21,7 @@
 
 package org.apache.struts2.dispatcher.multipart;
 
+import com.opensymphony.xwork2.DefaultLocaleProvider;
 import com.opensymphony.xwork2.LocaleProvider;
 import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.logging.Logger;
@@ -71,8 +72,10 @@ public class MultiPartRequestWrapper extends StrutsRequestWrapper {
      * @param saveDir Target directory for any files that we save
      * @param provider
      */
-    public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, HttpServletRequest request, String saveDir, LocaleProvider provider) {
-        super(request);
+    public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, HttpServletRequest request,
+                                   String saveDir, LocaleProvider provider,
+                                   boolean disableRequestAttributeValueStackLookup) {
+        super(request, disableRequestAttributeValueStackLookup);
         errors = new ArrayList<String>();
         multi = multiPartRequest;
         defaultLocale = provider.getLocale();
@@ -90,6 +93,10 @@ public class MultiPartRequestWrapper extends StrutsRequestWrapper {
         } 
     }
 
+    public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, HttpServletRequest request, String saveDir, LocaleProvider provider) {
+        this(multiPartRequest, request, saveDir, provider, false);
+    }
+
     protected void setLocale(HttpServletRequest request) {
         if (defaultLocale == null) {
             defaultLocale = request.getLocale();


[02/28] struts git commit: WW-4447 Reverts some changes introduced by WW-4297 Resetting 'label' attribute can block user if they would like to develop their own hidden.ftl template

Posted by lu...@apache.org.
WW-4447 Reverts some changes introduced by WW-4297
Resetting 'label' attribute can block user if they would like to
develop their own hidden.ftl template


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/24337893
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/24337893
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/24337893

Branch: refs/heads/master
Commit: 243378937969e5caeeeefc2bd98ce799a995e431
Parents: 0b49c2c
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jan 14 16:15:17 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jan 14 16:15:17 2015 +0100

----------------------------------------------------------------------
 core/src/main/java/org/apache/struts2/components/Hidden.java | 6 ------
 1 file changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/24337893/core/src/main/java/org/apache/struts2/components/Hidden.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/Hidden.java b/core/src/main/java/org/apache/struts2/components/Hidden.java
index 36b03d1..b513340 100644
--- a/core/src/main/java/org/apache/struts2/components/Hidden.java
+++ b/core/src/main/java/org/apache/struts2/components/Hidden.java
@@ -66,10 +66,4 @@ public class Hidden extends UIBean {
         return TEMPLATE;
     }
 
-    @Override
-    public void evaluateParams() {
-        super.evaluateParams();
-        label = null;
-        addParameter("label", null);
-    }
 }


[15/28] struts git commit: WW-4465 Ignores statusCode parameter when building redirect url

Posted by lu...@apache.org.
WW-4465 Ignores statusCode parameter when building redirect url


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c5867e2e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c5867e2e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c5867e2e

Branch: refs/heads/master
Commit: c5867e2ea2c72864730c77167b9827e49c0cd38f
Parents: fbe7d51
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Feb 17 07:38:13 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Feb 17 07:38:13 2015 +0100

----------------------------------------------------------------------
 .../dispatcher/ServletActionRedirectResult.java        | 13 ++++++++++++-
 .../dispatcher/ServletActionRedirectResultTest.java    |  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/c5867e2e/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
index b41c06e..5e0f835 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
@@ -210,7 +210,18 @@ public class ServletActionRedirectResult extends ServletRedirectResult implement
     }
 
     protected List<String> getProhibitedResultParams() {
-        return Arrays.asList(DEFAULT_PARAM, "namespace", "method", "encode", "parse", "location", "prependServletContext", "suppressEmptyParameters", "anchor");
+        return Arrays.asList(
+                DEFAULT_PARAM,
+                "namespace",
+                "method",
+                "encode",
+                "parse",
+                "location",
+                "prependServletContext",
+                "suppressEmptyParameters",
+                "anchor",
+                "statusCode"
+        );
     }
 
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/c5867e2e/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
index a679919..168ea04 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
@@ -58,7 +58,8 @@ public class ServletActionRedirectResultTest extends StrutsInternalTestCase {
             .addParam("location", "someLocation")
             .addParam("prependServletContext", "true")
             .addParam("method", "someMethod")
-            .addParam("param1", "${#value1}")
+			.addParam("statusCode", "333")
+			.addParam("param1", "${#value1}")
             .addParam("param2", "${#value2}")
             .addParam("param3", "${#value3}")
             .addParam("anchor", "${#fragment}")


[12/28] struts git commit: Handle default (unnamed) package security check

Posted by lu...@apache.org.
Handle default (unnamed) package security check


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/76ea79f3
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/76ea79f3
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/76ea79f3

Branch: refs/heads/master
Commit: 76ea79f38a5e9efbebdf9e7a966795e2deb5bc9f
Parents: 312a271
Author: Aleksandr Mashchenko <al...@gmail.com>
Authored: Wed Feb 4 22:57:55 2015 +0200
Committer: Aleksandr Mashchenko <al...@gmail.com>
Committed: Wed Feb 4 22:57:55 2015 +0200

----------------------------------------------------------------------
 .../xwork2/ognl/SecurityMemberAccess.java       |  8 +++++-
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 30 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/76ea79f3/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 7888245..7697368 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -128,8 +128,14 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
     }
 
     protected boolean isPackageExcluded(Package targetPackage, Package memberPackage) {
+        if (LOG.isWarnEnabled() && (targetPackage == null || memberPackage == null)) {
+            LOG.warn("The use of the default (unnamed) package is discouraged!");
+        }
+        
+        final String targetPackageName = targetPackage == null ? "" : targetPackage.getName();
+        final String memberPackageName = memberPackage == null ? "" : memberPackage.getName();
         for (Pattern pattern : excludedPackageNamePatterns) {
-            if (pattern.matcher(targetPackage.getName()).matches() || pattern.matcher(memberPackage.getName()).matches()) {
+            if (pattern.matcher(targetPackageName).matches() || pattern.matcher(memberPackageName).matches()) {
                 return true;
             }
         }

http://git-wip-us.apache.org/repos/asf/struts/blob/76ea79f3/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 69dceca..53f4246 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -190,6 +190,36 @@ public class SecurityMemberAccessTest extends TestCase {
         // then
         assertFalse("stringField is accessible!", actual);
     }
+    
+    public void testDefaultPackageExclusion() throws Exception {
+        // given
+        SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+        Set<Pattern> excluded = new HashSet<Pattern>();
+        excluded.add(Pattern.compile("^" + FooBar.class.getPackage().getName().replaceAll("\\.", "\\\\.") + ".*"));
+        sma.setExcludedPackageNamePatterns(excluded);
+        
+        // when
+        boolean actual = sma.isPackageExcluded(null, null);
+
+        // then
+        assertFalse("default package is excluded!", actual);
+    }
+    
+    public void testDefaultPackageExclusion2() throws Exception {
+        // given
+        SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+        Set<Pattern> excluded = new HashSet<Pattern>();
+        excluded.add(Pattern.compile("^$"));
+        sma.setExcludedPackageNamePatterns(excluded);
+        
+        // when
+        boolean actual = sma.isPackageExcluded(null, null);
+
+        // then
+        assertTrue("default package isn't excluded!", actual);
+    }
 
     public void testAccessEnum() throws Exception {
         // given


[07/28] struts git commit: WW-4448 Replaces spaces with encoded value

Posted by lu...@apache.org.
WW-4448 Replaces spaces with encoded value


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/acef4923
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/acef4923
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/acef4923

Branch: refs/heads/master
Commit: acef492390863e73f97714f082b214046b46c9c2
Parents: d9973fe
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jan 21 09:07:07 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jan 21 09:07:07 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/struts2/dispatcher/ServletRedirectResult.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/acef4923/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
index 60f5584..786deef 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
@@ -276,7 +276,7 @@ public class ServletRedirectResult extends StrutsResultSupport implements Reflec
             if (url.contains("?")) {
                 rawUrl = url.substring(0, url.indexOf("?"));
             }
-            URI uri = URI.create(rawUrl);
+            URI uri = URI.create(rawUrl.replaceAll(" ", "%20"));
             if (uri.isAbsolute()) {
                 URL validUrl = uri.toURL();
                 if (LOG.isDebugEnabled()) {


[20/28] struts git commit: WW-4457 Uses dedicated type to match content type of uploaded files

Posted by lu...@apache.org.
WW-4457 Uses dedicated type to match content type of uploaded files


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/54c64234
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/54c64234
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/54c64234

Branch: refs/heads/master
Commit: 54c64234844488d178e4ac1579ab8194a36b8b4a
Parents: 5665dd5
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 6 22:34:35 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 6 22:34:35 2015 +0100

----------------------------------------------------------------------
 .../org/apache/struts2/StrutsConstants.java     |  2 ++
 .../config/DefaultBeanSelectionProvider.java    |  8 ++++++++
 .../interceptor/FileUploadInterceptor.java      |  6 +++---
 .../apache/struts2/util/ContentTypeMatcher.java | 16 ++++++++++++++++
 .../struts2/util/DefaultContentTypeMatcher.java | 20 ++++++++++++++++++++
 core/src/main/resources/struts-default.xml      |  2 ++
 6 files changed, 51 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/java/org/apache/struts2/StrutsConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 03287d6..4671eb1 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -299,4 +299,6 @@ public final class StrutsConstants {
     public static final String STRUTS_ADDITIONAL_EXCLUDED_PATTERNS = "struts.additional.excludedPatterns";
     public static final String STRUTS_ADDITIONAL_ACCEPTED_PATTERNS = "struts.additional.acceptedPatterns";
 
+    public static final String STRUTS_CONTENT_TYPE_MATCHER = "struts.contentTypeMatcher";
+
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index f972979..3a6deb2 100644
--- a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -67,6 +67,7 @@ import org.apache.struts2.dispatcher.DispatcherErrorHandler;
 import org.apache.struts2.dispatcher.StaticContentLoader;
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
+import org.apache.struts2.util.ContentTypeMatcher;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
 import org.apache.struts2.views.util.UrlHelper;
 import org.apache.struts2.views.velocity.VelocityManager;
@@ -327,6 +328,12 @@ import java.util.StringTokenizer;
  *     <td>request</td>
  *     <td>Used across different interceptors to check if given string matches one of the accepted patterns</td>
  *   </tr>
+ *   <tr>
+ *     <td>org.apache.struts2.util.ContentTypeMatcher</td>
+ *     <td>struts.contentTypeMatcher</td>
+ *     <td>singleton</td>
+ *     <td>Matches content type of uploaded files (since 2.3.22)</td>
+ *   </tr>
  * </table>
  *
  * <!-- END SNIPPET: extensionPoints -->
@@ -391,6 +398,7 @@ public class DefaultBeanSelectionProvider extends AbstractBeanSelectionProvider
         alias(ReflectionProvider.class, StrutsConstants.STRUTS_REFLECTIONPROVIDER, builder, props);
         alias(ReflectionContextFactory.class, StrutsConstants.STRUTS_REFLECTIONCONTEXTFACTORY, builder, props);
         alias(PatternMatcher.class, StrutsConstants.STRUTS_PATTERNMATCHER, builder, props);
+        alias(ContentTypeMatcher.class, StrutsConstants.STRUTS_CONTENT_TYPE_MATCHER, builder, props);
         alias(StaticContentLoader.class, StrutsConstants.STRUTS_STATIC_CONTENT_LOADER, builder, props);
         alias(UnknownHandlerManager.class, StrutsConstants.STRUTS_UNKNOWN_HANDLER_MANAGER, builder, props);
         alias(UrlHelper.class, StrutsConstants.STRUTS_URL_HELPER, builder, props);

http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
index 0ce91bc..78970a0 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -31,12 +31,12 @@ import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.inject.Container;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.util.PatternMatcher;
 import com.opensymphony.xwork2.util.TextParseUtil;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
+import org.apache.struts2.util.ContentTypeMatcher;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
@@ -195,11 +195,11 @@ public class FileUploadInterceptor extends AbstractInterceptor {
     protected Set<String> allowedTypesSet = Collections.emptySet();
     protected Set<String> allowedExtensionsSet = Collections.emptySet();
 
-    private PatternMatcher matcher;
+    private ContentTypeMatcher matcher;
     private Container container;
 
     @Inject
-    public void setMatcher(PatternMatcher matcher) {
+    public void setMatcher(ContentTypeMatcher matcher) {
         this.matcher = matcher;
     }
 

http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/java/org/apache/struts2/util/ContentTypeMatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/ContentTypeMatcher.java b/core/src/main/java/org/apache/struts2/util/ContentTypeMatcher.java
new file mode 100644
index 0000000..0e21b7a
--- /dev/null
+++ b/core/src/main/java/org/apache/struts2/util/ContentTypeMatcher.java
@@ -0,0 +1,16 @@
+package org.apache.struts2.util;
+
+import java.util.Map;
+
+/**
+ * Matches content type of uploaded files, similar to {@link com.opensymphony.xwork2.util.PatternMatcher}
+ *
+ * @since 2.3.22
+ */
+public interface ContentTypeMatcher<E extends Object> {
+
+    E compilePattern(String data);
+
+    boolean match(Map<String,String> map, String data, E expr);
+
+}

http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/java/org/apache/struts2/util/DefaultContentTypeMatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/util/DefaultContentTypeMatcher.java b/core/src/main/java/org/apache/struts2/util/DefaultContentTypeMatcher.java
new file mode 100644
index 0000000..6160675
--- /dev/null
+++ b/core/src/main/java/org/apache/struts2/util/DefaultContentTypeMatcher.java
@@ -0,0 +1,20 @@
+package org.apache.struts2.util;
+
+import com.opensymphony.xwork2.util.PatternMatcher;
+import com.opensymphony.xwork2.util.WildcardHelper;
+
+import java.util.Map;
+
+public class DefaultContentTypeMatcher implements ContentTypeMatcher<int[]> {
+
+    private PatternMatcher<int[]> matcher = new WildcardHelper();
+
+    public int[] compilePattern(String data) {
+        return matcher.compilePattern(data);
+    }
+
+    public boolean match(Map<String, String> map, String data, int[] expr) {
+        return matcher.match(map, data, expr);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/resources/struts-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index c6eec34..88b6e13 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -74,6 +74,8 @@
     <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="namedVariable" class="com.opensymphony.xwork2.util.NamedVariablePatternMatcher"/>
     <bean type="com.opensymphony.xwork2.util.PatternMatcher" name="regex" class="org.apache.struts2.util.RegexPatternMatcher"/>
 
+    <bean type="org.apache.struts2.util.ContentTypeMatcher" name="struts" class="org.apache.struts2.util.DefaultContentTypeMatcher"/>
+
     <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="struts" class="org.apache.struts2.dispatcher.mapper.DefaultActionMapper" />
     <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="composite" class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" />
     <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="restful" class="org.apache.struts2.dispatcher.mapper.RestfulActionMapper" />


[24/28] struts git commit: [maven-release-plugin] prepare for next development iteration

Posted by lu...@apache.org.
[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3e23f219
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3e23f219
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3e23f219

Branch: refs/heads/master
Commit: 3e23f2191ec2a9c16a5b77bf6a1c1c1dd589ddd4
Parents: 22573f8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 19 07:11:27 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 19 07:11:27 2015 +0100

----------------------------------------------------------------------
 apps/blank/pom.xml                              | 2 +-
 apps/jboss-blank/pom.xml                        | 2 +-
 apps/mailreader/pom.xml                         | 2 +-
 apps/pom.xml                                    | 2 +-
 apps/portlet/pom.xml                            | 2 +-
 apps/rest-showcase/pom.xml                      | 4 ++--
 apps/showcase/pom.xml                           | 2 +-
 archetypes/pom.xml                              | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml      | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml     | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml    | 2 +-
 archetypes/struts2-archetype-starter/pom.xml    | 2 +-
 assembly/pom.xml                                | 2 +-
 bom/pom.xml                                     | 8 ++------
 bundles/admin/pom.xml                           | 2 +-
 bundles/demo/pom.xml                            | 2 +-
 bundles/pom.xml                                 | 2 +-
 core/pom.xml                                    | 2 +-
 plugins/cdi/pom.xml                             | 2 +-
 plugins/codebehind/pom.xml                      | 2 +-
 plugins/config-browser/pom.xml                  | 2 +-
 plugins/convention/pom.xml                      | 2 +-
 plugins/dojo/pom.xml                            | 2 +-
 plugins/dwr/pom.xml                             | 2 +-
 plugins/embeddedjsp/pom.xml                     | 2 +-
 plugins/gxp/pom.xml                             | 2 +-
 plugins/jasperreports/pom.xml                   | 2 +-
 plugins/java8-support/pom.xml                   | 2 +-
 plugins/javatemplates/pom.xml                   | 2 +-
 plugins/jfreechart/pom.xml                      | 2 +-
 plugins/jsf/pom.xml                             | 2 +-
 plugins/json/pom.xml                            | 2 +-
 plugins/junit/pom.xml                           | 2 +-
 plugins/osgi/pom.xml                            | 2 +-
 plugins/oval/pom.xml                            | 2 +-
 plugins/pell-multipart/pom.xml                  | 2 +-
 plugins/plexus/pom.xml                          | 2 +-
 plugins/pom.xml                                 | 2 +-
 plugins/portlet-tiles/pom.xml                   | 2 +-
 plugins/portlet/pom.xml                         | 2 +-
 plugins/rest/pom.xml                            | 2 +-
 plugins/sitegraph/pom.xml                       | 2 +-
 plugins/sitemesh/pom.xml                        | 2 +-
 plugins/spring/pom.xml                          | 2 +-
 plugins/struts1/pom.xml                         | 2 +-
 plugins/testng/pom.xml                          | 2 +-
 plugins/tiles/pom.xml                           | 2 +-
 plugins/tiles3/pom.xml                          | 2 +-
 pom.xml                                         | 4 ++--
 xwork-core/pom.xml                              | 2 +-
 53 files changed, 56 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 48df955..4c6c6f6 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 13d5cc2..4f9a353 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jboss-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 47f0a0e..6081fae 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.3.22</version>
+      <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-mailreader</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 749f9b1..d0e67ca 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 2a2d6ec..ea5d5e7 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-portlet</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 6274423..689a3fe 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>2.3.22</version>
+    <version>2.3.23-SNAPSHOT</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 8a6966d..af5d3a1 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 137f93d..15f5f74 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-archetypes</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index 49f359b..c7d0396 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 5aace4a..e1001f9 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index 37cc459..b5c4fe2 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index 0cfe055..6440587 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index 5a36f47..ac5c2f2 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 2274c56..636851c 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 121e0a5..0bc0d51 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f6486e7..dbafbc9 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index e264a1e..d337af7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>struts2-bom</artifactId>
-    <version>2.3.22</version>
+    <version>2.3.23-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -25,7 +25,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>2.3.22</struts-version.version>
+        <struts-version.version>2.3.23-SNAPSHOT</struts-version.version>
     </properties>
 
     <build>
@@ -195,8 +195,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-  <scm>
-    <tag>STRUTS_2_3_22</tag>
-  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 4cd5aeb..9b227f3 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 01e4f97..795868e 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index cfdf575..96105db 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-bundles</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d4b2b95..7d5f979 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 6867b8a..8ded080 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-cdi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 38b233c..7e16f92 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-codebehind-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index f152a4d..ee1c986 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-config-browser-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index f6d0bed..9f315d7 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-convention-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 90b4540..5a3e105 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>struts2-plugins</artifactId>
         <groupId>org.apache.struts</groupId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 2e3a501..40fcd16 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-dwr-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index e9d4523..d92e740 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-embeddedjsp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index a3cdd2d..9dfeb63 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-gxp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index c6452ec..422c1f7 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jasperreports-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/java8-support/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml
index d650deb..64fca31 100644
--- a/plugins/java8-support/pom.xml
+++ b/plugins/java8-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-java8-support-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 8b51fca..1710fe0 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-javatemplates-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index e65f3e0..c9fd615 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
    </parent>
 
     <artifactId>struts2-jfreechart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index ca6ebce..e7af785 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-jsf-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index eb6d1db..223ca9b 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-json-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 1b37ef9..266a371 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-junit-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index c1f83e7..039e933 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-osgi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 71860b2..f530ddc 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-oval-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 1ad008b..c77fbf6 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-pell-multipart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index f584393..81e5832 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-plexus-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 04d1367..864a9bd 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-plugins</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 71a43fc..4974c12 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-portlet-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index c290f6b..1386179 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-portlet-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 72aec33..3fea8c4 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-rest-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 3bb22f6..935a4c4 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-sitegraph-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 09d59ce..cee9d8f 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-sitemesh-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 2ba9d25..66ce73b 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-spring-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index 081dc33..c380359 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-struts1-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index ecfe46a..76b10aa 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-testng-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index bee4e72..312b77a 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 61ff58e..a21cb6e 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>struts2-tiles3-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5a2405..4580d52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-parent</artifactId>
-    <version>2.3.22</version>
+    <version>2.3.23-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/</url>
@@ -31,7 +31,7 @@
         <connection>scm:git:git://git.apache.org/struts.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
         <url>http://git.apache.org/struts.git</url>
-        <tag>STRUTS_2_3_22</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <issueManagement>

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index 3471d88..cc48e28 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22</version>
+        <version>2.3.23-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.struts.xwork</groupId>


[05/28] struts git commit: WW-4448 Strips params and replaces spaces

Posted by lu...@apache.org.
WW-4448 Strips params and replaces spaces


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0f44e11c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0f44e11c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0f44e11c

Branch: refs/heads/master
Commit: 0f44e11cd1f3cff51ed4a2a10dec593d8822ade2
Parents: e3428c5
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jan 21 08:46:49 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jan 21 08:46:49 2015 +0100

----------------------------------------------------------------------
 .../dispatcher/ServletRedirectResult.java       |  6 +++-
 .../dispatcher/ServletRedirectResultTest.java   | 30 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/0f44e11c/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
index b6cd282..60f5584 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
@@ -272,7 +272,11 @@ public class ServletRedirectResult extends StrutsResultSupport implements Reflec
      */
     protected boolean isPathUrl(String url) {
         try {
-            URI uri = URI.create(url);
+            String rawUrl = url;
+            if (url.contains("?")) {
+                rawUrl = url.substring(0, url.indexOf("?"));
+            }
+            URI uri = URI.create(rawUrl);
             if (uri.isAbsolute()) {
                 URL validUrl = uri.toURL();
                 if (LOG.isDebugEnabled()) {

http://git-wip-us.apache.org/repos/asf/struts/blob/0f44e11c/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
index 56cfe9d..ab40dfc 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
@@ -100,6 +100,36 @@ public class ServletRedirectResultTest extends StrutsInternalTestCase implements
         }
     }
 
+    public void testFullUrlRedirectWithSpaces() {
+        view.setLocation("http://localhost/bar/foo some.pdf");
+        responseMock.expectAndReturn("encodeRedirectURL", C.args(C.eq("http://localhost/bar/foo some.pdf")), "http://localhost/bar/foo some.pdf");
+        responseMock.expect("sendRedirect", C.args(C.eq("http://localhost/bar/foo some.pdf")));
+
+        try {
+            view.execute(ai);
+            requestMock.verify();
+            responseMock.verify();
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    public void testFullUrlRedirectWithParams() {
+        view.setLocation("http://localhost/bar/foo.action?param=1&param 2=3");
+        responseMock.expectAndReturn("encodeRedirectURL", C.args(C.eq("http://localhost/bar/foo.action?param=1&param 2=3")), "http://localhost/bar/foo.action?param=1&param 2=3");
+        responseMock.expect("sendRedirect", C.args(C.eq("http://localhost/bar/foo.action?param=1&param 2=3")));
+
+        try {
+            view.execute(ai);
+            requestMock.verify();
+            responseMock.verify();
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
     public void testAbsoluteRedirect303() {
         view.setLocation("/bar/foo.jsp");
         view.setStatusCode(303);


[16/28] struts git commit: WW-4427 adds complete fix

Posted by lu...@apache.org.
WW-4427 adds complete fix


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/66248a80
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/66248a80
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/66248a80

Branch: refs/heads/master
Commit: 66248a80e3b238092bf547cc196ad2f7b0225b76
Parents: c5867e2 e0d7239
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Feb 17 07:49:15 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Feb 17 07:49:15 2015 +0100

----------------------------------------------------------------------
 .../com/opensymphony/xwork2/ognl/OgnlValueStack.java  |  6 ++++--
 .../opensymphony/xwork2/ognl/OgnlValueStackTest.java  | 14 ++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------



[13/28] struts git commit: WW-4427 - Converters are no longer applied to values coming from the context on error path

Posted by lu...@apache.org.
WW-4427 - Converters are no longer applied to values coming from the context on error path


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e0d72397
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e0d72397
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e0d72397

Branch: refs/heads/master
Commit: e0d72397c24542a8b83a371a36590570ccd8fd74
Parents: 76ea79f
Author: Przemek Bruski <pb...@atlassian.com>
Authored: Sun Feb 15 10:40:13 2015 +0100
Committer: Przemek Bruski <pb...@atlassian.com>
Committed: Sun Feb 15 10:40:13 2015 +0100

----------------------------------------------------------------------
 .../com/opensymphony/xwork2/ognl/OgnlValueStack.java  |  6 ++++--
 .../opensymphony/xwork2/ognl/OgnlValueStackTest.java  | 14 ++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/e0d72397/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 7fa70f7..1b09ef6 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -312,9 +312,11 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS
             setupExceptionOnFailure(throwExceptionOnFailure);
             return tryFindValueWhenExpressionIsNotNull(expr, asType);
         } catch (OgnlException e) {
-            return handleOgnlException(expr, throwExceptionOnFailure, e);
+            final Object value = handleOgnlException(expr, throwExceptionOnFailure, e);
+            return converter.convertValue(getContext(), value, asType);
         } catch (Exception e) {
-            return handleOtherException(expr, throwExceptionOnFailure, e);
+            final Object value = handleOtherException(expr, throwExceptionOnFailure, e);
+            return converter.convertValue(getContext(), value, asType);
         } finally {
             ReflectionContextState.clear(context);
         }

http://git-wip-us.apache.org/repos/asf/struts/blob/e0d72397/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
index 8c7c3ae..612435d 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
@@ -94,9 +94,12 @@ public class OgnlValueStackTest extends XWorkTestCase {
     }
 
     public void testValuesFromContextAreConverted() {
-        final OgnlValueStack vs = createValueStack();
+        testValuesFromContextAreConverted("dogName");
+        testValuesFromContextAreConverted("dog.name");
+    }
 
-        final String propertyName = "dogName";
+    private void testValuesFromContextAreConverted(String propertyName) {
+        final OgnlValueStack vs = createValueStack();
         final String propertyValue = "Rover";
         vs.getContext().put(propertyName, new String[]{propertyValue});
 
@@ -104,9 +107,12 @@ public class OgnlValueStackTest extends XWorkTestCase {
     }
 
     public void testNullValueFromContextGetsConverted() {
-        final OgnlValueStack vs = createValueStack();
+        testNullValueFromContextGetsConverted("dogName");
+        testNullValueFromContextGetsConverted("dog.name");
+    }
 
-        final String propertyName = "dogName";
+    private void testNullValueFromContextGetsConverted(String propertyName) {
+        final OgnlValueStack vs = createValueStack();
         final String propertyValue = null;
         vs.getContext().put(propertyName, propertyValue);
 


[17/28] struts git commit: WW-4473 Adds support for title attribute in SubmitHandler

Posted by lu...@apache.org.
WW-4473 Adds support for title attribute in SubmitHandler


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4ad02320
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4ad02320
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4ad02320

Branch: refs/heads/master
Commit: 4ad023207fa61e2bac96a8d88ea2bacd8da6a81b
Parents: 66248a8
Author: Lukasz Lenart <lu...@apache.org>
Authored: Fri Mar 6 21:07:17 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Fri Mar 6 21:07:17 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/struts2/views/java/simple/SubmitHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/4ad02320/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
index d7a6d7b..0f66153 100644
--- a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
+++ b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
@@ -53,7 +53,9 @@ public class SubmitHandler extends AbstractTagHandler implements TagGenerator {
                     .addIfExists("alt", params.get("label"))
                     .addIfExists("id", params.get("id"))
                     .addIfExists("class", params.get("cssClass"))
-                    .addIfExists("style", params.get("cssStyle"));
+                    .addIfExists("style", params.get("cssStyle"))
+                    .addIfExists("title", params.get("title"));
+
             start("input", attrs);
         } else {
             attrs.addIfExists("name", params.get("name"))


[27/28] struts git commit: Sets proper released version

Posted by lu...@apache.org.
Sets proper released version


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1a842d73
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1a842d73
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1a842d73

Branch: refs/heads/master
Commit: 1a842d73446fb3b0f3000617f071940ec2488078
Parents: aeed126
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 19 09:35:29 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 19 09:35:29 2015 +0100

----------------------------------------------------------------------
 apps/jboss-blank/pom.xml                        | 2 +-
 apps/mailreader/pom.xml                         | 2 +-
 apps/pom.xml                                    | 2 +-
 apps/portlet/pom.xml                            | 2 +-
 apps/rest-showcase/pom.xml                      | 4 ++--
 apps/showcase/pom.xml                           | 2 +-
 archetypes/pom.xml                              | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml      | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml     | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml    | 2 +-
 archetypes/struts2-archetype-starter/pom.xml    | 2 +-
 assembly/pom.xml                                | 2 +-
 bom/pom.xml                                     | 4 ++--
 bundles/admin/pom.xml                           | 2 +-
 bundles/demo/pom.xml                            | 2 +-
 bundles/pom.xml                                 | 2 +-
 core/pom.xml                                    | 2 +-
 plugins/cdi/pom.xml                             | 2 +-
 plugins/codebehind/pom.xml                      | 2 +-
 plugins/config-browser/pom.xml                  | 2 +-
 plugins/convention/pom.xml                      | 2 +-
 plugins/dojo/pom.xml                            | 2 +-
 plugins/dwr/pom.xml                             | 2 +-
 plugins/embeddedjsp/pom.xml                     | 2 +-
 plugins/gxp/pom.xml                             | 2 +-
 plugins/jasperreports/pom.xml                   | 2 +-
 plugins/java8-support/pom.xml                   | 2 +-
 plugins/javatemplates/pom.xml                   | 2 +-
 plugins/jfreechart/pom.xml                      | 2 +-
 plugins/jsf/pom.xml                             | 2 +-
 plugins/json/pom.xml                            | 2 +-
 plugins/junit/pom.xml                           | 2 +-
 plugins/osgi/pom.xml                            | 2 +-
 plugins/oval/pom.xml                            | 2 +-
 plugins/pell-multipart/pom.xml                  | 2 +-
 plugins/plexus/pom.xml                          | 2 +-
 plugins/pom.xml                                 | 2 +-
 plugins/portlet-tiles/pom.xml                   | 2 +-
 plugins/portlet/pom.xml                         | 2 +-
 plugins/rest/pom.xml                            | 2 +-
 plugins/sitegraph/pom.xml                       | 2 +-
 plugins/sitemesh/pom.xml                        | 2 +-
 plugins/spring/pom.xml                          | 2 +-
 plugins/struts1/pom.xml                         | 2 +-
 plugins/testng/pom.xml                          | 2 +-
 plugins/tiles/pom.xml                           | 2 +-
 plugins/tiles3/pom.xml                          | 2 +-
 pom.xml                                         | 2 +-
 xwork-core/pom.xml                              | 2 +-
 52 files changed, 54 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 4f9a353..13d5cc2 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jboss-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 6081fae..47f0a0e 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.3.23-SNAPSHOT</version>
+      <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-mailreader</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index d0e67ca..9b40d01 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.21</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index ea5d5e7..2a2d6ec 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index 689a3fe..6274423 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>2.3.23-SNAPSHOT</version>
+    <version>2.3.22</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index af5d3a1..8a6966d 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 15f5f74..137f93d 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-archetypes</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index c7d0396..49f359b 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index e1001f9..5aace4a 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index b5c4fe2..37cc459 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index 6440587..0cfe055 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index ac5c2f2..5a36f47 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 636851c..2274c56 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 0bc0d51..121e0a5 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index dbafbc9..f6486e7 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index d337af7..8fb0ab9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>struts2-bom</artifactId>
-    <version>2.3.23-SNAPSHOT</version>
+    <version>2.3.22</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -25,7 +25,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>2.3.23-SNAPSHOT</struts-version.version>
+        <struts-version.version>2.3.22</struts-version.version>
     </properties>
 
     <build>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index 9b227f3..4cd5aeb 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index 795868e..01e4f97 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 96105db..cfdf575 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-bundles</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 7d5f979..d4b2b95 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 8ded080..6867b8a 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-cdi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 7e16f92..38b233c 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-codebehind-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index ee1c986..f152a4d 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-config-browser-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index 9f315d7..f6d0bed 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-convention-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index 5a3e105..90b4540 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>struts2-plugins</artifactId>
         <groupId>org.apache.struts</groupId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 40fcd16..2e3a501 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-dwr-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index d92e740..e9d4523 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-embeddedjsp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 9dfeb63..a3cdd2d 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-gxp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 422c1f7..c6452ec 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jasperreports-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/java8-support/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml
index 64fca31..d650deb 100644
--- a/plugins/java8-support/pom.xml
+++ b/plugins/java8-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-java8-support-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 1710fe0..8b51fca 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-javatemplates-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index c9fd615..e65f3e0 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
    </parent>
 
     <artifactId>struts2-jfreechart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index e7af785..ca6ebce 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jsf-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 223ca9b..eb6d1db 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-json-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 266a371..1b37ef9 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-junit-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 039e933..c1f83e7 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index f530ddc..71860b2 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-oval-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index c77fbf6..1ad008b 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-pell-multipart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index 81e5832..f584393 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-plexus-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 864a9bd..04d1367 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-plugins</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 4974c12..71a43fc 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 1386179..c290f6b 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 3fea8c4..72aec33 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-rest-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 935a4c4..3bb22f6 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-sitegraph-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index cee9d8f..09d59ce 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-sitemesh-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 66ce73b..2ba9d25 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-spring-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index c380359..081dc33 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-struts1-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index 76b10aa..ecfe46a 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-testng-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 312b77a..bee4e72 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index a21cb6e..61ff58e 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-tiles3-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4580d52..4670d8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-parent</artifactId>
-    <version>2.3.23-SNAPSHOT</version>
+    <version>2.3.22</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/</url>

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index cc48e28..3471d88 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.23-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <groupId>org.apache.struts.xwork</groupId>


[04/28] struts git commit: Extracts string into constant

Posted by lu...@apache.org.
Extracts string into constant


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e3428c5f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e3428c5f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e3428c5f

Branch: refs/heads/master
Commit: e3428c5fe54b9e2b95f5ac1db0e8814118ac7b3c
Parents: 2433789
Author: Lukasz Lenart <lu...@apache.org>
Authored: Wed Jan 21 08:15:41 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Wed Jan 21 08:15:41 2015 +0100

----------------------------------------------------------------------
 .../org/apache/struts2/dispatcher/StrutsResultSupport.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/e3428c5f/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
index 269ed87..bbcffa3 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
@@ -110,6 +110,9 @@ public abstract class StrutsResultSupport implements Result, StrutsStatics {
     /** The default parameter */
     public static final String DEFAULT_PARAM = "location";
 
+    /** use UTF-8 as this is the recommended encoding by W3C to avoid incompatibilities. */
+    public static final String DEFAULT_URL_ENCODING = "UTF-8";
+
     private boolean parse;
     private boolean encode;
     private String location;
@@ -240,9 +243,7 @@ public abstract class StrutsResultSupport implements Result, StrutsStatics {
             if (encode) {
                 if (parsedValue != null) {
                     try {
-                        // use UTF-8 as this is the recommended encoding by W3C to
-                        // avoid incompatibilities.
-                        return URLEncoder.encode(parsedValue, "UTF-8");
+                        return URLEncoder.encode(parsedValue, DEFAULT_URL_ENCODING);
                     }
                     catch(UnsupportedEncodingException e) {
                         if (LOG.isWarnEnabled()) {


[23/28] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_22

Posted by lu...@apache.org.
[maven-release-plugin] prepare release STRUTS_2_3_22


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/22573f8d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/22573f8d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/22573f8d

Branch: refs/heads/develop
Commit: 22573f8de8b33ead0fee88eb67817985464218bb
Parents: 4f0f7d1
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 19 07:11:15 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 19 07:11:15 2015 +0100

----------------------------------------------------------------------
 apps/blank/pom.xml                              | 2 +-
 apps/jboss-blank/pom.xml                        | 2 +-
 apps/mailreader/pom.xml                         | 2 +-
 apps/pom.xml                                    | 2 +-
 apps/portlet/pom.xml                            | 2 +-
 apps/rest-showcase/pom.xml                      | 4 ++--
 apps/showcase/pom.xml                           | 2 +-
 archetypes/pom.xml                              | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml      | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml     | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml    | 2 +-
 archetypes/struts2-archetype-starter/pom.xml    | 2 +-
 assembly/pom.xml                                | 2 +-
 bom/pom.xml                                     | 8 ++++++--
 bundles/admin/pom.xml                           | 2 +-
 bundles/demo/pom.xml                            | 2 +-
 bundles/pom.xml                                 | 2 +-
 core/pom.xml                                    | 2 +-
 plugins/cdi/pom.xml                             | 2 +-
 plugins/codebehind/pom.xml                      | 2 +-
 plugins/config-browser/pom.xml                  | 2 +-
 plugins/convention/pom.xml                      | 2 +-
 plugins/dojo/pom.xml                            | 2 +-
 plugins/dwr/pom.xml                             | 2 +-
 plugins/embeddedjsp/pom.xml                     | 2 +-
 plugins/gxp/pom.xml                             | 2 +-
 plugins/jasperreports/pom.xml                   | 2 +-
 plugins/java8-support/pom.xml                   | 2 +-
 plugins/javatemplates/pom.xml                   | 2 +-
 plugins/jfreechart/pom.xml                      | 2 +-
 plugins/jsf/pom.xml                             | 2 +-
 plugins/json/pom.xml                            | 2 +-
 plugins/junit/pom.xml                           | 2 +-
 plugins/osgi/pom.xml                            | 2 +-
 plugins/oval/pom.xml                            | 2 +-
 plugins/pell-multipart/pom.xml                  | 2 +-
 plugins/plexus/pom.xml                          | 2 +-
 plugins/pom.xml                                 | 2 +-
 plugins/portlet-tiles/pom.xml                   | 2 +-
 plugins/portlet/pom.xml                         | 2 +-
 plugins/rest/pom.xml                            | 2 +-
 plugins/sitegraph/pom.xml                       | 2 +-
 plugins/sitemesh/pom.xml                        | 2 +-
 plugins/spring/pom.xml                          | 2 +-
 plugins/struts1/pom.xml                         | 2 +-
 plugins/testng/pom.xml                          | 2 +-
 plugins/tiles/pom.xml                           | 2 +-
 plugins/tiles3/pom.xml                          | 2 +-
 pom.xml                                         | 4 ++--
 xwork-core/pom.xml                              | 2 +-
 53 files changed, 60 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index a8d1cf8..48df955 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/jboss-blank/pom.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index e3da1b5..13d5cc2 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jboss-blank</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/mailreader/pom.xml
----------------------------------------------------------------------
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index e239bdb..47f0a0e 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.3.22-SNAPSHOT</version>
+      <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-mailreader</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index ae0c017..749f9b1 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
     <artifactId>struts2-apps</artifactId>
     <packaging>pom</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 38c45d2..2a2d6ec 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/rest-showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index dae55d4..6274423 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-rest-showcase</artifactId>
     <packaging>war</packaging>
-    <version>2.3.22-SNAPSHOT</version>
+    <version>2.3.22</version>
     <name>Struts 2 Rest Showcase Webapp</name>
     <description>Struts 2 Rest Showcase Example</description>
 

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/showcase/pom.xml
----------------------------------------------------------------------
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index f5b7449..8a6966d 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-showcase</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index feccd52..137f93d 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-archetypes</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-angularjs/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml
index ff146a1..49f359b 100644
--- a/archetypes/struts2-archetype-angularjs/pom.xml
+++ b/archetypes/struts2-archetype-angularjs/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-blank/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml
index 473faf7..5aace4a 100644
--- a/archetypes/struts2-archetype-blank/pom.xml
+++ b/archetypes/struts2-archetype-blank/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-convention/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml
index 7706e25..37cc459 100644
--- a/archetypes/struts2-archetype-convention/pom.xml
+++ b/archetypes/struts2-archetype-convention/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-dbportlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml
index f0d08f0..0cfe055 100644
--- a/archetypes/struts2-archetype-dbportlet/pom.xml
+++ b/archetypes/struts2-archetype-dbportlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml
index d46db49..5a36f47 100644
--- a/archetypes/struts2-archetype-plugin/pom.xml
+++ b/archetypes/struts2-archetype-plugin/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-portlet/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml
index 50e4fe6..2274c56 100644
--- a/archetypes/struts2-archetype-portlet/pom.xml
+++ b/archetypes/struts2-archetype-portlet/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/archetypes/struts2-archetype-starter/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml
index 44688f2..121e0a5 100644
--- a/archetypes/struts2-archetype-starter/pom.xml
+++ b/archetypes/struts2-archetype-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-archetypes</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 75a1a13..f6486e7 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-assembly</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/bom/pom.xml
----------------------------------------------------------------------
diff --git a/bom/pom.xml b/bom/pom.xml
index ccd3e57..e264a1e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>struts2-bom</artifactId>
-    <version>2.3.22-SNAPSHOT</version>
+    <version>2.3.22</version>
     <packaging>pom</packaging>
 
     <name>Struts 2 Bill of Materials</name>
@@ -25,7 +25,7 @@
     </licenses>
 
     <properties>
-        <struts-version.version>2.3.22-SNAPSHOT</struts-version.version>
+        <struts-version.version>2.3.22</struts-version.version>
     </properties>
 
     <build>
@@ -195,4 +195,8 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
+  <scm>
+    <tag>STRUTS_2_3_22</tag>
+  </scm>
 </project>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/bundles/admin/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml
index e4d4f3e..4cd5aeb 100644
--- a/bundles/admin/pom.xml
+++ b/bundles/admin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-admin-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/bundles/demo/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml
index cdbe762..01e4f97 100644
--- a/bundles/demo/pom.xml
+++ b/bundles/demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-osgi-bundles</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-demo-bundle</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 803015b..cfdf575 100755
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-bundles</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c310c6a..d4b2b95 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 0de0e32..6867b8a 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-cdi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/codebehind/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml
index 61cad58..38b233c 100644
--- a/plugins/codebehind/pom.xml
+++ b/plugins/codebehind/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-codebehind-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/config-browser/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 0a36c52..f152a4d 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-config-browser-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/convention/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index a8a8a4e..f6d0bed 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-convention-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/dojo/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml
index c3a48ef..90b4540 100644
--- a/plugins/dojo/pom.xml
+++ b/plugins/dojo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>struts2-plugins</artifactId>
         <groupId>org.apache.struts</groupId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/dwr/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index 446db22..2e3a501 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-dwr-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/embeddedjsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 541db6c..e9d4523 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-embeddedjsp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/gxp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index e2ca54e..a3cdd2d 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-gxp-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/jasperreports/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index 5bcf470..c6452ec 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jasperreports-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/java8-support/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml
index c99b368..d650deb 100644
--- a/plugins/java8-support/pom.xml
+++ b/plugins/java8-support/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-java8-support-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/javatemplates/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 5b0cb57..8b51fca 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-javatemplates-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/jfreechart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index 04dcef1..e65f3e0 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
    </parent>
 
     <artifactId>struts2-jfreechart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
index 616c39b..ca6ebce 100644
--- a/plugins/jsf/pom.xml
+++ b/plugins/jsf/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-jsf-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/json/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index 4050b44..eb6d1db 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-json-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/junit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 0a22bbf..1b37ef9 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-junit-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 6695e11..c1f83e7 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-osgi-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/oval/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index 7c3ad34..71860b2 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-oval-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/pell-multipart/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 57bd06e..1ad008b 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-pell-multipart-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/plexus/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index bf5b7d1..f584393 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-plexus-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 2debf26..04d1367 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-plugins</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/portlet-tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 146d577..71a43fc 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 88d06cb..c290f6b 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-portlet-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 7b183b8..72aec33 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-rest-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/sitegraph/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 0115612..3bb22f6 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-sitegraph-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/sitemesh/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 753ed3f..09d59ce 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-sitemesh-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/spring/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index f2b1aff..2ba9d25 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-spring-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/struts1/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml
index c732a76..081dc33 100644
--- a/plugins/struts1/pom.xml
+++ b/plugins/struts1/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-struts1-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/testng/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index bb68d55..ecfe46a 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-testng-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 0cd8283..bee4e72 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-tiles-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/plugins/tiles3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles3/pom.xml b/plugins/tiles3/pom.xml
index 209304f..61ff58e 100644
--- a/plugins/tiles3/pom.xml
+++ b/plugins/tiles3/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <artifactId>struts2-tiles3-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 94f9fba..d5a2405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>struts2-parent</artifactId>
-    <version>2.3.22-SNAPSHOT</version>
+    <version>2.3.22</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/</url>
@@ -31,7 +31,7 @@
         <connection>scm:git:git://git.apache.org/struts.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts.git</developerConnection>
         <url>http://git.apache.org/struts.git</url>
-        <tag>HEAD</tag>
+        <tag>STRUTS_2_3_22</tag>
     </scm>
 
     <issueManagement>

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/xwork-core/pom.xml
----------------------------------------------------------------------
diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml
index b642414..3471d88 100644
--- a/xwork-core/pom.xml
+++ b/xwork-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.3.22-SNAPSHOT</version>
+        <version>2.3.22</version>
     </parent>
 
     <groupId>org.apache.struts.xwork</groupId>


[08/28] struts git commit: WW-4453 Reports missing value

Posted by lu...@apache.org.
WW-4453 Reports missing value


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/cd0d8de6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/cd0d8de6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/cd0d8de6

Branch: refs/heads/master
Commit: cd0d8de67aacc531dbf2d5a9840b55ff46bcc817
Parents: acef492
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Jan 27 09:00:00 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Jan 27 09:00:00 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/struts2/components/Component.java   | 8 +++++++-
 core/src/main/java/org/apache/struts2/components/Date.java   | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/cd0d8de6/core/src/main/java/org/apache/struts2/components/Component.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java
index 7ed0d56..15cc698 100644
--- a/core/src/main/java/org/apache/struts2/components/Component.java
+++ b/core/src/main/java/org/apache/struts2/components/Component.java
@@ -69,6 +69,7 @@ public class Component {
      */
     protected static ConcurrentMap<Class<?>, Collection<String>> standardAttributesMap = new ConcurrentHashMap<Class<?>, Collection<String>>();
 
+    protected boolean devMode = false;
     protected ValueStack stack;
     protected Map parameters;
     protected ActionMapper actionMapper;
@@ -97,7 +98,12 @@ public class Component {
 
         return name.substring(dot + 1).toLowerCase();
     }
-    
+
+    @Inject(value = StrutsConstants.STRUTS_DEVMODE, required = false)
+    public void setDevMode(String devMode) {
+        this.devMode = Boolean.parseBoolean(devMode);
+    }
+
     @Inject
     public void setActionMapper(ActionMapper mapper) {
         this.actionMapper = mapper;

http://git-wip-us.apache.org/repos/asf/struts/blob/cd0d8de6/core/src/main/java/org/apache/struts2/components/Date.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java
index 887a5ec..0bb1207 100644
--- a/core/src/main/java/org/apache/struts2/components/Date.java
+++ b/core/src/main/java/org/apache/struts2/components/Date.java
@@ -285,6 +285,14 @@ public class Date extends ContextBean {
                 date = (java.util.Date) dateObject;
             } else if(dateObject instanceof Calendar){
                 date = ((Calendar) dateObject).getTime();
+            } else {
+                if (devMode) {
+                    LOG.error("Expression [#0] passed to <s:date/> tag which was evaluated to [#1](#2) isn't instance of java.util.Date nor java.util.Calendar!",
+                            name, dateObject, (dateObject != null ? dateObject.getClass() : "null"));
+                } else {
+                    LOG.debug("Expression [#0] passed to <s:date/> tag which was evaluated to [#1](#2) isn't instance of java.util.Date nor java.util.Calendar!",
+                            name, dateObject, (dateObject != null ? dateObject.getClass() : "null"));
+                }
             }
         } catch (Exception e) {
             LOG.error("Could not convert object with key '#0' to a java.util.Date instance", name);


[11/28] struts git commit: WW-4452 Solves problem with using -1 as headerKey

Posted by lu...@apache.org.
WW-4452 Solves problem with using -1 as headerKey


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/312a2717
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/312a2717
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/312a2717

Branch: refs/heads/master
Commit: 312a2717cf2f7094e42a83f7f05cb493c3d393c8
Parents: 46b28e0
Author: Lukasz Lenart <lu...@apache.org>
Authored: Mon Feb 2 21:22:42 2015 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Mon Feb 2 21:22:42 2015 +0100

----------------------------------------------------------------------
 .../resources/org/apache/struts2/static/inputtransferselect.js     | 2 +-
 .../resources/org/apache/struts2/static/optiontransferselect.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/312a2717/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js b/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
index c983d69..bda929e 100644
--- a/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
+++ b/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
@@ -63,7 +63,7 @@ function compile(ptn) {
     	if (ptn == '' || !window.RegExp) {
             return function(val) { return val == ptn; }
         } else {
-            var reg = new RegExp(ptn);
+            var reg = new RegExp("^" + ptn + "$");
             return function (val) {
                 if (val == '') { // ignore empty option added by template
                 	return true;

http://git-wip-us.apache.org/repos/asf/struts/blob/312a2717/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
index 85a2e28..105addf 100644
--- a/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
+++ b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
@@ -44,7 +44,7 @@ function compile(ptn) {
     	if (ptn == '' || !window.RegExp) {
             return function(val) { return val == ptn; }
         } else {
-            var reg = new RegExp("\\b" + ptn);
+            var reg = new RegExp("^" + ptn + "$");
             return function (val) { 
                 if (val == '') { // ignore empty option added by template 
                 	return true;