svn commit: r13533 - /dev/struts/2.5/

2016-05-05 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu May  5 15:13:42 2016
New Revision: 13533

Log:
Updates test release 2.5

Added:
dev/struts/2.5/
dev/struts/2.5/struts-2.5-all.zip   (with props)
dev/struts/2.5/struts-2.5-all.zip.asc   (with props)
dev/struts/2.5/struts-2.5-all.zip.md5
dev/struts/2.5/struts-2.5-all.zip.sha1
dev/struts/2.5/struts-2.5-apps.zip   (with props)
dev/struts/2.5/struts-2.5-apps.zip.asc   (with props)
dev/struts/2.5/struts-2.5-apps.zip.md5
dev/struts/2.5/struts-2.5-apps.zip.sha1
dev/struts/2.5/struts-2.5-docs.zip   (with props)
dev/struts/2.5/struts-2.5-docs.zip.asc   (with props)
dev/struts/2.5/struts-2.5-docs.zip.md5
dev/struts/2.5/struts-2.5-docs.zip.sha1
dev/struts/2.5/struts-2.5-lib.zip   (with props)
dev/struts/2.5/struts-2.5-lib.zip.asc   (with props)
dev/struts/2.5/struts-2.5-lib.zip.md5
dev/struts/2.5/struts-2.5-lib.zip.sha1
dev/struts/2.5/struts-2.5-min-lib.zip   (with props)
dev/struts/2.5/struts-2.5-min-lib.zip.asc   (with props)
dev/struts/2.5/struts-2.5-min-lib.zip.md5
dev/struts/2.5/struts-2.5-min-lib.zip.sha1
dev/struts/2.5/struts-2.5-src.zip   (with props)
dev/struts/2.5/struts-2.5-src.zip.asc   (with props)
dev/struts/2.5/struts-2.5-src.zip.md5
dev/struts/2.5/struts-2.5-src.zip.sha1

Added: dev/struts/2.5/struts-2.5-all.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5/struts-2.5-all.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5/struts-2.5-all.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5/struts-2.5-all.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5/struts-2.5-all.zip.md5
==
--- dev/struts/2.5/struts-2.5-all.zip.md5 (added)
+++ dev/struts/2.5/struts-2.5-all.zip.md5 Thu May  5 15:13:42 2016
@@ -0,0 +1 @@
+4d09dfb05792a02ede32806aabf2b11e
\ No newline at end of file

Added: dev/struts/2.5/struts-2.5-all.zip.sha1
==
--- dev/struts/2.5/struts-2.5-all.zip.sha1 (added)
+++ dev/struts/2.5/struts-2.5-all.zip.sha1 Thu May  5 15:13:42 2016
@@ -0,0 +1 @@
+a807da28e6e4c17243c889f808d1fd878e874b1e
\ No newline at end of file

Added: dev/struts/2.5/struts-2.5-apps.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5/struts-2.5-apps.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5/struts-2.5-apps.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5/struts-2.5-apps.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5/struts-2.5-apps.zip.md5
==
--- dev/struts/2.5/struts-2.5-apps.zip.md5 (added)
+++ dev/struts/2.5/struts-2.5-apps.zip.md5 Thu May  5 15:13:42 2016
@@ -0,0 +1 @@
+7c571dc4d94c0b0be730fc6b299db2f2
\ No newline at end of file

Added: dev/struts/2.5/struts-2.5-apps.zip.sha1
==
--- dev/struts/2.5/struts-2.5-apps.zip.sha1 (added)
+++ dev/struts/2.5/struts-2.5-apps.zip.sha1 Thu May  5 15:13:42 2016
@@ -0,0 +1 @@
+ac488354759f63665f22dc98432b927612e74488
\ No newline at end of file

Added: dev/struts/2.5/struts-2.5-docs.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5/struts-2.5-docs.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5/struts-2.5-docs.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5/struts-2.5-docs.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5/struts-2.5-docs.zip.md5
==
--- dev/struts/2.5/struts-2.5-docs.zip.md5 (added)
+++ dev/struts/2.5/struts-2.5-docs.zip.md5 Thu May  5 15:13:42 2016
@@ -0,0 +1 @@
+acae4bcbd5e18a2e5ed29defd762c85d
\ No newline at end of file

Added: dev/struts/2.5/struts-2.5-docs.zip.sha1

[struts] Git Push Summary

2016-05-05 Thread lukaszlenart 
Repository: struts
Updated Tags:  refs/tags/STRUTS_2_5 [created] 51edcf080

struts git commit: [maven-release-plugin] prepare release STRUTS_2_5

2016-05-05 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 59210a7e0 -> 4bee55fee


[maven-release-plugin] prepare release STRUTS_2_5


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

Branch: refs/heads/master
Commit: 4bee55fee30086c786d09503125a2b1c2ae8dcfa
Parents: 59210a7
Author: Lukasz Lenart 
Authored: Thu May 5 15:21:26 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu May 5 15:21:26 2016 +0200

--
 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/bean-validation/pom.xml | 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/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/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/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 pom.xml | 4 ++--
 45 files changed, 52 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/4bee55fe/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 87de124..ef6ad08 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5-SNAPSHOT
+2.5
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/4bee55fe/apps/portlet/pom.xml
--
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 388b9c4..efbffc7 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5-SNAPSHOT
+2.5
 
 
 struts2-portlet

http://git-wip-us.apache.org/repos/asf/struts/blob/4bee55fe/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index b02923c..f81ab26 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5-SNAPSHOT
+2.5
 
 
 struts2-rest-showcase
 war
-2.5-SNAPSHOT
+2.5
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/4bee55fe/apps/showcase/pom.xml
--
diff --git a/apps/showcase/pom.xml

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

2016-05-05 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 4bee55fee -> 3a78fd1a1


[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/3a78fd1a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3a78fd1a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3a78fd1a

Branch: refs/heads/master
Commit: 3a78fd1a11c297cd7168a95fe48e0e4de530c3cc
Parents: 4bee55f
Author: Lukasz Lenart 
Authored: Thu May 5 15:21:50 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu May 5 15:21:50 2016 +0200

--
 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/bean-validation/pom.xml | 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/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/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/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 pom.xml | 4 ++--
 45 files changed, 48 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/3a78fd1a/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index ef6ad08..ab871b0 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.5
+2.5.1-SNAPSHOT
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/3a78fd1a/apps/portlet/pom.xml
--
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index efbffc7..dbed817 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.5
+2.5.1-SNAPSHOT
 
 
 struts2-portlet

http://git-wip-us.apache.org/repos/asf/struts/blob/3a78fd1a/apps/rest-showcase/pom.xml
--
diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml
index f81ab26..6e7e0c0 100644
--- a/apps/rest-showcase/pom.xml
+++ b/apps/rest-showcase/pom.xml
@@ -26,12 +26,12 @@
 
 org.apache.struts
 struts2-apps
-2.5
+2.5.1-SNAPSHOT
 
 
 struts2-rest-showcase
 war
-2.5
+2.5.1-SNAPSHOT
 Struts 2 Rest Showcase Webapp
 Struts 2 Rest Showcase Example
 

http://git-wip-us.apache.org/repos/asf/struts/blob/3a78fd1a/apps/showcase/pom.xml
--
diff --git

svn commit: r987524 - /websites/production/struts/content/docs/action-configuration.html

2016-05-05 Thread lukaszlenart 
Author: lukaszlenart
Date: Thu May  5 13:12:32 2016
New Revision: 987524

Log:
Updates production

Modified:
websites/production/struts/content/docs/action-configuration.html

Modified: websites/production/struts/content/docs/action-configuration.html
==
--- websites/production/struts/content/docs/action-configuration.html (original)
+++ websites/production/struts/content/docs/action-configuration.html Thu May  
5 13:12:32 2016
@@ -139,11 +139,11 @@ under the License.
 
 
 The action mappings are the basic 
"unit-of-work" in the framework. Essentially, the action maps an identifier to 
a handler class. When a request matches the action's name, the framework uses 
the mapping to determine how to process the request./**/
+/*]]>*/
 Action MappingsAction 
NamesAction MethodsWildcard 
MethodDynamic Method 
Invocation
 Strict DMIStrict Method 
Invocation
 ActionSupport 
DefaultPost-Back DefaultAction Default
@@ -216,7 +216,7 @@ public class CrudAction {
   /package
 /struts
 
-Strict Method 
InvocationIn Struts 2.5 the Strict DMI was extended and it's called 
"Strict Method Invocation" aka SMI. You can imagine that the DMI is a "border 
police", where SMI is a "tax police" and keeps eye on internals. With this 
version SMI is enabled by default (strict-method-invocation 
attribute is set totrue by default 
instruts-default package), you have option to disable it per 
package - there is no global switch to disable SMI for the whole application. 
To gain advantage of new configuration option please use the latest DTD 
definition:Struts 
2.5 DTD
+Strict Method 
InvocationIn Struts 2.5 the Strict DMI was extended and it's called 
Strict Method Invocationaka SMI. You can imagine that 
the DMI is a "border police", where SMI is a "tax police" and keeps eye on 
internals. With this version, SMI is enabled by default 
(strict-method-invocation attribute is set 
totrue by default instruts-default 
package), you have option to disable it per package - there is no global switch 
to disable SMI for the whole application. To gain advantage of new 
configuration option please use the latest DTD definition:Struts 2.5 DTD
 ?xml version="1.0" encoding="UTF-8" ?
 !DOCTYPE struts PUBLIC
 "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
@@ -224,7 +224,7 @@ public class CrudAction {
 struts
 ...
 /struts
-SMI works in the following way:allowed-methods/ 
@AllowedMethodsis defined per action - SMI works without 
switching it on but just for those actions (plus adding 
global-allowed-methods/)SMI is enabled but no 
allowed-methods/ 
@AllowedMethodsare defined - SMI works but only with 
global-allowed-methods/SMI is disabled - call to any action method is allowed 
(Regex: .*)You can configure SMI per 
action/ usinfallowed-methods/ 
tag or via@AllowedMethod annotation plus using 
perpackage/global-allowed-methods/,
 see the examples below:SMI via 
struts.xml
+SMI works in the following way:allowed-methods/ 
@AllowedMethodsis defined per action - SMI works without 
switching it on but just for those actions (plus adding 
global-allowed-methods/)SMI is enabled but no 
allowed-methods/ 
@AllowedMethodsare defined - SMI works but only with 
global-allowed-methods/SMI is disabled - call to any action method is allowed that matches 
the default RegEx -([A-Za-z0-9_$]*)You 
can redefine the default RegEx by using a constant as 
followconstant name="struts.strictMethodInvocation.methodRegex" 
value="([a-zA-Z]*)"/When using wildcard mapping in 
actions' definitions SMI works in two ways:SMI is disabled - any wildcard will be substituted with the 
default RegEx, ie.: action name="Person*" 
method="perform*" will be translated into allowedMethod = 
"regex:perform([A-Za-z0-9_$]*)".SMI is enabled - no wildcard 
substitution will happen, you must strictly define which methods can be 
accessed by annotations or allowed-method/ 
tag.You can 
configure SMI per action/ 
usingallowed-methods/ tag or 
via@AllowedMethod annotation plus using 
perpackage/global-allowed-methods/,
 see the examples below:SMI via struts.xml
 package ...
   ...
   
global-allowed-methodsexecute,input,back,cancel,browse/global-allowed-methods

struts git commit: Upgrades commons-collections

2016-05-05 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 731fde544 -> ca2547612


Upgrades commons-collections


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

Branch: refs/heads/support-2-3
Commit: ca2547612001cb1eb422517dea19086ab2cf437c
Parents: 731fde5
Author: Lukasz Lenart 
Authored: Thu May 5 10:46:56 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu May 5 10:46:56 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/ca254761/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c465aaf..ba60e74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -759,7 +759,7 @@
 
 commons-collections
 commons-collections
-3.1
+3.2.2
 
 
 commons-fileupload

[2/5] struts git commit: Turns SMI on by default

2016-05-05 Thread lukaszlenart 
Turns SMI on by default


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

Branch: refs/heads/master
Commit: 6da61ffdd7577ebaa43ced8189cc971519950b0b
Parents: 4ad0854
Author: Lukasz Lenart 
Authored: Thu May 5 10:37:22 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu May 5 10:37:22 2016 +0200

--
 .../java/com/opensymphony/xwork2/config/entities/ActionConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/6da61ffd/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
index 1958f53..1b83738 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
@@ -53,7 +53,7 @@ public class ActionConfig extends Located implements 
Serializable {
 protected String methodName;
 protected String packageName;
 protected String name;
-protected boolean strictMethodInvocation;
+protected boolean strictMethodInvocation = true;
 protected AllowedMethods allowedMethods;
 
 protected ActionConfig(String packageName, String name, String className) {

[1/5] struts git commit: Upgrades common-collections

2016-05-05 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master 02b207fca -> 59210a7e0


Upgrades common-collections


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

Branch: refs/heads/master
Commit: 4ad085469ee3f233e70aefadb446273224250b46
Parents: 02b207f
Author: Lukasz Lenart 
Authored: Thu May 5 10:37:09 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu May 5 10:37:09 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/4ad08546/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ffd84c1..5d284a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -706,7 +706,7 @@
 
 commons-collections
 commons-collections
-3.2.1
+3.2.2
 
 
 commons-fileupload

[3/5] struts git commit: Uses pattern to calculate hashCode and equals

2016-05-05 Thread lukaszlenart 
Uses pattern to calculate hashCode and equals


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

Branch: refs/heads/master
Commit: af27d692dedc0c79f4d26fc4d0fc404c65227fa7
Parents: 6da61ff
Author: Lukasz Lenart 
Authored: Thu May 5 10:37:42 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu May 5 10:37:42 2016 +0200

--
 .../com/opensymphony/xwork2/config/entities/AllowedMethods.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/af27d692/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
index d7741da..d81de5a 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java
@@ -154,13 +154,13 @@ public class AllowedMethods {
 
 PatternAllowedMethod that = (PatternAllowedMethod) o;
 
-return original.equals(that.original);
+return 
allowedMethodPattern.pattern().equals(that.allowedMethodPattern.pattern());
 
 }
 
 @Override
 public int hashCode() {
-return original.hashCode();
+return allowedMethodPattern.pattern().hashCode();
 }
 
 @Override

[4/5] struts git commit: Adds some logging

2016-05-05 Thread lukaszlenart 
Adds some logging


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

Branch: refs/heads/master
Commit: bb9df6c7d3d499d09d6406397aacb12e455d2852
Parents: af27d69
Author: Lukasz Lenart 
Authored: Thu May 5 10:37:54 2016 +0200
Committer: Lukasz Lenart 
Committed: Thu May 5 10:37:54 2016 +0200

--
 .../xwork2/config/providers/XmlConfigurationProvider.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/bb9df6c7/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
 
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index e761b4b..4e76bb2 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -873,11 +873,13 @@ public class XmlConfigurationProvider implements 
ConfigurationProvider {
 // user enabled Strict DMI but didn't defined action specific 
'allowed-methods' so we use 'global-allowed-methods' only
 allowedMethods = new 
HashSet<>(packageContext.getGlobalAllowedMethods());
 } else {
-// Strict DMI is disabled to any method can be called
+// Strict DMI is disabled so any method can be called
 allowedMethods = new HashSet<>();
 allowedMethods.add(ActionConfig.WILDCARD);
 }
 
+LOG.debug("Collected allowed methods: {}", allowedMethods);
+
 return Collections.unmodifiableSet(allowedMethods);
 }