[1/3] struts git commit: Upgrades OGNL
Repository: struts
Updated Branches:
refs/heads/struts-2-3-24-2 36238eb35 -> a6e72347d
Upgrades OGNL
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2bc29c5a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2bc29c5a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2bc29c5a
Branch: refs/heads/struts-2-3-24-2
Commit: 2bc29c5ae9fe91ff5a4d4df4bfc021a591ef2afd
Parents: 36238eb
Author: Lukasz Lenart
Authored: Tue Apr 19 08:25:18 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Apr 19 11:07:20 2016 +0200
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/2bc29c5a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9434d07..2e82b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
${project.version}
3.0.5.RELEASE
-3.0.6
+3.0.6.1
3.3
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/da8d4443
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/da8d4443
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/da8d4443
Branch: refs/heads/struts-2-3-24-2
Commit: da8d44438916879d8c2c1d026c35134e48a589b3
Parents: 2bc29c5
Author: Lukasz Lenart
Authored: Tue Apr 19 08:25:28 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Apr 19 11:07:43 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/da8d4443/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_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/a6e72347 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a6e72347 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a6e72347 Branch: refs/heads/struts-2-3-24-2 Commit: a6e72347d2179a6d1a84acc0db54615c6f4b274c Parents: da8d444 Author: Lukasz Lenart Authored: Tue Apr 19 11:24:19 2016 +0200 Committer: Lukasz Lenart Committed: Tue Apr 19 11:24: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/a6e72347/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index ef0ab4a..26acc0c 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.24.3-SNAPSHOT +2.3.24.2 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/a6e72347/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 8a25311..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.3-SNAPSHOT +2.3.24.2 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/a6e72347/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 1072f39..5bdbaff 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_24_2 [created] c319f2007
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/struts-2-3-24-2 a6e72347d -> ebc8222e7 [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/ebc8222e Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ebc8222e Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ebc8222e Branch: refs/heads/struts-2-3-24-2 Commit: ebc8222e775ad5d48bca4dd5071d0bd652431970 Parents: a6e7234 Author: Lukasz Lenart Authored: Tue Apr 19 11:24:33 2016 +0200 Committer: Lukasz Lenart Committed: Tue Apr 19 11:24:33 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/ebc8222e/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/ebc8222e/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/ebc8222e/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 ++
[3/7] struts git commit: Uses isSequence flag to block chained expressions
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/c48007cc
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c48007cc
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c48007cc
Branch: refs/heads/struts-2-3-28-1
Commit: c480074a8007005eec782902c1f38e683438
Parents: 9a41e16
Author: Lukasz Lenart
Authored: Mon Apr 18 20:38:27 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Apr 19 14:23:44 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/c48007cc/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 eade684..40d112b 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
@@ -288,7 +288,7 @@ public class OgnlUtil {
compileAndExecute(name, context, new OgnlTask() {
public Void execute(Object tree) throws OgnlException {
if (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;
@@ -304,7 +304,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;
}
@@ -361,7 +361,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/c48007cc/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 96daab0..a0d3f2b 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;
[2/7] struts git commit: Upgrades OGNL
Upgrades OGNL
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9a41e16a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9a41e16a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9a41e16a
Branch: refs/heads/struts-2-3-28-1
Commit: 9a41e16a9bbe83ca087f26769067e182d74beefc
Parents: 998ddc4
Author: Lukasz Lenart
Authored: Tue Apr 19 14:21:53 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Apr 19 14:21:53 2016 +0200
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/9a41e16a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b8cce2d..7787cc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
${project.version}
3.0.5.RELEASE
-3.0.13
+3.0.14
3.3
5.0.2
2.2.2
[7/7] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_28_1
[maven-release-plugin] prepare release STRUTS_2_3_28_1 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/2cf0a7ef Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/2cf0a7ef Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/2cf0a7ef Branch: refs/heads/struts-2-3-28-1 Commit: 2cf0a7efeb12c8f476e31324dc56456b340ddeab Parents: c027038 Author: Lukasz Lenart Authored: Tue Apr 19 14:44:15 2016 +0200 Committer: Lukasz Lenart Committed: Tue Apr 19 14:44:15 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/2cf0a7ef/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 5d8ec42..bb5e637 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.28.1-SNAPSHOT +2.3.28.1 struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/2cf0a7ef/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 2c8b85f..9cce20c 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.1-SNAPSHOT +2.3.28.1 struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/2cf0a7ef/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 79704cb..30e9a2d 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -
[5/7] 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/44ea0e63
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/44ea0e63
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/44ea0e63
Branch: refs/heads/struts-2-3-28-1
Commit: 44ea0e638365dc5cb4064e03ab85f3d14ac58503
Parents: 6267476
Author: Lukasz Lenart
Authored: Mon Apr 18 20:39:05 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Apr 19 14:26:41 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/44ea0e63/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");
[1/7] struts git commit: Sets SNAPSHOT to make a release
Repository: struts Updated Branches: refs/heads/struts-2-3-28-1 [created] 2cf0a7efe Sets SNAPSHOT to make a release Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/998ddc45 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/998ddc45 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/998ddc45 Branch: refs/heads/struts-2-3-28-1 Commit: 998ddc45dc11377d67d2945b036371354aaab1a5 Parents: 0ac8932 Author: Lukasz Lenart Authored: Tue Apr 19 14:21:05 2016 +0200 Committer: Lukasz Lenart Committed: Tue Apr 19 14:21: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 | 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/998ddc45/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 326dc33..5d8ec42 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.28 +2.3.28.1-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/998ddc45/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index a49e05e..2c8b85f 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 +2.3.28.1-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/998ddc45/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index cc4044c..79704cb 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,
[4/7] 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/62674769 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/62674769 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/62674769 Branch: refs/heads/struts-2-3-28-1 Commit: 62674769b0d57c070538434e2ffed6ac2bf4796f Parents: c48007c Author: Lukasz Lenart Authored: Mon Apr 18 20:38:49 2016 +0200 Committer: Lukasz Lenart Committed: Tue Apr 19 14:26:13 2016 +0200 -- core/src/main/resources/struts-default.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts/blob/62674769/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 441ae54..3686c20 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -50,6 +50,8 @@ ognl.OgnlContext, ognl.ClassResolver, ognl.TypeConverter, +ognl.MemberAccess, +ognl.DefaultMemberAccess, com.opensymphony.xwork2.ognl.SecurityMemberAccess, com.opensymphony.xwork2.ActionContext" />
[struts] Git Push Summary
Repository: struts Updated Tags: refs/tags/STRUTS_2_3_28_1 [created] 6d9dd730e
[6/7] 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/c0270381
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c0270381
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c0270381
Branch: refs/heads/struts-2-3-28-1
Commit: c0270381ef70e64c8c37741e138073f421bc6ccf
Parents: 44ea0e6
Author: Lukasz Lenart
Authored: Tue Apr 19 08:25:28 2016 +0200
Committer: Lukasz Lenart
Committed: Tue Apr 19 14:26:54 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/c0270381/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;
}
struts git commit: [maven-release-plugin] prepare for next development iteration
Repository: struts Updated Branches: refs/heads/struts-2-3-28-1 2cf0a7efe -> f8a7d4216 [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/f8a7d421 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f8a7d421 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f8a7d421 Branch: refs/heads/struts-2-3-28-1 Commit: f8a7d4216e0b13dde3106758c0d1ff56cd08582c Parents: 2cf0a7e Author: Lukasz Lenart Authored: Tue Apr 19 14:44:43 2016 +0200 Committer: Lukasz Lenart Committed: Tue Apr 19 14:44:43 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/f8a7d421/apps/blank/pom.xml -- diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index bb5e637..9bc1e1e 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps -2.3.28.1 +2.3.28.2-SNAPSHOT struts2-blank http://git-wip-us.apache.org/repos/asf/struts/blob/f8a7d421/apps/jboss-blank/pom.xml -- diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index 9cce20c..3e9f9cb 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.1 +2.3.28.2-SNAPSHOT struts2-jboss-blank http://git-wip-us.apache.org/repos/asf/struts/blob/f8a7d421/apps/mailreader/pom.xml -- diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 30e9a2d..ae80204 100644 --- a/apps/mailreader/pom.xml ++
svn commit: r13298 - /dev/struts/2.3.24.2/
Author: lukaszlenart Date: Tue Apr 19 13:25:55 2016 New Revision: 13298 Log: Updates test release 2.3.24.2 Added: dev/struts/2.3.24.2/ dev/struts/2.3.24.2/struts-2.3.24.2-all.zip (with props) dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.asc (with props) dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.md5 dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.sha1 dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip (with props) dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.asc (with props) dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.md5 dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.sha1 dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip (with props) dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip.asc (with props) dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip.md5 dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip.sha1 dev/struts/2.3.24.2/struts-2.3.24.2-lib.zip (with props) dev/struts/2.3.24.2/struts-2.3.24.2-lib.zip.asc (with props) dev/struts/2.3.24.2/struts-2.3.24.2-lib.zip.md5 dev/struts/2.3.24.2/struts-2.3.24.2-lib.zip.sha1 dev/struts/2.3.24.2/struts-2.3.24.2-src.zip (with props) dev/struts/2.3.24.2/struts-2.3.24.2-src.zip.asc (with props) dev/struts/2.3.24.2/struts-2.3.24.2-src.zip.md5 dev/struts/2.3.24.2/struts-2.3.24.2-src.zip.sha1 Added: dev/struts/2.3.24.2/struts-2.3.24.2-all.zip == Binary file - no diff available. Propchange: dev/struts/2.3.24.2/struts-2.3.24.2-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.md5 == --- dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.md5 (added) +++ dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.md5 Tue Apr 19 13:25:55 2016 @@ -0,0 +1 @@ +7db75d24f4451a8b68fc627ef32bf85a \ No newline at end of file Added: dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.sha1 == --- dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.sha1 (added) +++ dev/struts/2.3.24.2/struts-2.3.24.2-all.zip.sha1 Tue Apr 19 13:25:55 2016 @@ -0,0 +1 @@ +42daa4b30ec3c56c2566f39e52b5f5daff9354bc \ No newline at end of file Added: dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.md5 == --- dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.md5 (added) +++ dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.md5 Tue Apr 19 13:25:55 2016 @@ -0,0 +1 @@ +8878543ba2a91b8f7066c7ca72aa4a9d \ No newline at end of file Added: dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.sha1 == --- dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.sha1 (added) +++ dev/struts/2.3.24.2/struts-2.3.24.2-apps.zip.sha1 Tue Apr 19 13:25:55 2016 @@ -0,0 +1 @@ +cfbfa6240038f777009d3c08334c8a9b389c6a14 \ No newline at end of file Added: dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.24.2/struts-2.3.24.2-docs.zip.md5 == --- dev/struts/2.3.24.2/struts-2.3.24.2-d
svn commit: r13297 - /dev/struts/2.3.20.2/
Author: lukaszlenart Date: Tue Apr 19 13:23:35 2016 New Revision: 13297 Log: Updates test release 2.3.20.2 Added: dev/struts/2.3.20.2/ dev/struts/2.3.20.2/struts-2.3.20.2-all.zip (with props) dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.asc (with props) dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.md5 dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.sha1 dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip (with props) dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.asc (with props) dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.md5 dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.sha1 dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip (with props) dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip.asc (with props) dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip.md5 dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip.sha1 dev/struts/2.3.20.2/struts-2.3.20.2-lib.zip (with props) dev/struts/2.3.20.2/struts-2.3.20.2-lib.zip.asc (with props) dev/struts/2.3.20.2/struts-2.3.20.2-lib.zip.md5 dev/struts/2.3.20.2/struts-2.3.20.2-lib.zip.sha1 dev/struts/2.3.20.2/struts-2.3.20.2-src.zip (with props) dev/struts/2.3.20.2/struts-2.3.20.2-src.zip.asc (with props) dev/struts/2.3.20.2/struts-2.3.20.2-src.zip.md5 dev/struts/2.3.20.2/struts-2.3.20.2-src.zip.sha1 Added: dev/struts/2.3.20.2/struts-2.3.20.2-all.zip == Binary file - no diff available. Propchange: dev/struts/2.3.20.2/struts-2.3.20.2-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.md5 == --- dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.md5 (added) +++ dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.md5 Tue Apr 19 13:23:35 2016 @@ -0,0 +1 @@ +454435e384ae38475660a91c0bc138cc \ No newline at end of file Added: dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.sha1 == --- dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.sha1 (added) +++ dev/struts/2.3.20.2/struts-2.3.20.2-all.zip.sha1 Tue Apr 19 13:23:35 2016 @@ -0,0 +1 @@ +33d054f4c4df82f4c2a26323a78fb98c19c7ab7b \ No newline at end of file Added: dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.md5 == --- dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.md5 (added) +++ dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.md5 Tue Apr 19 13:23:35 2016 @@ -0,0 +1 @@ +acee2f3c164538f8ec0b32228b56627c \ No newline at end of file Added: dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.sha1 == --- dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.sha1 (added) +++ dev/struts/2.3.20.2/struts-2.3.20.2-apps.zip.sha1 Tue Apr 19 13:23:35 2016 @@ -0,0 +1 @@ +b42f5eea57d8b564ef9bcc57b95bc34beb5190a9 \ No newline at end of file Added: dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.20.2/struts-2.3.20.2-docs.zip.md5 == --- dev/struts/2.3.20.2/struts-2.3.20.2-d
svn commit: r13299 - /dev/struts/2.3.28.1/
Author: lukaszlenart Date: Tue Apr 19 13:42:32 2016 New Revision: 13299 Log: Updates test release 2.3.28.1 Added: dev/struts/2.3.28.1/ dev/struts/2.3.28.1/struts-2.3.28.1-all.zip (with props) dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.asc (with props) dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.md5 dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.sha1 dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip (with props) dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.asc (with props) dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.md5 dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.sha1 dev/struts/2.3.28.1/struts-2.3.28.1-docs.zip (with props) dev/struts/2.3.28.1/struts-2.3.28.1-docs.zip.asc (with props) dev/struts/2.3.28.1/struts-2.3.28.1-docs.zip.md5 dev/struts/2.3.28.1/struts-2.3.28.1-docs.zip.sha1 dev/struts/2.3.28.1/struts-2.3.28.1-lib.zip (with props) dev/struts/2.3.28.1/struts-2.3.28.1-lib.zip.asc (with props) dev/struts/2.3.28.1/struts-2.3.28.1-lib.zip.md5 dev/struts/2.3.28.1/struts-2.3.28.1-lib.zip.sha1 dev/struts/2.3.28.1/struts-2.3.28.1-min-lib.zip (with props) dev/struts/2.3.28.1/struts-2.3.28.1-min-lib.zip.asc (with props) dev/struts/2.3.28.1/struts-2.3.28.1-min-lib.zip.md5 dev/struts/2.3.28.1/struts-2.3.28.1-min-lib.zip.sha1 dev/struts/2.3.28.1/struts-2.3.28.1-src.zip (with props) dev/struts/2.3.28.1/struts-2.3.28.1-src.zip.asc (with props) dev/struts/2.3.28.1/struts-2.3.28.1-src.zip.md5 dev/struts/2.3.28.1/struts-2.3.28.1-src.zip.sha1 Added: dev/struts/2.3.28.1/struts-2.3.28.1-all.zip == Binary file - no diff available. Propchange: dev/struts/2.3.28.1/struts-2.3.28.1-all.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.md5 == --- dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.md5 (added) +++ dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.md5 Tue Apr 19 13:42:32 2016 @@ -0,0 +1 @@ +ab6c134d8e0aafd8adcdfb0264413b41 \ No newline at end of file Added: dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.sha1 == --- dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.sha1 (added) +++ dev/struts/2.3.28.1/struts-2.3.28.1-all.zip.sha1 Tue Apr 19 13:42:32 2016 @@ -0,0 +1 @@ +10a6d1564f1633fb3e25ff42524414fe984719fa \ No newline at end of file Added: dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip == Binary file - no diff available. Propchange: dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.md5 == --- dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.md5 (added) +++ dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.md5 Tue Apr 19 13:42:32 2016 @@ -0,0 +1 @@ +f7be1c657c989b1479707613face156e \ No newline at end of file Added: dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.sha1 == --- dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.sha1 (added) +++ dev/struts/2.3.28.1/struts-2.3.28.1-apps.zip.sha1 Tue Apr 19 13:42:32 2016 @@ -0,0 +1 @@ +07c36d953844299347b0b49254b81ede36e0a7cb \ No newline at end of file Added: dev/struts/2.3.28.1/struts-2.3.28.1-docs.zip == Binary file - no diff available. Propchange: dev/struts/2.3.28.1/struts-2.3.28.1-docs.zip -- svn:mime-type = application/zip Added: dev/struts/2.3.28.1/struts-2.3.28.1-docs.zip.asc == Binary file - no diff available. Propchange: dev/struts/2.3.28.1/struts-2.3.28.1-docs.zip.asc ---
[1/5] struts git commit: Upgrades OGNL
Repository: struts
Updated Branches:
refs/heads/support-2-3 cbae13a6a -> deefeffd1
Upgrades OGNL
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d36f31b3
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d36f31b3
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d36f31b3
Branch: refs/heads/support-2-3
Commit: d36f31b3e1a65c619b1cbaf743baa3efc66168be
Parents: cbae13a
Author: Lukasz Lenart
Authored: Tue Apr 19 14:21:53 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Apr 20 08:00:53 2016 +0200
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/d36f31b3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9a02482..c465aaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
${project.version}
3.0.5.RELEASE
-3.0.13
+3.0.14
3.3
5.0.2
2.2.2
[4/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/98d2692e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/98d2692e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/98d2692e
Branch: refs/heads/support-2-3
Commit: 98d2692e434fe7f4d445ade24fe2c9860de1c13f
Parents: 46517af
Author: Lukasz Lenart
Authored: Mon Apr 18 20:39:05 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Apr 20 08:01:22 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/98d2692e/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");
[2/5] struts git commit: Uses isSequence flag to block chained expressions
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/5190b536
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5190b536
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5190b536
Branch: refs/heads/support-2-3
Commit: 5190b53673a710ead31bbb5f82cf4ca171994629
Parents: d36f31b
Author: Lukasz Lenart
Authored: Mon Apr 18 20:38:27 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Apr 20 08:01:02 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/5190b536/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 eade684..40d112b 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
@@ -288,7 +288,7 @@ public class OgnlUtil {
compileAndExecute(name, context, new OgnlTask() {
public Void execute(Object tree) throws OgnlException {
if (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;
@@ -304,7 +304,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;
}
@@ -361,7 +361,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/5190b536/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 96daab0..a0d3f2b 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: 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/46517afb Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/46517afb Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/46517afb Branch: refs/heads/support-2-3 Commit: 46517afb1402fbf3fd84089920b43cc07e948a92 Parents: 5190b53 Author: Lukasz Lenart Authored: Mon Apr 18 20:38:49 2016 +0200 Committer: Lukasz Lenart Committed: Wed Apr 20 08:01:12 2016 +0200 -- core/src/main/resources/struts-default.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts/blob/46517afb/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 441ae54..3686c20 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -50,6 +50,8 @@ ognl.OgnlContext, ognl.ClassResolver, ognl.TypeConverter, +ognl.MemberAccess, +ognl.DefaultMemberAccess, com.opensymphony.xwork2.ognl.SecurityMemberAccess, com.opensymphony.xwork2.ActionContext" />
[5/5] 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/deefeffd
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/deefeffd
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/deefeffd
Branch: refs/heads/support-2-3
Commit: deefeffd11425f0cd0b797cd86a9b3550234262b
Parents: 98d2692
Author: Lukasz Lenart
Authored: Tue Apr 19 08:25:28 2016 +0200
Committer: Lukasz Lenart
Committed: Wed Apr 20 08:01:29 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/deefeffd/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;
}
