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!");
}
}
diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java b/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
index d54a1fa65..9410eb659 100644
--- a/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
+++ b/core/src/main/java/com/opensymphony/xwork2/validator/validators/EmailValidator.java
@@ -23,7 +23,7 @@ package com.opensymphony.xwork2.validator.validators;
* The regular expression used to validate that the string is an email address is:
*
*
- * \\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx)$\\b
+ * \\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx|tech|cat)$\\b
*
*
* You can also specify expression, caseSensitive and trim params as a OGNL expression, see the example below.
@@ -80,7 +80,7 @@ public class EmailValidator extends RegexFieldValidator {
// see XW-371
public static final String EMAIL_ADDRESS_PATTERN =
- "\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx|tech)$\\b";
+ "\\b^['_a-z0-9-\\+]+(\\.['_a-z0-9-\\+]+)*@[a-z0-9-]+(\\.[a-z0-9-]+)*\\.([a-z]{2}|aero|arpa|asia|biz|com|coop|edu|gov|info|int|jobs|mil|mobi|museum|name|nato|net|org|pro|tel|travel|xxx|tech|cat)$\\b";
public EmailValidator() {
setRegex(EMAIL_ADDRESS_PATTERN);
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index d5b70cff0..186e880f9 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -298,4 +298,5 @@ public final class StrutsConstants {
public static final String STRUTS_CONTENT_TYPE_MATCHER = "struts.contentTypeMatcher";
+ public static final String STRUTS_SMI_METHOD_REGEX = "struts.strictMethodInvocation.methodRegex";
}
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 95ab0d5bd..d0e89beef 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
@@ -34,6 +34,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.struts2.RequestUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsException;
import org.apache.struts2.util.PrefixTrie;
import javax.servlet.http.HttpServletRequest;
@@ -136,7 +137,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 +149,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,14 +386,7 @@ public class DefaultActionMapper implements ActionMapper {
if (allowedActionNames.matcher(rawActionName).matches()) {
return rawActionName;
} else {
- LOG.warn("Action [{}] does not match allowed action names pattern [{}], cleaning it up!",
- rawActionName, allowedActionNames);
- String cleanActionName = rawActionName;
- for (String chunk : allowedActionNames.split(rawActionName)) {
- cleanActionName = cleanActionName.replace(chunk, "");
- }
- LOG.debug("Cleaned action name [{}]", cleanActionName);
- return cleanActionName;
+ throw new StrutsException("Action [" + rawActionName + "] does not match allowed action names pattern [" + allowedActionNames + "]!");
}
}
diff --git a/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java b/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
index 60fcffe21..9b313a8fe 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
@@ -73,8 +73,7 @@ class MessageStorePreResultListener implements PreResultListener {
try {
ResultConfig resultConfig = invocation.getProxy().getConfig().getResults().get(resultCode);
if (resultConfig != null) {
- isRedirect = ServletRedirectResult.class.getName().equals(resultConfig.getClassName())
- || ServletActionRedirectResult.class.getName().equals(resultConfig.getClassName());
+ isRedirect = ServletRedirectResult.class.isAssignableFrom(Class.forName(resultConfig.getClassName()));
}
} catch (Exception e) {
LOG.warn("Cannot read result!", e);
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 5ebbf67bb..5dfd5fb25 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
@@ -404,12 +404,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");
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 4c1361baf..e4090a55e 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" />
diff --git a/core/src/main/resources/template/simple/submit.ftl b/core/src/main/resources/template/simple/submit.ftl
index 24db4a886..d77b5d090 100644
--- a/core/src/main/resources/template/simple/submit.ftl
+++ b/core/src/main/resources/template/simple/submit.ftl
@@ -61,6 +61,9 @@
<#else>
* <#t/>
${parameters.label?html}<#t/>
-<#if parameters.required!false && parameters.requiredPosition!"right" == 'right'>
+<#if (parameters.required!false) && ((parameters.requiredPosition!"right") == 'right')>
* <#t/>
${parameters.labelseparator!":"?html}<#t/>
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java b/core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java
index 607a9dc9d..adb8935cc 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/entities/AllowedMethodsTest.java
@@ -14,7 +14,7 @@ public class AllowedMethodsTest extends TestCase {
literals.add(method);
// when
- AllowedMethods allowedMethods = AllowedMethods.build(literals);
+ AllowedMethods allowedMethods = AllowedMethods.build(false, literals, ActionConfig.DEFAULT_METHOD_REGEX);
// then
assertEquals(1, allowedMethods.list().size());
@@ -22,14 +22,14 @@ public class AllowedMethodsTest extends TestCase {
assertFalse(allowedMethods.isAllowed("someOtherMethod"));
}
- public void testWidlcardMethods() throws Exception {
+ public void testWildcardMethodsWithNoSMI() throws Exception {
// given
String method = "my{1}";
Set literals = new HashSet<>();
literals.add(method);
// when
- AllowedMethods allowedMethods = AllowedMethods.build(literals);
+ AllowedMethods allowedMethods = AllowedMethods.build(false, literals, ActionConfig.DEFAULT_METHOD_REGEX);
// then
assertEquals(1, allowedMethods.list().size());
@@ -37,18 +37,50 @@ public class AllowedMethodsTest extends TestCase {
assertFalse(allowedMethods.isAllowed("someOtherMethod"));
}
- public void testWidlcardWithStarMethods() throws Exception {
+ public void testWildcardMethodsWithSMI() throws Exception {
+ // given
+ Set literals = new HashSet<>();
+ literals.add("my{1}");
+ literals.add("myMethod");
+
+ // when
+ AllowedMethods allowedMethods = AllowedMethods.build(true, literals, ActionConfig.DEFAULT_METHOD_REGEX);
+
+ // then
+ assertEquals(1, allowedMethods.list().size());
+ assertFalse(allowedMethods.isAllowed("my{1}"));
+ assertTrue(allowedMethods.isAllowed("myMethod"));
+ assertFalse(allowedMethods.isAllowed("someOtherMethod"));
+ }
+
+ public void testWildcardWithStarMethodsWithNoSMI() throws Exception {
+ // given
+ String method = "cancel*Action*";
+ Set literals = new HashSet<>();
+ literals.add(method);
+
+ // when
+ AllowedMethods allowedMethods = AllowedMethods.build(false, literals, ActionConfig.DEFAULT_METHOD_REGEX);
+
+ // then
+ assertEquals(1, allowedMethods.list().size());
+ assertTrue(allowedMethods.isAllowed("cancelAction"));
+ assertFalse(allowedMethods.isAllowed("startEvent"));
+ }
+
+ public void testWildcardWithStarMethodsWithSMI() throws Exception {
// given
String method = "cancel*";
Set literals = new HashSet<>();
literals.add(method);
// when
- AllowedMethods allowedMethods = AllowedMethods.build(literals);
+ AllowedMethods allowedMethods = AllowedMethods.build(true, literals, ActionConfig.DEFAULT_METHOD_REGEX);
// then
assertEquals(1, allowedMethods.list().size());
- assertTrue(allowedMethods.isAllowed("cancelAction"));
+ assertTrue(allowedMethods.isAllowed("cancel*"));
+ assertFalse(allowedMethods.isAllowed("cancelAction"));
assertFalse(allowedMethods.isAllowed("startEvent"));
}
@@ -59,7 +91,7 @@ public class AllowedMethodsTest extends TestCase {
literals.add(method);
// when
- AllowedMethods allowedMethods = AllowedMethods.build(literals);
+ AllowedMethods allowedMethods = AllowedMethods.build(true, literals, ActionConfig.DEFAULT_METHOD_REGEX);
// then
assertEquals(1, allowedMethods.list().size());
diff --git a/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java b/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
index 6eb9f27c4..7957cf906 100644
--- a/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcherTest.java
@@ -156,18 +156,21 @@ public class ActionConfigMatcherTest extends XWorkTestCase {
.build())
.addInterceptor(new InterceptorMapping(null, null))
.addResultConfig(new ResultConfig.Builder("success{1}", "foo.{2}").addParams(params).build())
+ .setStrictMethodInvocation(false)
.build();
map.put("foo/*/*", config);
config = new ActionConfig.Builder("package-{1}", "bar/*/**", "bar")
.methodName("do{1}_{1}")
.addParam("first", "{2}")
+ .setStrictMethodInvocation(false)
.build();
map.put("bar/*/**", config);
config = new ActionConfig.Builder("package", "eventAdd!*", "bar")
.methodName("{1}")
+ .setStrictMethodInvocation(false)
.build();
map.put("addEvent!*", config);
diff --git a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
index 1ccdc4a9c..339d6035f 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java
@@ -744,6 +744,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;
diff --git a/core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java b/core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
index faf807e39..762dedfc4 100644
--- a/core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsCheckerTest.java
@@ -91,7 +91,6 @@ public class DefaultExcludedPatternsCheckerTest extends XWorkTestCase {
}
for (String param : params) {
- System.out.println(param);
// when
ExcludedPatternsChecker.IsExcluded actual = checker.isExcluded(param);
diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
index d24d7955d..2de1f1823 100644
--- a/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/validator/EmailValidatorTest.java
@@ -45,6 +45,8 @@ public class EmailValidatorTest extends XWorkTestCase {
assertTrue(verifyEmailValidity("tmj'ee@yahoo.com"));
assertTrue(verifyEmailValidity("ferda+mravenec@yahoo.com"));
assertTrue(verifyEmailValidity("Ferda+Mravenec@yaHoo.CoM"));
+ assertTrue(verifyEmailValidity("user@domainname.tech"));
+ assertTrue(verifyEmailValidity("Ferda+Mravenec@yaHoo.cat"));
assertFalse(verifyEmailValidity("tm_jee#marry@yahoo.co.uk"));
assertFalse(verifyEmailValidity("tm_jee@ yahoo.co.uk"));
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
index 43146721a..69bb7de77 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
@@ -30,6 +30,7 @@ import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.entities.PackageConfig;
import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.StrutsException;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.result.StrutsResultSupport;
import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest;
@@ -844,14 +845,37 @@ public class DefaultActionMapperTest extends StrutsInternalTestCase {
String actionName = "action";
assertEquals(actionName, mapper.cleanupActionName(actionName));
+ Throwable expected = null;
+
actionName = "${action}";
- assertEquals("action", mapper.cleanupActionName(actionName));
+ try {
+ mapper.cleanupActionName(actionName);
+ fail();
+ } catch (Throwable t) {
+ expected = t;
+ }
+ assertTrue(expected instanceof StrutsException);
+ assertEquals("Action [${action}] does not match allowed action names pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage());
actionName = "${${%{action}}}";
- assertEquals("action", mapper.cleanupActionName(actionName));
+ try {
+ mapper.cleanupActionName(actionName);
+ fail();
+ } catch (Throwable t) {
+ expected = t;
+ }
+ assertTrue(expected instanceof StrutsException);
+ assertEquals("Action [${${%{action}}}] does not match allowed action names pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage());
actionName = "${#foo='action',#foo}";
- assertEquals("fooactionfoo", mapper.cleanupActionName(actionName));
+ try {
+ mapper.cleanupActionName(actionName);
+ fail();
+ } catch (Throwable t) {
+ expected = t;
+ }
+ assertTrue(expected instanceof StrutsException);
+ assertEquals("Action [${#foo='action',#foo}] does not match allowed action names pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage());
actionName = "test-action";
assertEquals("test-action", mapper.cleanupActionName(actionName));
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
index 2a33037e2..71fbb149f 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
@@ -232,7 +232,7 @@ public class SubmitTest extends AbstractUITagTest {
tag.doStartTag();
tag.doEndTag();
- assertEquals("
-
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
index 36b1554f5..e4b7c8b9d 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
@@ -1,3 +1,3 @@
-
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
index d83c44fcf..8632bc0ba 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
@@ -1,3 +1,3 @@
-
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
index 9cd5d0246..41dba2aad 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
@@ -1,3 +1,3 @@
-
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
new file mode 100644
index 000000000..9a3155d4d
--- /dev/null
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
@@ -0,0 +1,11 @@
+
+
+
+ mylabel
+ * :
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
new file mode 100644
index 000000000..e5e6e926d
--- /dev/null
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
@@ -0,0 +1,11 @@
+
+
+
+ *
+ mylabel:
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index f2500c52b..235cb327a 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -24,7 +24,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
4.0.0
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index c375bea8f..d508ea464 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -25,7 +25,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-cdi-plugin
diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml
index 69ebd2293..25a2762b8 100644
--- a/plugins/config-browser/pom.xml
+++ b/plugins/config-browser/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-config-browser-plugin
diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml
index a7c6d6355..5609415c0 100644
--- a/plugins/convention/pom.xml
+++ b/plugins/convention/pom.xml
@@ -3,7 +3,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-convention-plugin
diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
index fc85d54dd..45c71a350 100644
--- a/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
+++ b/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
@@ -930,7 +930,7 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
actionConfig.addAllowedMethod(allowedMethods);
actionConfig.addAllowedMethod(pkgCfg.getGlobalAllowedMethods());
} else {
- actionConfig.addAllowedMethod(ActionConfig.REGEX_WILDCARD);
+ actionConfig.addAllowedMethod(ActionConfig.WILDCARD);
}
if (LOG.isDebugEnabled()) {
diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml
index d34be748e..fec6997c2 100644
--- a/plugins/dwr/pom.xml
+++ b/plugins/dwr/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-dwr-plugin
diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml
index 077b861a0..e6d994257 100644
--- a/plugins/embeddedjsp/pom.xml
+++ b/plugins/embeddedjsp/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-embeddedjsp-plugin
diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml
index 5639ff43a..14c296471 100644
--- a/plugins/gxp/pom.xml
+++ b/plugins/gxp/pom.xml
@@ -3,7 +3,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-gxp-plugin
diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml
index f6a8cd63d..69c0e7df2 100644
--- a/plugins/jasperreports/pom.xml
+++ b/plugins/jasperreports/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-jasperreports-plugin
diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml
index 49dee3f07..4d26ade5a 100644
--- a/plugins/java8-support/pom.xml
+++ b/plugins/java8-support/pom.xml
@@ -5,7 +5,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-java8-support-plugin
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index a4a274b04..1d193dc5d 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -25,7 +25,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-javatemplates-plugin
diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml
index a6a19d831..9aed2b848 100644
--- a/plugins/jfreechart/pom.xml
+++ b/plugins/jfreechart/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-jfreechart-plugin
diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml
index fc3d83df7..bbe7f9dea 100644
--- a/plugins/json/pom.xml
+++ b/plugins/json/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-json-plugin
diff --git a/plugins/json/src/test/java/org/apache/struts2/json/JSONWriterTest.java b/plugins/json/src/test/java/org/apache/struts2/json/JSONWriterTest.java
index 88c888cdc..2a9d733cd 100644
--- a/plugins/json/src/test/java/org/apache/struts2/json/JSONWriterTest.java
+++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONWriterTest.java
@@ -7,7 +7,9 @@ import org.junit.Test;
import java.net.URL;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.TimeZone;
@@ -90,6 +92,41 @@ public class JSONWriterTest extends StrutsTestCase{
TestUtils.assertEquals(JSONWriter.class.getResource("jsonwriter-write-bean-02.txt"), json);
}
+ @Test
+ public void testWriteBeanWithList() throws Exception {
+ BeanWithList bean1 = new BeanWithList();
+ bean1.setStringField("str");
+ bean1.setBooleanField(true);
+ bean1.setCharField('s');
+ bean1.setDoubleField(10.1);
+ bean1.setFloatField(1.5f);
+ bean1.setIntField(10);
+ bean1.setLongField(100);
+ bean1.setEnumField(AnEnum.ValueA);
+ bean1.setEnumBean(AnEnumBean.Two);
+ List errors = new ArrayList();
+ errors.add("Field is required");
+ bean1.setErrors(errors);
+
+ JSONWriter jsonWriter = new JSONWriter();
+ jsonWriter.setEnumAsBean(false);
+ jsonWriter.setIgnoreHierarchy(false);
+ String json = jsonWriter.write(bean1);
+ TestUtils.assertEquals(JSONWriter.class.getResource("jsonwriter-write-bean-04.txt"), json);
+ }
+
+ private class BeanWithList extends Bean {
+ private List errors;
+
+ public List getErrors() {
+ return errors;
+ }
+
+ public void setErrors(List errors) {
+ this.errors = errors;
+ }
+ }
+
private class AnnotatedBean extends Bean{
private URL url;
diff --git a/plugins/json/src/test/resources/org/apache/struts2/json/jsonwriter-write-bean-04.txt b/plugins/json/src/test/resources/org/apache/struts2/json/jsonwriter-write-bean-04.txt
new file mode 100644
index 000000000..41f0b8177
--- /dev/null
+++ b/plugins/json/src/test/resources/org/apache/struts2/json/jsonwriter-write-bean-04.txt
@@ -0,0 +1,16 @@
+{
+ "bigDecimal":null,
+ "bigInteger":null,
+ "booleanField":true,
+ "byteField":0,
+ "charField":"s",
+ "doubleField":10.1,
+ "enumBean":"Two",
+ "enumField":"ValueA",
+ "errors":["Field is required"],
+ "floatField":1.5,
+ "intField":10,
+ "longField":100,
+ "objectField":null,
+ "stringField":"str"
+}
diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml
index 798c14329..94ec0b310 100644
--- a/plugins/junit/pom.xml
+++ b/plugins/junit/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-junit-plugin
diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml
index 2ed66b07d..484ee03c7 100644
--- a/plugins/osgi/pom.xml
+++ b/plugins/osgi/pom.xml
@@ -4,7 +4,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-osgi-plugin
diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml
index cdaf94d33..bdfb5cf5e 100644
--- a/plugins/oval/pom.xml
+++ b/plugins/oval/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-oval-plugin
diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml
index 18fa61e8c..a811d1d17 100644
--- a/plugins/pell-multipart/pom.xml
+++ b/plugins/pell-multipart/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-pell-multipart-plugin
diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml
index c981ba187..066a87e24 100644
--- a/plugins/plexus/pom.xml
+++ b/plugins/plexus/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-plexus-plugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index ba4418184..c074d3642 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-parent
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-plugins
diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml
index 8b710b206..833569ba6 100644
--- a/plugins/portlet-tiles/pom.xml
+++ b/plugins/portlet-tiles/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-portlet-tiles-plugin
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index b7500f713..ddca94ce0 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -3,7 +3,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-portlet-plugin
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index 0867ddea3..f4fb1237f 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-rest-plugin
diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
index f1fc41a0f..678a6f30e 100644
--- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
+++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java
@@ -320,7 +320,7 @@ public class RestActionMapper extends DefaultActionMapper {
mapping.setName(actionName);
if (allowDynamicMethodCalls) {
- mapping.setMethod(actionMethod);
+ mapping.setMethod(cleanupActionName(actionMethod));
} else {
mapping.setMethod(null);
}
diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml
index 8f6302f3c..3eb549cd3 100644
--- a/plugins/sitegraph/pom.xml
+++ b/plugins/sitegraph/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-sitegraph-plugin
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index a6b800104..239d403da 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-sitemesh-plugin
diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml
index 4e509f1e7..7ed9d45ba 100644
--- a/plugins/spring/pom.xml
+++ b/plugins/spring/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-spring-plugin
diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml
index a45a17f74..709e402eb 100644
--- a/plugins/testng/pom.xml
+++ b/plugins/testng/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-testng-plugin
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 0b964af9d..e6bc1b7f8 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -26,7 +26,7 @@
org.apache.struts
struts2-plugins
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
struts2-tiles-plugin
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
index 6884e9a42..4ff5b5470 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsApplicationResource.java
@@ -52,4 +52,8 @@ public class StrutsApplicationResource extends PostfixedApplicationResource {
return 0;
}
+ @Override
+ public String toString() {
+ return "Resource " + getLocalePath() + " at " + url.toString();
+ }
}
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index fe90d75a2..a8e77cec8 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -19,6 +19,7 @@
package org.apache.struts2.tiles;
+import com.opensymphony.xwork2.util.TextParseUtil;
import ognl.OgnlException;
import ognl.OgnlRuntime;
import ognl.PropertyAccessor;
@@ -71,6 +72,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
/**
* Dedicated Struts factory to build Tiles container with support for:
@@ -176,25 +178,28 @@ public class StrutsTilesContainerFactory extends BasicTilesContainerFactory {
@Override
protected List getSources(ApplicationContext applicationContext) {
- Collection resources = applicationContext.getResources(getTilesDefinitionPattern(applicationContext.getInitParams()));
+ Collection resources = new ArrayList<>();
+
+ Set definitions = getTilesDefinitions(applicationContext.getInitParams());
+ for (String definition : definitions) {
+ resources.addAll(applicationContext.getResources(definition));
+ }
List filteredResources = new ArrayList<>();
- if (resources != null) {
- for (ApplicationResource resource : resources) {
- if (Locale.ROOT.equals(resource.getLocale())) {
- filteredResources.add(resource);
- }
+ for (ApplicationResource resource : resources) {
+ if (Locale.ROOT.equals(resource.getLocale())) {
+ filteredResources.add(resource);
}
}
return filteredResources;
}
- protected String getTilesDefinitionPattern(Map params) {
+ protected Set getTilesDefinitions(Map params) {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
- return params.get(DefinitionsFactory.DEFINITIONS_CONFIG);
+ return TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));
}
- return TILES_DEFAULT_PATTERN;
+ return TextParseUtil.commaDelimitedStringToSet(TILES_DEFAULT_PATTERN);
}
protected ELAttributeEvaluator createELEvaluator(ApplicationContext applicationContext) {
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
index 70a21ed22..df6152bd5 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsWildcardServletApplicationContext.java
@@ -54,8 +54,12 @@ public class StrutsWildcardServletApplicationContext extends ServletApplicationC
for (Object path : context.getResourcePaths("/")) {
try {
- URL url = new File(context.getRealPath(String.valueOf(path))).toURI().toURL();
- urls.add(url);
+ String realPath = context.getRealPath(String.valueOf(path));
+
+ if (realPath != null) {
+ URL url = new File(realPath).toURI().toURL();
+ urls.add(url);
+ }
} catch (MalformedURLException e) {
throw new ConfigurationException(e);
}
diff --git a/pom.xml b/pom.xml
index 8a24fd09c..323cf9e56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
struts2-parent
- 2.5-SNAPSHOT
+ 2.5.1-SNAPSHOT
pom
Struts 2
http://struts.apache.org/
@@ -85,7 +85,7 @@
${project.version}
4.1.6.RELEASE
- 3.1.2
+ 3.1.4
3.3
5.0.2
3.0.5
@@ -706,7 +706,7 @@
commons-collections
commons-collections
- 3.2.1
+ 3.2.2
commons-fileupload