[2/5] struts git commit: Adds additional blocked classes
Adds additional blocked classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/51b276c2
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/51b276c2
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/51b276c2
Branch: refs/heads/struts-2-3-20-2
Commit: 51b276c2d80c4008b86f47a0232c32e8385c0096
Parents: 98eb21a
Author: Lukasz Lenart
Authored: Mon Apr 18 20:38:49 2016 +0200
Committer: Lukasz Lenart
Committed: Mon Apr 18 20:38:49 2016 +0200
--
core/src/main/resources/struts-default.xml | 3 +++
core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/51b276c2/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 256d056..b3fab8f 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -50,6 +50,9 @@
ognl.MemberAccess,
ognl.ClassResolver,
ognl.TypeConverter,
+ognl.MemberAccess,
+ognl.DefaultMemberAccess,
+com.opensymphony.xwork2.ognl.SecurityMemberAccess,
com.opensymphony.xwork2.ActionContext" />
http://git-wip-us.apache.org/repos/asf/struts/blob/51b276c2/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 50bf576..6c141aa 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(allowMethodAccess);
assertNull(session.get("foo"));
[1/5] struts git commit: Uses isSequence flag to block chained expressions
Repository: struts
Updated Branches:
refs/heads/struts-2-3-20-2 [created] c7113e9d6
Uses isSequence flag to block chained expressions
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/98eb21ae
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/98eb21ae
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/98eb21ae
Branch: refs/heads/struts-2-3-20-2
Commit: 98eb21ae8528dd5fdc3f76ed9ade897a1c679131
Parents: a9974ee
Author: Lukasz Lenart
Authored: Mon Apr 18 20:38:27 2016 +0200
Committer: Lukasz Lenart
Committed: Mon Apr 18 20:38:27 2016 +0200
--
.../java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 +++---
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 +++
2 files changed, 18 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/98eb21ae/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 63c45fe..0421fac 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -282,7 +282,7 @@ public class OgnlUtil {
compileAndExecute(name, context, new OgnlTask() {
public Void execute(Object tree) throws OgnlException {
if (!evalName && isEvalExpression(tree, context)) {
-throw new OgnlException("Eval expression cannot be used as
parameter name");
+throw new OgnlException("Eval expression/chained
expressions cannot be used as parameter name");
}
Ognl.setValue(tree, context, root, value);
return null;
@@ -298,7 +298,7 @@ public class OgnlUtil {
if (context!=null && context instanceof OgnlContext) {
ognlContext = (OgnlContext) context;
}
-return node.isEvalChain(ognlContext);
+return node.isEvalChain(ognlContext) ||
node.isSequence(ognlContext);
}
return false;
}
@@ -355,7 +355,7 @@ public class OgnlUtil {
private void checkEnableEvalExpression(Object tree, Map
context) throws OgnlException {
if (!enableEvalExpression && isEvalExpression(tree, context)) {
-throw new OgnlException("Eval expressions has been disabled!");
+throw new OgnlException("Eval expressions/chained expressions have
been disabled!");
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/98eb21ae/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 6726af6..13442b1 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -750,6 +750,21 @@ public class OgnlUtilTest extends XWorkTestCase {
assertEquals(expected.getMessage(), "Method \"getRuntime\" failed for
object class java.lang.Runtime");
}
+public void testBlockSequenceOfExpressions() throws Exception {
+Foo foo = new Foo();
+
+Exception expected = null;
+try {
+
ognlUtil.setValue("#booScope=@myclass@DEFAULT_SCOPE,#bootScope.init()",
ognlUtil.createDefaultContext(foo), foo, true);
+fail();
+} catch (OgnlException e) {
+expected = e;
+}
+assertNotNull(expected);
+assertSame(OgnlException.class, expected.getClass());
+assertEquals(expected.getMessage(), "Eval expressions/chained
expressions have been disabled!");
+}
+
public static class Email {
String address;
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_20_2 [created] 4aed20dc0
[4/5] struts git commit: Sets SNAPSHOT version to allow prepare a new release
Sets SNAPSHOT version to allow prepare a new release Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a966570a Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a966570a Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a966570a Branch: refs/heads/struts-2-3-20-2 Commit: a966570ad2051617c5fdea337ef0e91802acd37d Parents: 213db3c Author: Lukasz Lenart Authored: Mon Apr 18 20:40:50 2016 +0200 Committer: Lukasz Lenart Committed: Mon Apr 18 20:40:50 2016 +0200 -- 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/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/a966570a/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 248904b..0ef12d5 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.1 +2.3.20.2-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/a966570a/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 90747fd..0447b43 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.1 +2.3.20.2-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/a966570a/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 7c2418a..8ef4a4e 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.20.1 + 2.3.20.2-SNAPSHOT struts2-m
[3/5] struts git commit: Drops defining location via request
Drops defining location via request
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/213db3cf
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/213db3cf
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/213db3cf
Branch: refs/heads/struts-2-3-20-2
Commit: 213db3cfdbf19c9fbaa549c23e52d21ee66192c0
Parents: 51b276c
Author: Lukasz Lenart
Authored: Mon Apr 18 20:39:05 2016 +0200
Committer: Lukasz Lenart
Committed: Mon Apr 18 20:39:05 2016 +0200
--
.../main/java/org/apache/struts2/views/xslt/XSLTResult.java | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/213db3cf/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
--
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
index 7c3dd77..e703325 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
@@ -448,12 +448,7 @@ public class XSLTResult implements Result {
ServletActionContext.getServletContext());
}
-protected Templates getTemplates(String path) throws TransformerException,
IOException {
-String pathFromRequest =
ServletActionContext.getRequest().getParameter("xslt.location");
-
-if (pathFromRequest != null)
-path = pathFromRequest;
-
+protected Templates getTemplates(final String path) throws
TransformerException, IOException {
if (path == null)
throw new TransformerException("Stylesheet path is null");
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/struts-2-3-20-2 c7113e9d6 -> 18ebe2f69 [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/18ebe2f6 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/18ebe2f6 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/18ebe2f6 Branch: refs/heads/struts-2-3-20-2 Commit: 18ebe2f6983dac790d12c40d60fbec003ff7da90 Parents: c7113e9 Author: Lukasz Lenart Authored: Mon Apr 18 20:50:35 2016 +0200 Committer: Lukasz Lenart Committed: Mon Apr 18 20:50:35 2016 +0200 -- 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/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 +- 52 files changed, 56 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/18ebe2f6/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 5522b6f..13ac088 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.2 +2.3.20.3-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/18ebe2f6/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 452f256..9ea5361 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.2 +2.3.20.3-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/18ebe2f6/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index d28e276..46c2b7d 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@
[5/5] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_20_2
[maven-release-plugin] prepare release STRUTS_2_3_20_2 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c7113e9d Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c7113e9d Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c7113e9d Branch: refs/heads/struts-2-3-20-2 Commit: c7113e9d6583bd350eca762609025b7db987dc07 Parents: a966570 Author: Lukasz Lenart Authored: Mon Apr 18 20:50:17 2016 +0200 Committer: Lukasz Lenart Committed: Mon Apr 18 20:50:17 2016 +0200 -- 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/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 +- 52 files changed, 56 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/c7113e9d/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 0ef12d5..5522b6f 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.2-SNAPSHOT +2.3.20.2 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/c7113e9d/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 0447b43..452f256 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.2-SNAPSHOT +2.3.20.2 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/c7113e9d/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 8ef4a4e..d28e276 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.20.2-SNAPSHOT + 2.3.20.2 str
[1/5] struts git commit: Uses isSequence flag to block chained expressions
Repository: struts
Updated Branches:
refs/heads/struts-2-3-24-2 [created] 5c51bf405
Uses isSequence flag to block chained expressions
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/47da9c9f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/47da9c9f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/47da9c9f
Branch: refs/heads/struts-2-3-24-2
Commit: 47da9c9f52bab960ff745e06adb3a32917698c9e
Parents: 7a98631
Author: Lukasz Lenart
Authored: Mon Apr 18 20:38:27 2016 +0200
Committer: Lukasz Lenart
Committed: Mon Apr 18 21:50:50 2016 +0200
--
.../java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 +++---
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 +++
2 files changed, 18 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/47da9c9f/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
--
diff --git
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 63c45fe..0421fac 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -282,7 +282,7 @@ public class OgnlUtil {
compileAndExecute(name, context, new OgnlTask() {
public Void execute(Object tree) throws OgnlException {
if (!evalName && isEvalExpression(tree, context)) {
-throw new OgnlException("Eval expression cannot be used as
parameter name");
+throw new OgnlException("Eval expression/chained
expressions cannot be used as parameter name");
}
Ognl.setValue(tree, context, root, value);
return null;
@@ -298,7 +298,7 @@ public class OgnlUtil {
if (context!=null && context instanceof OgnlContext) {
ognlContext = (OgnlContext) context;
}
-return node.isEvalChain(ognlContext);
+return node.isEvalChain(ognlContext) ||
node.isSequence(ognlContext);
}
return false;
}
@@ -355,7 +355,7 @@ public class OgnlUtil {
private void checkEnableEvalExpression(Object tree, Map
context) throws OgnlException {
if (!enableEvalExpression && isEvalExpression(tree, context)) {
-throw new OgnlException("Eval expressions has been disabled!");
+throw new OgnlException("Eval expressions/chained expressions have
been disabled!");
}
}
http://git-wip-us.apache.org/repos/asf/struts/blob/47da9c9f/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
--
diff --git
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 6726af6..13442b1 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -750,6 +750,21 @@ public class OgnlUtilTest extends XWorkTestCase {
assertEquals(expected.getMessage(), "Method \"getRuntime\" failed for
object class java.lang.Runtime");
}
+public void testBlockSequenceOfExpressions() throws Exception {
+Foo foo = new Foo();
+
+Exception expected = null;
+try {
+
ognlUtil.setValue("#booScope=@myclass@DEFAULT_SCOPE,#bootScope.init()",
ognlUtil.createDefaultContext(foo), foo, true);
+fail();
+} catch (OgnlException e) {
+expected = e;
+}
+assertNotNull(expected);
+assertSame(OgnlException.class, expected.getClass());
+assertEquals(expected.getMessage(), "Eval expressions/chained
expressions have been disabled!");
+}
+
public static class Email {
String address;
[3/5] struts git commit: Drops defining location via request
Drops defining location via request
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/8f42327d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/8f42327d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/8f42327d
Branch: refs/heads/struts-2-3-24-2
Commit: 8f42327dc6430813e2637dfb44b8b309f92ef2e3
Parents: d92654d
Author: Lukasz Lenart
Authored: Mon Apr 18 20:39:05 2016 +0200
Committer: Lukasz Lenart
Committed: Mon Apr 18 21:51:11 2016 +0200
--
.../main/java/org/apache/struts2/views/xslt/XSLTResult.java | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/8f42327d/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
--
diff --git a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
index 7c3dd77..e703325 100644
--- a/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
+++ b/core/src/main/java/org/apache/struts2/views/xslt/XSLTResult.java
@@ -448,12 +448,7 @@ public class XSLTResult implements Result {
ServletActionContext.getServletContext());
}
-protected Templates getTemplates(String path) throws TransformerException,
IOException {
-String pathFromRequest =
ServletActionContext.getRequest().getParameter("xslt.location");
-
-if (pathFromRequest != null)
-path = pathFromRequest;
-
+protected Templates getTemplates(final String path) throws
TransformerException, IOException {
if (path == null)
throw new TransformerException("Stylesheet path is null");
[5/5] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_24_2
[maven-release-plugin] prepare release STRUTS_2_3_24_2 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5c51bf40 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5c51bf40 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5c51bf40 Branch: refs/heads/struts-2-3-24-2 Commit: 5c51bf405119e183693c503a28f4c0bddde540d1 Parents: 24085ee Author: Lukasz Lenart Authored: Mon Apr 18 22:08:04 2016 +0200 Committer: Lukasz Lenart Committed: Mon Apr 18 22:08:04 2016 +0200 -- 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/5c51bf40/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 784dd4b..26acc0c 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.2-SNAPSHOT +2.3.24.2 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/5c51bf40/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index ef4260e..e44ece1 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.2-SNAPSHOT +2.3.24.2 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/5c51bf40/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index f36dcb8..5bdbaff 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -
[4/5] struts git commit: Sets SNAPSHOT version to allow prepare a new release
Sets SNAPSHOT version to allow prepare a new release Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/24085ee6 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/24085ee6 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/24085ee6 Branch: refs/heads/struts-2-3-24-2 Commit: 24085ee6a6a40e7e778ad4c3fb83e2d74b7f85ac Parents: 8f42327 Author: Lukasz Lenart Authored: Mon Apr 18 21:56:59 2016 +0200 Committer: Lukasz Lenart Committed: Mon Apr 18 21:56:59 2016 +0200 -- 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 | 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 +- 53 files changed, 55 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/24085ee6/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 85ff76f..784dd4b 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.1 +2.3.24.2-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/24085ee6/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 3f29927..ef4260e 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.1 +2.3.24.2-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/24085ee6/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 3b7e5cf..f36dcb8 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -
[2/5] struts git commit: Adds additional blocked classes
Adds additional blocked classes
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d92654da
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d92654da
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d92654da
Branch: refs/heads/struts-2-3-24-2
Commit: d92654daf3dfe36082995b713484de92041afaea
Parents: 47da9c9
Author: Lukasz Lenart
Authored: Mon Apr 18 20:38:49 2016 +0200
Committer: Lukasz Lenart
Committed: Mon Apr 18 21:51:01 2016 +0200
--
core/src/main/resources/struts-default.xml | 3 +++
core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/d92654da/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 f9c9ff4..56621a7 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -50,6 +50,9 @@
ognl.MemberAccess,
ognl.ClassResolver,
ognl.TypeConverter,
+ognl.MemberAccess,
+ognl.DefaultMemberAccess,
+com.opensymphony.xwork2.ognl.SecurityMemberAccess,
com.opensymphony.xwork2.ActionContext" />
http://git-wip-us.apache.org/repos/asf/struts/blob/d92654da/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 50bf576..6c141aa 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(allowMethodAccess);
assertNull(session.get("foo"));
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_24_2 [created] 5624d8138
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/struts-2-3-24-2 5c51bf405 -> 36238eb35 [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/36238eb3 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/36238eb3 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/36238eb3 Branch: refs/heads/struts-2-3-24-2 Commit: 36238eb35a801e95e7b307534d8c496137345d6c Parents: 5c51bf4 Author: Lukasz Lenart Authored: Mon Apr 18 22:08:19 2016 +0200 Committer: Lukasz Lenart Committed: Mon Apr 18 22:08:19 2016 +0200 -- 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/36238eb3/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 26acc0c..ef0ab4a 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.2 +2.3.24.3-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/36238eb3/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index e44ece1..8a25311 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.2 +2.3.24.3-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/36238eb3/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 5bdbaff..1072f39 100644 --- a/apps/mailreader/pom.xml ++
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_20_2 [deleted] 4aed20dc0
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_24_2 [deleted] 5624d8138
[1/3] struts git commit: Upgrades OGNL
Repository: struts
Updated Branches:
refs/heads/struts-2-3-20-2 18ebe2f69 -> d79364806
Upgrades OGNL
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/1bc68321
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/1bc68321
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/1bc68321
Branch: refs/heads/struts-2-3-20-2
Commit: 1bc68321cb108a0c44788ca5e6dac92445b583cc
Parents: 18ebe2f
Author: Lukasz Lenart
Authored: Tue Apr 19 08:25:18 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Apr 19 08:25:18 2016 +0200
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/1bc68321/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2a1e7ba..57210dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
${project.version}
3.0.5.RELEASE
-3.0.6
+3.0.6.1
5.0.2
2.0.6
[2/3] struts git commit: Cleans up method name
Cleans up method name
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b4d54b6d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b4d54b6d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b4d54b6d
Branch: refs/heads/struts-2-3-20-2
Commit: b4d54b6d0caa6aaf453a56b3613aebad8acd3229
Parents: 1bc6832
Author: Lukasz Lenart
Authored: Tue Apr 19 08:25:28 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Apr 19 08:25:28 2016 +0200
--
.../struts2/dispatcher/mapper/DefaultActionMapper.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/b4d54b6d/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
--
diff --git
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index a7a1a69..024e2d3 100644
---
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -136,7 +136,7 @@ public class DefaultActionMapper implements ActionMapper {
put(METHOD_PREFIX, new ParameterAction() {
public void execute(String key, ActionMapping mapping) {
if (allowDynamicMethodCalls) {
-
mapping.setMethod(key.substring(METHOD_PREFIX.length()));
+
mapping.setMethod(cleanupActionName(key.substring(METHOD_PREFIX.length(;
}
}
});
@@ -148,7 +148,7 @@ public class DefaultActionMapper implements ActionMapper {
if (allowDynamicMethodCalls) {
int bang = name.indexOf('!');
if (bang != -1) {
-String method = name.substring(bang + 1);
+String method =
cleanupActionName(name.substring(bang + 1));
mapping.setMethod(method);
name = name.substring(0, bang);
}
@@ -385,7 +385,7 @@ public class DefaultActionMapper implements ActionMapper {
return rawActionName;
} else {
if (LOG.isWarnEnabled()) {
-LOG.warn("Action [#0] does not match allowed action names
pattern [#1], cleaning it up!",
+LOG.warn("Action/method [#0] does not match allowed action
names pattern [#1], cleaning it up!",
rawActionName, allowedActionNames);
}
String cleanActionName = rawActionName;
@@ -393,7 +393,7 @@ public class DefaultActionMapper implements ActionMapper {
cleanActionName = cleanActionName.replace(chunk, "");
}
if (LOG.isDebugEnabled()) {
-LOG.debug("Cleaned action name [#0]", cleanActionName);
+LOG.debug("Cleaned action/method name [#0]", cleanActionName);
}
return cleanActionName;
}
[3/3] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_20_2
[maven-release-plugin] prepare release STRUTS_2_3_20_2 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d7936480 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d7936480 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d7936480 Branch: refs/heads/struts-2-3-20-2 Commit: d793648069386ce90fc9eae31e119de1a675f15a Parents: b4d54b6 Author: Lukasz Lenart Authored: Tue Apr 19 08:32:05 2016 +0200 Committer: Lukasz Lenart Committed: Tue Apr 19 08:32:05 2016 +0200 -- 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/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 +- 52 files changed, 56 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/d7936480/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 13ac088..5522b6f 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.3-SNAPSHOT +2.3.20.2 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/d7936480/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 9ea5361..452f256 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.3-SNAPSHOT +2.3.20.2 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/d7936480/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 46c2b7d..d28e276 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.20.3-SNAPSHOT + 2.3.20.2 str
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_20_2 [created] db5155393
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/struts-2-3-20-2 d79364806 -> f5c34b9b5 [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/f5c34b9b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f5c34b9b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f5c34b9b Branch: refs/heads/struts-2-3-20-2 Commit: f5c34b9b5bfa8aa18ee8cf89106a0bbd7af06473 Parents: d793648 Author: Lukasz Lenart Authored: Tue Apr 19 08:32:52 2016 +0200 Committer: Lukasz Lenart Committed: Tue Apr 19 08:32:52 2016 +0200 -- 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/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 +- 52 files changed, 56 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/f5c34b9b/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 5522b6f..13ac088 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.2 +2.3.20.3-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/f5c34b9b/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 452f256..9ea5361 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.20.2 +2.3.20.3-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/f5c34b9b/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index d28e276..46c2b7d 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@
