svn commit: r16478 - /dev/struts/2.5.5/
Author: lukaszlenart Date: Tue Oct 11 19:34:14 2016 New Revision: 16478 Log: Updates test release 2.5.5 Added: dev/struts/2.5.5/ dev/struts/2.5.5/struts-2.5.5-all.zip (with props) dev/struts/2.5.5/struts-2.5.5-all.zip.asc (with props) dev/struts/2.5.5/struts-2.5.5-all.zip.md5 dev/struts/2.5.5/struts-2.5.5-all.zip.sha1 dev/struts/2.5.5/struts-2.5.5-apps.zip (with props) dev/struts/2.5.5/struts-2.5.5-apps.zip.asc (with props) dev/struts/2.5.5/struts-2.5.5-apps.zip.md5 dev/struts/2.5.5/struts-2.5.5-apps.zip.sha1 dev/struts/2.5.5/struts-2.5.5-docs.zip (with props) dev/struts/2.5.5/struts-2.5.5-docs.zip.asc (with props) dev/struts/2.5.5/struts-2.5.5-docs.zip.md5 dev/struts/2.5.5/struts-2.5.5-docs.zip.sha1 dev/struts/2.5.5/struts-2.5.5-lib.zip (with props) dev/struts/2.5.5/struts-2.5.5-lib.zip.asc (with props) dev/struts/2.5.5/struts-2.5.5-lib.zip.md5 dev/struts/2.5.5/struts-2.5.5-lib.zip.sha1 dev/struts/2.5.5/struts-2.5.5-min-lib.zip (with props) dev/struts/2.5.5/struts-2.5.5-min-lib.zip.asc (with props) dev/struts/2.5.5/struts-2.5.5-min-lib.zip.md5 dev/struts/2.5.5/struts-2.5.5-min-lib.zip.sha1 dev/struts/2.5.5/struts-2.5.5-src.zip (with props) dev/struts/2.5.5/struts-2.5.5-src.zip.asc (with props) dev/struts/2.5.5/struts-2.5.5-src.zip.md5 dev/struts/2.5.5/struts-2.5.5-src.zip.sha1 Added: dev/struts/2.5.5/struts-2.5.5-all.zip == Binary file - no diff available. Propchange: dev/struts/2.5.5/struts-2.5.5-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.5/struts-2.5.5-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.5/struts-2.5.5-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.5/struts-2.5.5-all.zip.md5 == --- dev/struts/2.5.5/struts-2.5.5-all.zip.md5 (added) +++ dev/struts/2.5.5/struts-2.5.5-all.zip.md5 Tue Oct 11 19:34:14 2016 @@ -0,0 +1 @@ +7493ba2a5925c4e100737278664cffd8 \ No newline at end of file Added: dev/struts/2.5.5/struts-2.5.5-all.zip.sha1 == --- dev/struts/2.5.5/struts-2.5.5-all.zip.sha1 (added) +++ dev/struts/2.5.5/struts-2.5.5-all.zip.sha1 Tue Oct 11 19:34:14 2016 @@ -0,0 +1 @@ +7c94b4cc4818785c554d50c769eaa0800caafd95 \ No newline at end of file Added: dev/struts/2.5.5/struts-2.5.5-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.5.5/struts-2.5.5-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.5/struts-2.5.5-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.5/struts-2.5.5-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.5/struts-2.5.5-apps.zip.md5 == --- dev/struts/2.5.5/struts-2.5.5-apps.zip.md5 (added) +++ dev/struts/2.5.5/struts-2.5.5-apps.zip.md5 Tue Oct 11 19:34:14 2016 @@ -0,0 +1 @@ +f3f38f6d494b3fe0d09b6419f5d21a3a \ No newline at end of file Added: dev/struts/2.5.5/struts-2.5.5-apps.zip.sha1 == --- dev/struts/2.5.5/struts-2.5.5-apps.zip.sha1 (added) +++ dev/struts/2.5.5/struts-2.5.5-apps.zip.sha1 Tue Oct 11 19:34:14 2016 @@ -0,0 +1 @@ +485666c64819c49396eea1b5bf3f8988a9cacf96 \ No newline at end of file Added: dev/struts/2.5.5/struts-2.5.5-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.5.5/struts-2.5.5-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.5.5/struts-2.5.5-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.5.5/struts-2.5.5-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.5.5/struts-2.5.5-docs.zip.md5 == --- dev/struts/2.5.5/struts-2.5.5-docs.zip.md5 (added) +++
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/master f2348e53c -> 91d6691b0 [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/91d6691b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/91d6691b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/91d6691b Branch: refs/heads/master Commit: 91d6691b0d8c094ed7b7acab08553e59cb9f77ae Parents: f2348e5 Author: Lukasz LenartAuthored: Tue Oct 11 20:40:50 2016 +0200 Committer: Lukasz Lenart Committed: Tue Oct 11 20:40:50 2016 +0200 -- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/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/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 ++-- 35 files changed, 38 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/91d6691b/apps/pom.xml -- diff --git a/apps/pom.xml b/apps/pom.xml index 5fe0ac5..99d42b3 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent -2.5.5 +2.5.6-SNAPSHOT struts2-apps pom http://git-wip-us.apache.org/repos/asf/struts/blob/91d6691b/apps/rest-showcase/pom.xml -- diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index b014f23..f668825 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps -2.5.5 +2.5.6-SNAPSHOT struts2-rest-showcase war -2.5.5 +2.5.6-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example http://git-wip-us.apache.org/repos/asf/struts/blob/91d6691b/apps/showcase/pom.xml -- diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index c3e3120..156c65f 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.5.5 +2.5.6-SNAPSHOT struts2-showcase http://git-wip-us.apache.org/repos/asf/struts/blob/91d6691b/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index ea14635..d32b1a0 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent -2.5.5 +2.5.6-SNAPSHOT struts2-assembly http://git-wip-us.apache.org/repos/asf/struts/blob/91d6691b/bom/pom.xml -- diff --git a/bom/pom.xml b/bom/pom.xml index 282a6be..30b2c08 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ struts2-bom -2.5.5 +2.5.6-SNAPSHOT pom Struts 2 Bill of Materials @@ -25,7 +25,7 @@ -2.5.5 +2.5.6-SNAPSHOT @@ -170,8 +170,4 @@ - - -STRUTS_2_5_5 - http://git-wip-us.apache.org/repos/asf/struts/blob/91d6691b/bundles/admin/pom.xml -- diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index eb1a1f0..ecbbb88 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_5_5 [created] 925dc556b
struts git commit: [maven-release-plugin] prepare release STRUTS_2_5_5
Repository: struts Updated Branches: refs/heads/master 5975b7aac -> f2348e53c [maven-release-plugin] prepare release STRUTS_2_5_5 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f2348e53 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f2348e53 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f2348e53 Branch: refs/heads/master Commit: f2348e53cbdf8ad7d9c28c66dc6fefe2c5718636 Parents: 5975b7a Author: Lukasz LenartAuthored: Tue Oct 11 20:40:26 2016 +0200 Committer: Lukasz Lenart Committed: Tue Oct 11 20:40:26 2016 +0200 -- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/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/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 ++-- 35 files changed, 42 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/f2348e53/apps/pom.xml -- diff --git a/apps/pom.xml b/apps/pom.xml index 0b75f72..5fe0ac5 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent -2.5.5-SNAPSHOT +2.5.5 struts2-apps pom http://git-wip-us.apache.org/repos/asf/struts/blob/f2348e53/apps/rest-showcase/pom.xml -- diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 27e1578..b014f23 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps -2.5.5-SNAPSHOT +2.5.5 struts2-rest-showcase war -2.5.5-SNAPSHOT +2.5.5 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example http://git-wip-us.apache.org/repos/asf/struts/blob/f2348e53/apps/showcase/pom.xml -- diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 13d99e4..c3e3120 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.5.5-SNAPSHOT +2.5.5 struts2-showcase http://git-wip-us.apache.org/repos/asf/struts/blob/f2348e53/assembly/pom.xml -- diff --git a/assembly/pom.xml b/assembly/pom.xml index 392215f..ea14635 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-parent -2.5.5-SNAPSHOT +2.5.5 struts2-assembly http://git-wip-us.apache.org/repos/asf/struts/blob/f2348e53/bom/pom.xml -- diff --git a/bom/pom.xml b/bom/pom.xml index 202b339..282a6be 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -10,7 +10,7 @@ struts2-bom -2.5.5-SNAPSHOT +2.5.5 pom Struts 2 Bill of Materials @@ -25,7 +25,7 @@ -2.5.5-SNAPSHOT +2.5.5 @@ -170,4 +170,8 @@ + + +STRUTS_2_5_5 + http://git-wip-us.apache.org/repos/asf/struts/blob/f2348e53/bundles/admin/pom.xml -- diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index cb4e8db..eb1a1f0 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@
[1/2] struts git commit: WW-4697 If DMI is enabled, exclude action|method params
Repository: struts Updated Branches: refs/heads/master dbf2bcb5c -> 5975b7aac WW-4697 If DMI is enabled, exclude action|method params Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/58016388 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/58016388 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/58016388 Branch: refs/heads/master Commit: 580163880c11af3b0f41538c93af5930ba41ab14 Parents: dbf2bcb Author: Lukasz LenartAuthored: Tue Oct 11 08:28:28 2016 +0200 Committer: Lukasz Lenart Committed: Tue Oct 11 08:28:28 2016 +0200 -- .../xwork2/security/DefaultExcludedPatternsChecker.java | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/58016388/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java -- diff --git a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java index 84840f5..e8f7282 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java +++ b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java @@ -3,8 +3,10 @@ package com.opensymphony.xwork2.security; import com.opensymphony.xwork2.XWorkConstants; import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.struts2.StrutsConstants; import java.util.Arrays; import java.util.HashSet; @@ -17,8 +19,7 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker { public static final String[] EXCLUDED_PATTERNS = { "(^|\\%\\{)((#?)(top(\\.|\\['|\\[\")|\\[\\d\\]\\.)?)(dojo|struts|session|request|response|application|servlet(Request|Response|Context)|parameters|context|_memberAccess)(\\.|\\[).*", -".*(^|\\.|\\[|\\'|\"|get)class(\\(\\.|\\[|\\'|\").*", -"^(action|method):.*" +".*(^|\\.|\\[|\\'|\"|get)class(\\(\\.|\\[|\\'|\").*" }; private Set excludedPatterns; @@ -45,6 +46,13 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker { } } +@Inject(value = StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION, required = false) +public void setDynamicMethodInvocation(String dmiValue) { +if (BooleanUtils.toBoolean(dmiValue)) { +setAdditionalExcludePatterns("^(action|method):.*"); +} +} + public void setExcludedPatterns(String commaDelimitedPatterns) { setExcludedPatterns(TextParseUtil.commaDelimitedStringToSet(commaDelimitedPatterns)); }
[2/2] struts git commit: WW-4697 If DMI is sisabled, exclude action|method params
WW-4697 If DMI is sisabled, exclude action|method params Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5975b7aa Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5975b7aa Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5975b7aa Branch: refs/heads/master Commit: 5975b7aac7c9fd933aec80d3d3450190f9c2e8fd Parents: 5801638 Author: Lukasz LenartAuthored: Tue Oct 11 10:14:25 2016 +0200 Committer: Lukasz Lenart Committed: Tue Oct 11 10:14:25 2016 +0200 -- .../com/opensymphony/xwork2/config/impl/MockConfiguration.java | 2 ++ .../xwork2/config/providers/XWorkConfigurationProvider.java | 2 ++ .../xwork2/security/DefaultExcludedPatternsChecker.java | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/5975b7aa/core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java -- diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java index 3148f05..120d3f9 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java @@ -24,6 +24,7 @@ import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.ContainerBuilder; import com.opensymphony.xwork2.inject.Scope; import com.opensymphony.xwork2.util.location.LocatableProperties; +import org.apache.struts2.StrutsConstants; import java.util.*; @@ -51,6 +52,7 @@ public class MockConfiguration implements Configuration { builder.constant(XWorkConstants.DEV_MODE, "false"); builder.constant(XWorkConstants.RELOAD_XML_CONFIGURATION, "true"); builder.constant(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE, "true"); + builder.constant(StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION, "false"); container = builder.create(true); } http://git-wip-us.apache.org/repos/asf/struts/blob/5975b7aa/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java -- diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java index 89e8f97..0141e62 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java @@ -87,6 +87,7 @@ import com.opensymphony.xwork2.validator.ValidatorFactory; import com.opensymphony.xwork2.validator.ValidatorFileParser; import ognl.MethodAccessor; import ognl.PropertyAccessor; +import org.apache.struts2.StrutsConstants; import java.util.ArrayList; import java.util.Collection; @@ -181,6 +182,7 @@ public class XWorkConfigurationProvider implements ConfigurationProvider { .factory(AcceptedPatternsChecker.class, DefaultAcceptedPatternsChecker.class, Scope.PROTOTYPE) ; + props.setProperty(StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION, Boolean.FALSE.toString()); props.setProperty(XWorkConstants.DEV_MODE, Boolean.FALSE.toString()); props.setProperty(XWorkConstants.LOG_MISSING_PROPERTIES, Boolean.FALSE.toString()); props.setProperty(XWorkConstants.ENABLE_OGNL_EXPRESSION_CACHE, Boolean.TRUE.toString()); http://git-wip-us.apache.org/repos/asf/struts/blob/5975b7aa/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java -- diff --git a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java index e8f7282..687d17f 100644 --- a/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java +++ b/core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java @@ -46,9 +46,10 @@ public class DefaultExcludedPatternsChecker implements ExcludedPatternsChecker { } } -@Inject(value = StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION, required = false) +@Inject(StrutsConstants.STRUTS_ENABLE_DYNAMIC_METHOD_INVOCATION) public void setDynamicMethodInvocation(String dmiValue) { -if (BooleanUtils.toBoolean(dmiValue)) { +if (!BooleanUtils.toBoolean(dmiValue)) { +