struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_28
Repository: struts Updated Branches: refs/heads/support-2-3 6b497ef8f -> 0ac8932aa [maven-release-plugin] prepare release STRUTS_2_3_28 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0ac8932a Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0ac8932a Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0ac8932a Branch: refs/heads/support-2-3 Commit: 0ac8932aa3a1b28a8f950863c17165cdc63b1474 Parents: 6b497ef Author: Lukasz Lenart Authored: Fri Mar 18 20:50:41 2016 +0100 Committer: Lukasz Lenart Committed: Fri Mar 18 20:50:41 2016 +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 | 6 +++--- 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, 57 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0ac8932a/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 071de78..326dc33 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.28-SNAPSHOT +2.3.28 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/0ac8932a/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index d26f89c..a49e05e 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.28-SNAPSHOT +2.3.28 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/0ac8932a/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index a987238..cc4044c 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.x
struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_27
Repository: struts Updated Branches: refs/heads/support-2-3 f48c30eaa -> 8a59ed02c [maven-release-plugin] prepare release STRUTS_2_3_27 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8a59ed02 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8a59ed02 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8a59ed02 Branch: refs/heads/support-2-3 Commit: 8a59ed02c958db9213f0e54d816882a902891761 Parents: f48c30e Author: Lukasz Lenart Authored: Fri Mar 18 08:54:31 2016 +0100 Committer: Lukasz Lenart Committed: Fri Mar 18 08:54:31 2016 +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 | 6 +++--- 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, 57 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/8a59ed02/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 060cc2a..ac7a974 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.27-SNAPSHOT +2.3.27 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/8a59ed02/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 3c9a4c7..10018aa 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.27-SNAPSHOT +2.3.27 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/8a59ed02/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 2173a0b..f03d9af 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.x
svn commit: r12780 - /dev/struts/2.3.27/
Author: lukaszlenart Date: Fri Mar 18 08:55:59 2016 New Revision: 12780 Log: Updates test release 2.3.27 Added: dev/struts/2.3.27/ dev/struts/2.3.27/struts-2.3.27-all.zip (with props) dev/struts/2.3.27/struts-2.3.27-all.zip.asc (with props) dev/struts/2.3.27/struts-2.3.27-all.zip.md5 dev/struts/2.3.27/struts-2.3.27-all.zip.sha1 dev/struts/2.3.27/struts-2.3.27-apps.zip (with props) dev/struts/2.3.27/struts-2.3.27-apps.zip.asc (with props) dev/struts/2.3.27/struts-2.3.27-apps.zip.md5 dev/struts/2.3.27/struts-2.3.27-apps.zip.sha1 dev/struts/2.3.27/struts-2.3.27-docs.zip (with props) dev/struts/2.3.27/struts-2.3.27-docs.zip.asc (with props) dev/struts/2.3.27/struts-2.3.27-docs.zip.md5 dev/struts/2.3.27/struts-2.3.27-docs.zip.sha1 dev/struts/2.3.27/struts-2.3.27-lib.zip (with props) dev/struts/2.3.27/struts-2.3.27-lib.zip.asc (with props) dev/struts/2.3.27/struts-2.3.27-lib.zip.md5 dev/struts/2.3.27/struts-2.3.27-lib.zip.sha1 dev/struts/2.3.27/struts-2.3.27-min-lib.zip (with props) dev/struts/2.3.27/struts-2.3.27-min-lib.zip.asc (with props) dev/struts/2.3.27/struts-2.3.27-min-lib.zip.md5 dev/struts/2.3.27/struts-2.3.27-min-lib.zip.sha1 dev/struts/2.3.27/struts-2.3.27-src.zip (with props) dev/struts/2.3.27/struts-2.3.27-src.zip.asc (with props) dev/struts/2.3.27/struts-2.3.27-src.zip.md5 dev/struts/2.3.27/struts-2.3.27-src.zip.sha1 Added: dev/struts/2.3.27/struts-2.3.27-all.zip == Binary file - no diff available. Propchange: dev/struts/2.3.27/struts-2.3.27-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.27/struts-2.3.27-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.27/struts-2.3.27-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.27/struts-2.3.27-all.zip.md5 == --- dev/struts/2.3.27/struts-2.3.27-all.zip.md5 (added) +++ dev/struts/2.3.27/struts-2.3.27-all.zip.md5 Fri Mar 18 08:55:59 2016 @@ -0,0 +1 @@ +35cae0c6e32177ed4055aaab246b36e6 \ No newline at end of file Added: dev/struts/2.3.27/struts-2.3.27-all.zip.sha1 == --- dev/struts/2.3.27/struts-2.3.27-all.zip.sha1 (added) +++ dev/struts/2.3.27/struts-2.3.27-all.zip.sha1 Fri Mar 18 08:55:59 2016 @@ -0,0 +1 @@ +130bc64a9569778fcc0978aba633fe808c2d2abc \ No newline at end of file Added: dev/struts/2.3.27/struts-2.3.27-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.3.27/struts-2.3.27-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.27/struts-2.3.27-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.27/struts-2.3.27-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.27/struts-2.3.27-apps.zip.md5 == --- dev/struts/2.3.27/struts-2.3.27-apps.zip.md5 (added) +++ dev/struts/2.3.27/struts-2.3.27-apps.zip.md5 Fri Mar 18 08:55:59 2016 @@ -0,0 +1 @@ +97191acbe7714b17cd71d393cfa1061a \ No newline at end of file Added: dev/struts/2.3.27/struts-2.3.27-apps.zip.sha1 == --- dev/struts/2.3.27/struts-2.3.27-apps.zip.sha1 (added) +++ dev/struts/2.3.27/struts-2.3.27-apps.zip.sha1 Fri Mar 18 08:55:59 2016 @@ -0,0 +1 @@ +2a15004bcb91ebfe79c054038261a5b770636e10 \ No newline at end of file Added: dev/struts/2.3.27/struts-2.3.27-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.3.27/struts-2.3.27-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.27/struts-2.3.27-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.27/struts-2.3.27-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.27/struts-2.3.27-docs.zip.md5 =
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_27 [created] db7bfb465
struts git commit: Adds proper logic to exclude MemberAccess
Repository: struts
Updated Branches:
refs/heads/master ffcc22ad5 -> 774e3a630
Adds proper logic to exclude MemberAccess
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/774e3a63
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/774e3a63
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/774e3a63
Branch: refs/heads/master
Commit: 774e3a63078441a827de70eabf523653d0d858e8
Parents: ffcc22a
Author: Lukasz Lenart
Authored: Fri Mar 18 08:45:13 2016 +0100
Committer: Lukasz Lenart
Committed: Sat Mar 19 06:56:01 2016 +0100
--
core/src/main/resources/struts-default.xml | 3 +-
.../xwork2/ognl/SecurityMemberAccessTest.java | 37
.../apache/struts2/views/jsp/URLTagTest.java| 3 +-
3 files changed, 40 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/774e3a63/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 47c8c8a..4c1361b 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -46,10 +46,11 @@
java.lang.Class,
java.lang.ClassLoader,
java.lang.Shutdown,
+java.lang.ProcessBuilder,
ognl.OgnlContext,
-ognl.MemberAccess,
ognl.ClassResolver,
ognl.TypeConverter,
+com.opensymphony.xwork2.ognl.SecurityMemberAccess,
com.opensymphony.xwork2.ActionContext" />
http://git-wip-us.apache.org/repos/asf/struts/blob/774e3a63/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
--
diff --git
a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 6bc6354..b719432 100644
---
a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++
b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -339,6 +339,7 @@ public class SecurityMemberAccessTest extends TestCase {
// when
boolean accessible = sma.isAccessible(context, target, member,
propertyName);
+
// then
assertTrue(accessible);
@@ -388,6 +389,42 @@ public class SecurityMemberAccessTest extends TestCase {
assertTrue(accessible);
}
+public void testAccessMemberAccessIsAccessible() throws Exception {
+// given
+SecurityMemberAccess sma = new SecurityMemberAccess(false);
+Set> excluded = new HashSet>();
+excluded.add(ognl.MemberAccess.class);
+sma.setExcludedClasses(excluded);
+
+String propertyName = "excludedClasses";
+String setter = "setExcludedClasses";
+Member member = SecurityMemberAccess.class.getMethod(setter,
Set.class);
+
+// when
+boolean accessible = sma.isAccessible(context, target, member,
propertyName);
+
+// then
+assertTrue(accessible);
+}
+
+public void testAccessMemberAccessIsBlocked() throws Exception {
+// given
+SecurityMemberAccess sma = new SecurityMemberAccess(false);
+Set> excluded = new HashSet>();
+excluded.add(SecurityMemberAccess.class);
+sma.setExcludedClasses(excluded);
+
+String propertyName = "excludedClasses";
+String setter = "setExcludedClasses";
+Member member = SecurityMemberAccess.class.getMethod(setter,
Set.class);
+
+// when
+boolean accessible = sma.isAccessible(context, target, member,
propertyName);
+
+// then
+assertFalse(accessible);
+}
+
}
class FooBar implements FooBarInterface {
http://git-wip-us.apache.org/repos/asf/struts/blob/774e3a63/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
--
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
index 3685063..3eb5e08 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
@@ -657,8 +657,7 @@ public class URLTagTest extends AbstractUITagTest {
tag.doEndTag();
Object allowMethodAccess =
stack.findValue("\u0023_memberAccess['allowStaticMethodAccess']");
- assertNotNull(allowMethodAccess);
- assertEquals(Boolean.FALSE, allowMethodAccess);
+ assertNull(a
struts git commit: WW-4605 Reverts to previous flow when result is created just before executing it
Repository: struts
Updated Branches:
refs/heads/master 774e3a630 -> 885261803
WW-4605 Reverts to previous flow when result is created just before executing it
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/88526180
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/88526180
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/88526180
Branch: refs/heads/master
Commit: 88526180375f958ea57eceedb3017f4b7637ef68
Parents: 774e3a6
Author: Lukasz Lenart
Authored: Fri Mar 18 20:41:06 2016 +0100
Committer: Lukasz Lenart
Committed: Sat Mar 19 06:58:28 2016 +0100
--
.../xwork2/DefaultActionInvocation.java | 4 ++--
.../MessageStorePreResultListener.java | 8 ++-
.../MessageStorePreResultListenerTest.java | 22 +++-
.../apache/struts2/views/jsp/ActionTagTest.java | 3 +--
4 files changed, 27 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/88526180/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
--
diff --git
a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index a8dcf56..167159c 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -248,8 +248,6 @@ public class DefaultActionInvocation implements
ActionInvocation {
// this is needed because the result will be executed, then
control will return to the Interceptor, which will
// return above and flow through again
if (!executed) {
-result = createResult();
-
if (preResultListeners != null) {
LOG.trace("Executing PreResultListeners for result [{}]",
result);
@@ -359,6 +357,8 @@ public class DefaultActionInvocation implements
ActionInvocation {
* @throws ConfigurationException If not result can be found with the
returned code
*/
private void executeResult() throws Exception {
+result = createResult();
+
String timerKey = "executeResult: " + getResultCode();
try {
UtilTimerStack.push(timerKey);
http://git-wip-us.apache.org/repos/asf/struts/blob/88526180/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
--
diff --git
a/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
b/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
index 0f45b1a..60fcffe 100644
---
a/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
+++
b/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
@@ -20,11 +20,13 @@
package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
import com.opensymphony.xwork2.interceptor.PreResultListener;
import com.opensymphony.xwork2.interceptor.ValidationAware;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.result.ServletActionRedirectResult;
import org.apache.struts2.result.ServletRedirectResult;
import java.util.Map;
@@ -69,7 +71,11 @@ class MessageStorePreResultListener implements
PreResultListener {
boolean isRedirect = false;
try {
-isRedirect = invocation.getResult() instanceof
ServletRedirectResult;
+ResultConfig resultConfig =
invocation.getProxy().getConfig().getResults().get(resultCode);
+if (resultConfig != null) {
+isRedirect =
ServletRedirectResult.class.getName().equals(resultConfig.getClassName())
+||
ServletActionRedirectResult.class.getName().equals(resultConfig.getClassName());
+}
} catch (Exception e) {
LOG.warn("Cannot read result!", e);
}
http://git-wip-us.apache.org/repos/asf/struts/blob/88526180/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
--
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
b/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
index 4e46b3a..e9f589d 100644
---
a/core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
+++
b/core/src/test/java/org/
