diff --git a/apps/pom.xml b/apps/pom.xml index ab871b01e..245f2b54d 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-apps pom diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index dbed8171c..54680ac21 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-portlet diff --git a/apps/portlet/src/main/resources/struts-edit.xml b/apps/portlet/src/main/resources/struts-edit.xml index 55161f8f6..a31691c29 100644 --- a/apps/portlet/src/main/resources/struts-edit.xml +++ b/apps/portlet/src/main/resources/struts-edit.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/portlet/src/main/resources/struts-help.xml b/apps/portlet/src/main/resources/struts-help.xml index bc047aa24..451aa7de4 100644 --- a/apps/portlet/src/main/resources/struts-help.xml +++ b/apps/portlet/src/main/resources/struts-help.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/portlet/src/main/resources/struts-view.xml b/apps/portlet/src/main/resources/struts-view.xml index 87ce94f2e..e492af1ef 100644 --- a/apps/portlet/src/main/resources/struts-view.xml +++ b/apps/portlet/src/main/resources/struts-view.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 6e7e0c02e..48b796d0c 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,12 +26,12 @@ org.apache.struts struts2-apps - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-rest-showcase war - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 53d9a93a4..b114590b7 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-showcase diff --git a/apps/showcase/src/main/resources/struts-actionchaining.xml b/apps/showcase/src/main/resources/struts-actionchaining.xml index 94d8b2857..ab0f2ea5b 100644 --- a/apps/showcase/src/main/resources/struts-actionchaining.xml +++ b/apps/showcase/src/main/resources/struts-actionchaining.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-conversion.xml b/apps/showcase/src/main/resources/struts-conversion.xml index cfbac4abf..e597b25c0 100644 --- a/apps/showcase/src/main/resources/struts-conversion.xml +++ b/apps/showcase/src/main/resources/struts-conversion.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-filedownload.xml b/apps/showcase/src/main/resources/struts-filedownload.xml index f05b4a42c..de50f5abd 100644 --- a/apps/showcase/src/main/resources/struts-filedownload.xml +++ b/apps/showcase/src/main/resources/struts-filedownload.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-fileupload.xml b/apps/showcase/src/main/resources/struts-fileupload.xml index 5a81f614d..d9d0cfcac 100644 --- a/apps/showcase/src/main/resources/struts-fileupload.xml +++ b/apps/showcase/src/main/resources/struts-fileupload.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-freemarker.xml b/apps/showcase/src/main/resources/struts-freemarker.xml index 8c70421cf..9a6c9017f 100644 --- a/apps/showcase/src/main/resources/struts-freemarker.xml +++ b/apps/showcase/src/main/resources/struts-freemarker.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-hangman.xml b/apps/showcase/src/main/resources/struts-hangman.xml index 69abdbf7a..b8540630a 100644 --- a/apps/showcase/src/main/resources/struts-hangman.xml +++ b/apps/showcase/src/main/resources/struts-hangman.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-interactive.xml b/apps/showcase/src/main/resources/struts-interactive.xml index 24b28b758..7c50d3753 100644 --- a/apps/showcase/src/main/resources/struts-interactive.xml +++ b/apps/showcase/src/main/resources/struts-interactive.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-model-driven.xml b/apps/showcase/src/main/resources/struts-model-driven.xml index dc9b839a3..56e4bdfbe 100644 --- a/apps/showcase/src/main/resources/struts-model-driven.xml +++ b/apps/showcase/src/main/resources/struts-model-driven.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-person.xml b/apps/showcase/src/main/resources/struts-person.xml index 28a7642a0..e880e5b27 100644 --- a/apps/showcase/src/main/resources/struts-person.xml +++ b/apps/showcase/src/main/resources/struts-person.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-tags-non-ui.xml b/apps/showcase/src/main/resources/struts-tags-non-ui.xml index 9722b52e8..9ecf1528b 100644 --- a/apps/showcase/src/main/resources/struts-tags-non-ui.xml +++ b/apps/showcase/src/main/resources/struts-tags-non-ui.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-tags-ui.xml b/apps/showcase/src/main/resources/struts-tags-ui.xml index cc779e575..659e97934 100644 --- a/apps/showcase/src/main/resources/struts-tags-ui.xml +++ b/apps/showcase/src/main/resources/struts-tags-ui.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-tags.xml b/apps/showcase/src/main/resources/struts-tags.xml index cd1a2b2b6..8485a64f0 100644 --- a/apps/showcase/src/main/resources/struts-tags.xml +++ b/apps/showcase/src/main/resources/struts-tags.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-tiles.xml b/apps/showcase/src/main/resources/struts-tiles.xml index 9fbe0258b..caa0727f0 100644 --- a/apps/showcase/src/main/resources/struts-tiles.xml +++ b/apps/showcase/src/main/resources/struts-tiles.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-token.xml b/apps/showcase/src/main/resources/struts-token.xml index d43435bd3..8b545df04 100644 --- a/apps/showcase/src/main/resources/struts-token.xml +++ b/apps/showcase/src/main/resources/struts-token.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-validation.xml b/apps/showcase/src/main/resources/struts-validation.xml index 40b989971..63fcd7970 100755 --- a/apps/showcase/src/main/resources/struts-validation.xml +++ b/apps/showcase/src/main/resources/struts-validation.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-wait.xml b/apps/showcase/src/main/resources/struts-wait.xml index 0e09f4966..1a5556d73 100644 --- a/apps/showcase/src/main/resources/struts-wait.xml +++ b/apps/showcase/src/main/resources/struts-wait.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts-xslt.xml b/apps/showcase/src/main/resources/struts-xslt.xml index 7d17720ae..d3a040bb7 100644 --- a/apps/showcase/src/main/resources/struts-xslt.xml +++ b/apps/showcase/src/main/resources/struts-xslt.xml @@ -1,8 +1,8 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml index dcf9a916f..11ca7246a 100644 --- a/apps/showcase/src/main/resources/struts.xml +++ b/apps/showcase/src/main/resources/struts.xml @@ -1,8 +1,8 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/archetypes/pom.xml b/archetypes/pom.xml index a24531a6c..19823b110 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-archetypes diff --git a/archetypes/struts2-archetype-angularjs/pom.xml b/archetypes/struts2-archetype-angularjs/pom.xml index 9db220aa3..dc2c50887 100644 --- a/archetypes/struts2-archetype-angularjs/pom.xml +++ b/archetypes/struts2-archetype-angularjs/pom.xml @@ -2,7 +2,7 @@ org.apache.struts struts2-archetypes - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT 4.0.0 diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml index 0c7352322..d11f2d899 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/resources/struts.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index 9a9260c22..6fc370f86 100644 --- a/archetypes/struts2-archetype-blank/pom.xml +++ b/archetypes/struts2-archetype-blank/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-archetypes - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT 4.0.0 diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml index 7de329f94..906b23eac 100644 --- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml +++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> *

* Note that the doublelistkey and doublelistvalue attribute will default to "key" and "value" - * respectively only when the doublelist attribute is evaluated to a Map or its decendant. + * respectively only when the doublelist attribute is evaluated to a Map or its descendant. * Other thing else, will result in doublelistkey and doublelistvalue to be null and not used. *

* diff --git a/core/src/main/java/org/apache/struts2/components/I18n.java b/core/src/main/java/org/apache/struts2/components/I18n.java index 4db0e077c..a04840fc1 100644 --- a/core/src/main/java/org/apache/struts2/components/I18n.java +++ b/core/src/main/java/org/apache/struts2/components/I18n.java @@ -21,7 +21,13 @@ package org.apache.struts2.components; -import com.opensymphony.xwork2.ActionContext; +import java.io.Writer; +import java.util.ResourceBundle; + +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; +import org.apache.struts2.StrutsException; + import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.TextProvider; import com.opensymphony.xwork2.TextProviderFactory; @@ -31,13 +37,6 @@ import com.opensymphony.xwork2.util.LocalizedTextUtil; import com.opensymphony.xwork2.util.ValueStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.StrutsException; -import org.apache.struts2.views.annotations.StrutsTag; -import org.apache.struts2.views.annotations.StrutsTagAttribute; - -import java.io.Writer; -import java.util.Locale; -import java.util.ResourceBundle; /** * @@ -92,6 +91,8 @@ public class I18n extends Component { protected String name; protected Container container; private TextProvider textProvider; + private TextProvider defaultTextProvider; + private LocaleProvider localeProvider; public I18n(ValueStack stack) { super(stack); @@ -102,26 +103,31 @@ public class I18n extends Component { this.container = container; } + @Inject + public void setTextProvider(TextProvider textProvider) { + this.defaultTextProvider = textProvider; + } + + @Inject + public void setLocaleProvider(LocaleProvider localeProvider) { + this.localeProvider = localeProvider; + } + public boolean start(Writer writer) { boolean result = super.start(writer); try { String name = this.findString(this.name, "name", "Resource bundle name is required. Example: foo or foo_en"); - ResourceBundle bundle = (ResourceBundle) findValue("getTexts('" + name + "')"); + ResourceBundle bundle = defaultTextProvider.getTexts(name); if (bundle == null) { - bundle = LocalizedTextUtil.findResourceBundle(name, (Locale) getStack().getContext().get(ActionContext.LOCALE)); + bundle = LocalizedTextUtil.findResourceBundle(name, localeProvider.getLocale()); } if (bundle != null) { - final Locale locale = (Locale) getStack().getContext().get(ActionContext.LOCALE); TextProviderFactory tpf = new TextProviderFactory(); container.inject(tpf); - textProvider = tpf.createInstance(bundle, new LocaleProvider() { - public Locale getLocale() { - return locale; - } - }); + textProvider = tpf.createInstance(bundle, localeProvider); getStack().push(textProvider); pushed = true; } diff --git a/core/src/main/java/org/apache/struts2/components/ListUIBean.java b/core/src/main/java/org/apache/struts2/components/ListUIBean.java index 94be9d19c..75b29f0d0 100644 --- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java @@ -42,7 +42,7 @@ import java.util.Map; * *

* Note that the listkey and listvalue attribute will default to "key" and "value" - * respectively only when the list attribute is evaluated to a Map or its decendant. + * respectively only when the list attribute is evaluated to a Map or its descendant. * Everything else will result in listkey and listvalue to be null and not used. *

* diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java index 1b3c16852..7e1ca021d 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java @@ -42,7 +42,7 @@ import com.opensymphony.xwork2.util.ValueStack; *
  • application - the value will be set in application scope according to servlet spec. using the name as its key
    • *
  • session - the value will be set in session scope according to servlet spec. using the name as key
    • *
  • request - the value will be set in request scope according to servlet spec. using the name as key
    • - *
  • page - the value will be set in page scope according to servlet sepc. using the name as key
    • + *
  • page - the value will be set in page scope according to servlet spec. using the name as key
    • *
  • action - the value will be set in the request scope and Struts' action context using the name as key
    • * * 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 d0e89beef..005f9f201 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 @@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper { protected boolean allowSlashesInActionNames = false; protected boolean alwaysSelectFullNamespace = false; protected PrefixTrie prefixTrie = null; - protected Pattern allowedActionNames = Pattern.compile("[a-zA-Z0-9._!/\\-]*"); + protected Pattern allowedActionNames = Pattern.compile("^[a-zA-Z0-9_!/\\-]*((.htm[l]?)|(.action))?$"); private boolean allowActionPrefix = false; private boolean allowActionCrossNamespaceAccess = false; diff --git a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java index 90055547b..6088b020f 100644 --- a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java @@ -13,7 +13,7 @@ import com.opensymphony.xwork2.result.ParamNameAwareResult; import java.util.Map; /** - * Default implementation which uses {@link com.opensymphony.xwork2.result.ParamNameAwareResult} to accept or throwaway parameters + * Default implementation which uses {@link com.opensymphony.xwork2.result.ParamNameAwareResult} to accept or throw away parameters */ public class StrutsResultFactory implements ResultFactory { diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java index ba7e37dc0..c174edd69 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java @@ -78,7 +78,7 @@ public abstract class TagModel implements TemplateTransformModel { Object value = entry.getValue(); if (value != null) { - // the value should ALWAYS be a decendant of TemplateModel + // the value should ALWAYS be a descendant of TemplateModel if (value instanceof TemplateModel) { try { map.put(entry.getKey(), objectWrapper.unwrap((TemplateModel) value)); diff --git a/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties b/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties index 606887998..94781f5d1 100644 --- a/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties +++ b/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties @@ -7,4 +7,4 @@ xwork.error.action.execution=Error during Action invocation xwork.exception.missing-action=There is no Action mapped for action name {0}. xwork.exception.missing-package-action=There is no Action mapped for namespace {0} and action name {1}. xwork.default.invalid.fieldvalue=Invalid field value for field "{0}". - +struts.exception.method-not-allowed=Method {0} for action {1} is not allowed! diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl b/core/src/main/resources/template/xhtml/controlheader.ftl index e1209cd31..c14779e5a 100644 --- a/core/src/main/resources/template/xhtml/controlheader.ftl +++ b/core/src/main/resources/template/xhtml/controlheader.ftl @@ -21,5 +21,10 @@ */ --> <#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" /> - + class="align-${parameters.align?html}" + <#else > + class="tdInput" + ><#t/> diff --git a/core/src/main/resources/template/xhtml/styles.css b/core/src/main/resources/template/xhtml/styles.css index 91d5171ee..16631fe95 100644 --- a/core/src/main/resources/template/xhtml/styles.css +++ b/core/src/main/resources/template/xhtml/styles.css @@ -35,3 +35,4 @@ .tdCheckboxErrorMessage {text-align:left; vertical-align:top;} .tdErrorMessage {text-align:center; vertical-align:top;} .formButton {text-align:right;} +.tdInput {text-align:left;} diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java index 2482ca084..cbbd58bc0 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java @@ -64,7 +64,6 @@ public class ActionSupportTest extends XWorkTestCase { } assertEquals(Action.INPUT, as.input()); - assertEquals(Action.SUCCESS, as.doDefault()); assertEquals(Action.SUCCESS, as.execute()); try { as.clone(); @@ -157,7 +156,7 @@ public class ActionSupportTest extends XWorkTestCase { ActionContext.getContext().setLocale(new Locale("da")); MyActionSupport mas = new MyActionSupport(); - assertEquals("santa", mas.doDefault()); + assertEquals("santa", mas.execute()); assertNotNull(mas.getTexts()); assertEquals(false, mas.hasActionMessages()); @@ -331,7 +330,7 @@ public class ActionSupportTest extends XWorkTestCase { private Double val; @Override - public String doDefault() throws Exception { + public String execute() throws Exception { return "santa"; } diff --git a/core/src/test/java/com/opensymphony/xwork2/DefaultActionProxyTest.java b/core/src/test/java/com/opensymphony/xwork2/DefaultActionProxyTest.java new file mode 100644 index 000000000..17d7c68eb --- /dev/null +++ b/core/src/test/java/com/opensymphony/xwork2/DefaultActionProxyTest.java @@ -0,0 +1,24 @@ +package com.opensymphony.xwork2; + +import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; +import com.opensymphony.xwork2.mock.MockActionInvocation; +import org.apache.struts2.StrutsInternalTestCase; +import org.junit.Test; + +public class DefaultActionProxyTest extends StrutsInternalTestCase { + + @Test + public void testThorwExceptionOnNotAllowedMethod() throws Exception { + final String filename = "com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml"; + loadConfigurationProviders(new XmlConfigurationProvider(filename)); + DefaultActionProxy dap = new DefaultActionProxy(new MockActionInvocation(), "strict", "Default", "notAllowed", true, true); + container.inject(dap); + + try { + dap.prepare(); + fail("Must throw exception!"); + } catch (Exception e) { + assertEquals(e.getMessage(), "Method notAllowed for action Default is not allowed!"); + } + } +} \ No newline at end of file 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 339d6035f..4fdf742a0 100644 --- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java @@ -759,6 +759,21 @@ public class OgnlUtilTest extends XWorkTestCase { assertEquals(expected.getMessage(), "Eval expressions/chained expressions have been disabled!"); } + public void testCallMethod() throws Exception { + Foo foo = new Foo(); + + Exception expected = null; + try { + ognlUtil.callMethod("#booScope=@myclass@DEFAULT_SCOPE,#bootScope.init()", ognlUtil.createDefaultContext(foo), foo); + fail(); + } catch (OgnlException e) { + expected = e; + } + assertNotNull(expected); + assertSame(OgnlException.class, expected.getClass()); + assertEquals(expected.getMessage(), "It isn't a simple method which can be called!"); + } + public static class Email { String address; diff --git a/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java b/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java index 12058520e..f09bc9b89 100644 --- a/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java @@ -20,10 +20,7 @@ import com.opensymphony.xwork2.*; import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; import com.opensymphony.xwork2.test.ModelDrivenAction2; import com.opensymphony.xwork2.test.TestBean2; -import org.apache.struts2.util.DateFormatter; -import org.springframework.format.annotation.DateTimeFormat; -import javax.swing.text.Style; import java.text.DateFormat; import java.text.ParseException; import java.util.Date; @@ -134,17 +131,17 @@ public class LocalizedTextUtilTest extends XWorkTestCase { } public void testDefaultMessage() throws Exception { - String message = LocalizedTextUtil.findDefaultText(XWorkMessages.ACTION_EXECUTION_ERROR, Locale.getDefault()); + String message = LocalizedTextUtil.findDefaultText("xwork.error.action.execution", Locale.getDefault()); assertEquals("Error during Action invocation", message); } public void testDefaultMessageOverride() throws Exception { - String message = LocalizedTextUtil.findDefaultText(XWorkMessages.ACTION_EXECUTION_ERROR, Locale.getDefault()); + String message = LocalizedTextUtil.findDefaultText("xwork.error.action.execution", Locale.getDefault()); assertEquals("Error during Action invocation", message); LocalizedTextUtil.addDefaultResourceBundle("com/opensymphony/xwork2/test"); - message = LocalizedTextUtil.findDefaultText(XWorkMessages.ACTION_EXECUTION_ERROR, Locale.getDefault()); + message = LocalizedTextUtil.findDefaultText("xwork.error.action.execution", Locale.getDefault()); assertEquals("Testing resource bundle override", message); } @@ -187,12 +184,12 @@ public class LocalizedTextUtilTest extends XWorkTestCase { } public void testParameterizedDefaultMessage() throws Exception { - String message = LocalizedTextUtil.findDefaultText(XWorkMessages.MISSING_ACTION_EXCEPTION, Locale.getDefault(), new String[]{"AddUser"}); + String message = LocalizedTextUtil.findDefaultText("xwork.exception.missing-action", Locale.getDefault(), new String[]{"AddUser"}); assertEquals("There is no Action mapped for action name AddUser.", message); } public void testParameterizedDefaultMessageWithPackage() throws Exception { - String message = LocalizedTextUtil.findDefaultText(XWorkMessages.MISSING_PACKAGE_ACTION_EXCEPTION, Locale.getDefault(), new String[]{"blah", "AddUser"}); + String message = LocalizedTextUtil.findDefaultText("xwork.exception.missing-package-action", Locale.getDefault(), new String[]{"blah", "AddUser"}); assertEquals("There is no Action mapped for namespace blah and action name AddUser.", message); } diff --git a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java index 2895d801c..77223ebed 100644 --- a/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/validator/URLValidatorTest.java @@ -138,6 +138,7 @@ public class URLValidatorTest extends XWorkTestCase { assertFalse(pattern.matcher("").matches()); assertFalse(pattern.matcher(" ").matches()); assertFalse(pattern.matcher("no url").matches()); + assertFalse(pattern.matcher("http://example.com////////////////////////////////////////////////////////////////////////////////////??").matches()); assertTrue(pattern.matcher("http://www.opensymphony.com").matches()); assertTrue(pattern.matcher("https://www.opensymphony.com").matches()); diff --git a/core/src/test/java/org/apache/struts2/components/UIBeanTest.java b/core/src/test/java/org/apache/struts2/components/UIBeanTest.java index 470cc9119..b2fc84399 100644 --- a/core/src/test/java/org/apache/struts2/components/UIBeanTest.java +++ b/core/src/test/java/org/apache/struts2/components/UIBeanTest.java @@ -164,21 +164,4 @@ public class UIBeanTest extends StrutsInternalTestCase { assertEquals("12", txtFld.getTheme()); } -// I couldn't figure out how to make this test work. Bailing for now. -// public void testEscapeLabel() throws Exception { -// ValueStack stack = ActionContext.getContext().getValueStack(); -// MockHttpServletRequest req = new MockHttpServletRequest(); -// MockHttpServletResponse res = new MockHttpServletResponse(); -// stack.push(this); -// -// TextField txtFld = new TextField(stack, req, res); -// txtFld.setKey("test['foo']"); -// txtFld.evaluateParams(); -// assertEquals("test_label", txtFld.getParameters().get("label")); -// } -// -// public String getText(String key) { -// assertEquals("test[\\'foo\\']", key); -// return "test_label"; -// } } 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 69bb7de77..b51f56929 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 @@ -163,8 +163,8 @@ public class DefaultActionMapperTest extends StrutsInternalTestCase { public void testGetMappingWithNamespaceSlash() throws Exception { - req.setupGetRequestURI("/my.hh/abc.action"); - req.setupGetServletPath("/my.hh/abc.action"); + req.setupGetRequestURI("/my-hh/abc.action"); + req.setupGetServletPath("/my-hh/abc.action"); req.setupGetAttribute(null); req.addExpectedGetAttributeName("javax.servlet.include.servlet_path"); @@ -181,7 +181,7 @@ public class DefaultActionMapperTest extends StrutsInternalTestCase { mapping = mapper.getMapping(req, configManager); assertEquals("", mapping.getNamespace()); - assertEquals("my.hh/abc", mapping.getName()); + assertEquals("my-hh/abc", mapping.getName()); } public void testGetMappingWithUnknownNamespace() throws Exception { @@ -855,7 +855,7 @@ public class DefaultActionMapperTest extends StrutsInternalTestCase { expected = t; } assertTrue(expected instanceof StrutsException); - assertEquals("Action [${action}] does not match allowed action names pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage()); + assertEquals("Action [${action}] does not match allowed action names pattern [" + mapper.allowedActionNames.pattern() + "]!", expected.getMessage()); actionName = "${${%{action}}}"; try { @@ -865,7 +865,7 @@ public class DefaultActionMapperTest extends StrutsInternalTestCase { expected = t; } assertTrue(expected instanceof StrutsException); - assertEquals("Action [${${%{action}}}] does not match allowed action names pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage()); + assertEquals("Action [${${%{action}}}] does not match allowed action names pattern [" + mapper.allowedActionNames.pattern() + "]!", expected.getMessage()); actionName = "${#foo='action',#foo}"; try { @@ -875,7 +875,7 @@ public class DefaultActionMapperTest extends StrutsInternalTestCase { expected = t; } assertTrue(expected instanceof StrutsException); - assertEquals("Action [${#foo='action',#foo}] does not match allowed action names pattern [[a-zA-Z0-9._!/\\-]*]!", expected.getMessage()); + assertEquals("Action [${#foo='action',#foo}] does not match allowed action names pattern [" + mapper.allowedActionNames.pattern() + "]!", expected.getMessage()); actionName = "test-action"; assertEquals("test-action", mapper.cleanupActionName(actionName)); diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java index d8143084c..73ad2180f 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java @@ -337,4 +337,20 @@ public class TextfieldTest extends AbstractUITagTest { verify(TextFieldTag.class.getResource("Textfield-11.txt")); } + public void testNameEvaluation() throws Exception { + TestAction testAction = (TestAction) action; + testAction.setArray(new String[]{"test", "bar"}); + testAction.setFooInt(1); + + TextFieldTag tag = new TextFieldTag(); + tag.setPageContext(pageContext); + tag.setName("array[%{fooInt}]"); + + tag.doStartTag(); + tag.doEndTag(); + + verify(TextFieldTag.class.getResource("Textfield-14.txt")); + } + + } diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt index 0458cea2a..3f40324f1 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt @@ -1,6 +1,6 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt index abdaa4414..afd930d8e 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt @@ -1,6 +1,6 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt index 5fe2bf584..98284f057 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt @@ -1,6 +1,6 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt index 3ba9c42d7..7bf890a04 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt @@ -1,6 +1,6 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt index 1c416a598..fc3c1c0a8 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt @@ -1,6 +1,6 @@ - + +
    -
    +
    -
    +
    -
    + - +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt index 3487b3370..2c62222d3 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt @@ -1,7 +1,7 @@
    -
    + - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt index f4859443c..cbb368837 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt @@ -1,4 +1,4 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt index d66737f62..d68de5b56 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt @@ -2,5 +2,5 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt index b190ae523..4e0f6af42 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt index 17addde78..b7df72e79 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt index 6865d239d..c8628c9e5 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt @@ -1,6 +1,6 @@ - - - - - - - - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt index 0a42dea3d..0de6d8416 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt @@ -1,6 +1,6 @@ - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt index f5b694a61..cb8160cca 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt @@ -1,6 +1,6 @@ - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt index 746e04467..64963f1bb 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt @@ -1,6 +1,6 @@ - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt index 1ac889aa5..ccb749cab 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt @@ -1,6 +1,6 @@ - - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt index d58184796..6bc0381dc 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt @@ -1,6 +1,6 @@ - - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt index 7bf1ba537..cd25957dd 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt @@ -1,6 +1,6 @@ - - - - - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt index 50b96bb3c..e9b24a436 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt @@ -1,6 +1,6 @@ - - - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt index 5766f391d..0112b71ef 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt @@ -1,6 +1,6 @@ - - - - - - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt index 40dfacf63..8a783b52f 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt @@ -1,4 +1,4 @@ - + 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 index 9a3155d4d..956c89105 100644 --- 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 @@ -5,7 +5,7 @@ *: - \ 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 index e5e6e926d..373f0dca7 100644 --- 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 @@ -5,7 +5,7 @@ mylabel: - \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-14.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-14.txt new file mode 100644 index 000000000..fcb370391 --- /dev/null +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-14.txt @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt index fc370890b..53b6c1035 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt @@ -3,5 +3,5 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt index c90ae3687..e1e315469 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt @@ -1,4 +1,4 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt index cb24f04ee..c583312c6 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt index 5dfc6245e..08326c776 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt @@ -1,4 +1,4 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt index e6ecb5cec..01809d015 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt @@ -1,4 +1,4 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt index 45d4ffba8..e92356069 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt @@ -1,4 +1,4 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt index b3e3addc9..4d090a035 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt @@ -2,7 +2,7 @@ - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt index a0cb05449..bf8b17091 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt @@ -7,7 +7,7 @@ - \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt index 47324f347..22062bf7f 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt @@ -1,6 +1,6 @@ - - +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt index ca0e82e08..c51b76942 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt @@ -1,6 +1,6 @@
    +
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt index b1f903e0f..04be0ecbc 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt @@ -1,6 +1,6 @@
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt index 09aad69f1..e0608ddb9 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt @@ -1,6 +1,6 @@
    +
    +
    +
    +
    mylabel: +
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt index be8fd8fce..d423b3a3c 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt @@ -1,6 +1,6 @@ -
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt index 3e3642190..2713ceca6 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-2.txt @@ -1,6 +1,6 @@ -
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt index a7905457b..fee900366 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-3.txt @@ -1,6 +1,6 @@ -
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt index 4454ed2f9..61668b22a 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-4.txt @@ -1,6 +1,6 @@ -
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt index cbcde657c..dc0057fdd 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-5.txt @@ -1,6 +1,6 @@ -
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt index 68f689b7b..ade6e348a 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-6.txt @@ -1,6 +1,6 @@ -
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt index 75f5aaf4c..9becafca5 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-7.txt @@ -1,6 +1,6 @@ -
    + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt index 7701269ab..8394cb502 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt @@ -8,7 +8,7 @@ onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/> - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt index 8c7d2fe32..596854e73 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt @@ -8,7 +8,7 @@ onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/> - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt index a8871b6a6..e4885645a 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt @@ -8,7 +8,7 @@ onmouseover="domTT_activate(this,event,'content','myTooltip','delay','5000','styleClass','StrutsTTClassic')"/> - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt index 36cb71127..f8aad53bd 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-4.txt @@ -8,7 +8,7 @@ title="myTooltip" alt="myTooltip" /> - diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt index 1781a6edc..2f0974e93 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-1.txt @@ -1,4 +1,4 @@ -
    +
    +
    +
    +
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt index 02dc6af74..b98ee464a 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-10.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt index cbcb6da1e..593a7b9b2 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-11.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt index 840992682..a00d29403 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-2.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt index 6882b436d..40d57d5c4 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-3.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt index 8f95fa6ee..1237d1bd6 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-4.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt index d8d80a443..6a87c2165 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-5.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt index 16a2760f7..2a8ccd6a3 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-6.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt index 863b1346d..6d6fab994 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-7.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt index b3d73dae6..939b78401 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-8.txt @@ -1,4 +1,4 @@ -
    +
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt index 9a3dc0c9b..bebbd9bb6 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/updownselecttag-9.txt @@ -1,4 +1,4 @@ -
    +
    - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt index e965d4322..8bdb4b6bf 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-2.txt @@ -3,5 +3,5 @@ - + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt index 67d52b247..c35c1ea62 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-3.txt @@ -3,5 +3,5 @@ - + diff --git a/core/src/test/resources/struts-object-factory-result-builder.xml b/core/src/test/resources/struts-object-factory-result-builder.xml index bd90c0d88..67d379aee 100644 --- a/core/src/test/resources/struts-object-factory-result-builder.xml +++ b/core/src/test/resources/struts-object-factory-result-builder.xml @@ -21,8 +21,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index 235cb327a..acdb80c7a 100644 --- a/plugins/bean-validation/pom.xml +++ b/plugins/bean-validation/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT 4.0.0 diff --git a/plugins/bean-validation/src/main/resources/struts-plugin.xml b/plugins/bean-validation/src/main/resources/struts-plugin.xml index 1ef394950..c7b9d2025 100644 --- a/plugins/bean-validation/src/main/resources/struts-plugin.xml +++ b/plugins/bean-validation/src/main/resources/struts-plugin.xml @@ -23,8 +23,8 @@ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index d508ea464..cb740cd36 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-cdi-plugin diff --git a/plugins/cdi/src/main/resources/struts-plugin.xml b/plugins/cdi/src/main/resources/struts-plugin.xml index 364440820..bbbd5a9ab 100644 --- a/plugins/cdi/src/main/resources/struts-plugin.xml +++ b/plugins/cdi/src/main/resources/struts-plugin.xml @@ -20,8 +20,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 25a2762b8..5b0460497 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-config-browser-plugin diff --git a/plugins/config-browser/src/main/resources/struts-plugin.xml b/plugins/config-browser/src/main/resources/struts-plugin.xml index ccdef48bf..c1115e43c 100644 --- a/plugins/config-browser/src/main/resources/struts-plugin.xml +++ b/plugins/config-browser/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 5609415c0..e00c3422b 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-convention-plugin diff --git a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java index b7c7acff7..ace9446dd 100644 --- a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java +++ b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java @@ -106,7 +106,7 @@ public class ConventionUnknownHandler implements UnknownHandler { this.redirectToSlash = Boolean.parseBoolean(redirectToSlash); - allowedMethods = TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse"); + allowedMethods = TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse,index"); } public ActionConfig handleUnknownAction(String namespace, String actionName) @@ -219,7 +219,10 @@ public class ConventionUnknownHandler implements UnknownHandler { results.put(Action.SUCCESS, config); return new ActionConfig.Builder(defaultParentPackageName, "execute", ActionSupport.class.getName()). - addInterceptors(interceptors).addResultConfigs(results).build(); + addInterceptors(interceptors). + addResultConfigs(results). + addAllowedMethod(pkg.getGlobalAllowedMethods()). + build(); } private Result scanResultsByExtension(String ns, String actionName, String pathPrefix, diff --git a/plugins/convention/src/main/resources/struts-plugin.xml b/plugins/convention/src/main/resources/struts-plugin.xml index 55dcc2b6f..e710f00ca 100644 --- a/plugins/convention/src/main/resources/struts-plugin.xml +++ b/plugins/convention/src/main/resources/struts-plugin.xml @@ -23,8 +23,8 @@ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index fec6997c2..5b5052cc1 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-dwr-plugin diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index d90d9af04..68bc35aca 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-embeddedjsp-plugin diff --git a/plugins/embeddedjsp/src/main/resources/struts-plugin.xml b/plugins/embeddedjsp/src/main/resources/struts-plugin.xml index 22d6d80d4..fc5b993d1 100644 --- a/plugins/embeddedjsp/src/main/resources/struts-plugin.xml +++ b/plugins/embeddedjsp/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index 14c296471..9d0177b01 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-gxp-plugin diff --git a/plugins/gxp/src/main/resources/struts-plugin.xml b/plugins/gxp/src/main/resources/struts-plugin.xml index 8cd40f7ad..478c92682 100644 --- a/plugins/gxp/src/main/resources/struts-plugin.xml +++ b/plugins/gxp/src/main/resources/struts-plugin.xml @@ -1,8 +1,8 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 69c0e7df2..229df5c81 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-jasperreports-plugin diff --git a/plugins/jasperreports/src/main/resources/struts-plugin.xml b/plugins/jasperreports/src/main/resources/struts-plugin.xml index bf574964c..b5b35b536 100644 --- a/plugins/jasperreports/src/main/resources/struts-plugin.xml +++ b/plugins/jasperreports/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/java8-support/pom.xml b/plugins/java8-support/pom.xml index 4d26ade5a..4ada2c3b1 100644 --- a/plugins/java8-support/pom.xml +++ b/plugins/java8-support/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-java8-support-plugin diff --git a/plugins/java8-support/src/main/resources/struts-plugin.xml b/plugins/java8-support/src/main/resources/struts-plugin.xml index c765cf817..e25cd8308 100644 --- a/plugins/java8-support/src/main/resources/struts-plugin.xml +++ b/plugins/java8-support/src/main/resources/struts-plugin.xml @@ -23,8 +23,8 @@ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index 1d193dc5d..85f4746fe 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-javatemplates-plugin diff --git a/plugins/javatemplates/src/main/resources/struts-plugin.xml b/plugins/javatemplates/src/main/resources/struts-plugin.xml index 5932bf0d9..6ea5110b6 100644 --- a/plugins/javatemplates/src/main/resources/struts-plugin.xml +++ b/plugins/javatemplates/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 9aed2b848..df41a8cd6 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-jfreechart-plugin diff --git a/plugins/jfreechart/src/main/resources/struts-plugin.xml b/plugins/jfreechart/src/main/resources/struts-plugin.xml index a3997c044..e686db0b5 100644 --- a/plugins/jfreechart/src/main/resources/struts-plugin.xml +++ b/plugins/jfreechart/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index bbe7f9dea..b4f2e95aa 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-json-plugin diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java index 673187189..ba775d32c 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java @@ -58,7 +58,7 @@ public class JSONInterceptor extends AbstractInterceptor { private boolean enableGZIP = false; private boolean wrapWithComments; private boolean prefix; - private String defaultEncoding = "ISO-8859-1"; + private String defaultEncoding = "UTF-8"; private boolean ignoreHierarchy = true; private String root; private List excludeProperties; @@ -70,19 +70,18 @@ public class JSONInterceptor extends AbstractInterceptor { private boolean noCache = false; private boolean excludeNullProperties; private String callbackParameter; - private String contentType; + private String accept; @SuppressWarnings("unchecked") public String intercept(ActionInvocation invocation) throws Exception { HttpServletRequest request = ServletActionContext.getRequest(); HttpServletResponse response = ServletActionContext.getResponse(); - String contentType = request.getHeader("content-type"); - if (contentType != null) { - int iSemicolonIdx; - if ((iSemicolonIdx = contentType.indexOf(";")) != -1) - contentType = contentType.substring(0, iSemicolonIdx); + + //parameter wasn't set by the interceptor + if (accept == null) { + accept = request.getHeader("accept"); } - + Object rootObject = null; final ValueStack stack = invocation.getStack(); if (this.root != null) { @@ -93,7 +92,7 @@ public class JSONInterceptor extends AbstractInterceptor { } } - if ((contentType != null) && contentType.equalsIgnoreCase("application/json")) { + if ((accept != null) && accept.equalsIgnoreCase("application/json")) { // load JSON object Object obj = JSONUtil.deserialize(request.getReader()); @@ -133,7 +132,7 @@ public class JSONInterceptor extends AbstractInterceptor { LOG.error("Unable to deserialize JSON object from request"); throw new JSONException("Unable to deserialize JSON object from request"); } - } else if ((contentType != null) && contentType.equalsIgnoreCase("application/json-rpc")) { + } else if ((accept != null) && accept.equalsIgnoreCase("application/json-rpc")) { Object result; if (this.enableSMD) { // load JSON object @@ -181,7 +180,8 @@ public class JSONInterceptor extends AbstractInterceptor { return Action.NONE; } else { - LOG.debug("Content type must be 'application/json' or 'application/json-rpc'. Ignoring request with content type ", contentType); + + LOG.debug("Accept header parameter must be 'application/json' or 'application/json-rpc'. Ignoring request with accept ", accept); } return invocation.invoke(); @@ -535,7 +535,7 @@ public class JSONInterceptor extends AbstractInterceptor { this.prefix = prefix; } - public void setContentType(String contentType) { - this.contentType = contentType; + public void setAccept(String accept) { + this.accept = accept; } } diff --git a/plugins/json/src/main/resources/struts-plugin.xml b/plugins/json/src/main/resources/struts-plugin.xml index 58c06c789..e6aa1de31 100644 --- a/plugins/json/src/main/resources/struts-plugin.xml +++ b/plugins/json/src/main/resources/struts-plugin.xml @@ -1,8 +1,8 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java b/plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java index 7bf53d328..ddae71613 100644 --- a/plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java +++ b/plugins/json/src/test/java/org/apache/struts2/json/JSONInterceptorTest.java @@ -71,7 +71,7 @@ public class JSONInterceptorTest extends StrutsTestCase { private void tryBadJSON(String fileName) throws Exception { // request setRequestContent(fileName); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); interceptor.setEnableSMD(true); @@ -92,7 +92,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testSMDDisabledSMD() throws Exception { // request setRequestContent("smd-3.txt"); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); SMDActionTest1 action = new SMDActionTest1(); @@ -111,7 +111,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testSMDAliasedMethodCall1() throws Exception { // request setRequestContent("smd-14.txt"); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); interceptor.setEnableSMD(true); @@ -129,7 +129,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testSMDAliasedMethodCall2() throws Exception { // request setRequestContent("smd-15.txt"); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); interceptor.setEnableSMD(true); @@ -147,7 +147,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testSMDNoMethod() throws Exception { // request setRequestContent("smd-4.txt"); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); interceptor.setEnableSMD(true); @@ -171,7 +171,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testSMDMethodWithoutAnnotations() throws Exception { // request setRequestContent("smd-9.txt"); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); interceptor.setEnableSMD(true); @@ -192,7 +192,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testSMDPrimitivesNoResult() throws Exception { // request setRequestContent("smd-6.txt"); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); interceptor.setEnableSMD(true); @@ -221,13 +221,13 @@ public class JSONInterceptorTest extends StrutsTestCase { String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("smd-11.txt")); assertEquals(normalizedExpected, normalizedActual); - assertEquals("application/json;charset=ISO-8859-1", response.getContentType()); + assertEquals("application/json;charset=UTF-8", response.getContentType()); } public void testSMDReturnObject() throws Exception { // request setRequestContent("smd-10.txt"); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); interceptor.setEnableSMD(true); @@ -245,14 +245,14 @@ public class JSONInterceptorTest extends StrutsTestCase { String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("smd-12.txt")); assertEquals(normalizedExpected, normalizedActual); - assertEquals("application/json;charset=ISO-8859-1", response.getContentType()); + assertEquals("application/json;charset=UTF-8", response.getContentType()); } @SuppressWarnings("unchecked") public void testSMDObjectsNoResult() throws Exception { // request setRequestContent("smd-7.txt"); - this.request.addHeader("content-type", "application/json-rpc"); + this.request.addHeader("accept", "application/json-rpc"); JSONInterceptor interceptor = new JSONInterceptor(); interceptor.setEnableSMD(true); @@ -293,14 +293,14 @@ public class JSONInterceptorTest extends StrutsTestCase { String normalizedExpected = TestUtils.normalize(JSONResultTest.class.getResource("smd-11.txt")); assertEquals(normalizedExpected, normalizedActual); - assertEquals("application/json;charset=ISO-8859-1", response.getContentType()); + assertEquals("application/json;charset=UTF-8", response.getContentType()); } @SuppressWarnings( { "unchecked", "unchecked" }) public void testReadEmpty() throws Exception { // request setRequestContent("json-6.txt"); - this.request.addHeader("content-type", "application/json"); + this.request.addHeader("accept", "application/json"); // interceptor JSONInterceptor interceptor = new JSONInterceptor(); @@ -315,7 +315,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void test() throws Exception { // request setRequestContent("json-1.txt"); - this.request.addHeader("content-type", "application/json"); + this.request.addHeader("accept", "application/json"); // interceptor JSONInterceptor interceptor = new JSONInterceptor(); @@ -437,7 +437,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testRoot() throws Exception { setRequestContent("json-5.txt"); - this.request.addHeader("content-type", "application/json"); + this.request.addHeader("accept", "application/json"); // interceptor JSONInterceptor interceptor = new JSONInterceptor(); @@ -462,7 +462,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testJSONArray() throws Exception { setRequestContent("json-12.txt"); - this.request.addHeader("content-type", "application/json"); + this.request.addHeader("accept", "application/json"); // interceptor JSONInterceptor interceptor = new JSONInterceptor(); @@ -488,7 +488,7 @@ public class JSONInterceptorTest extends StrutsTestCase { public void testJSONArray2() throws Exception { setRequestContent("json-12.txt"); - this.request.addHeader("content-type", "application/json"); + this.request.addHeader("accept", "application/json"); // interceptor JSONInterceptor interceptor = new JSONInterceptor(); @@ -536,6 +536,9 @@ public class JSONInterceptorTest extends StrutsTestCase { } class MockActionInvocationEx extends MockActionInvocation { + + private static final long serialVersionUID = 3057703805130170757L; + private boolean invoked; @Override diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index 94ec0b310..8f2fd4f84 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-junit-plugin diff --git a/plugins/junit/src/test/resources/struts-convention-configuration.xml b/plugins/junit/src/test/resources/struts-convention-configuration.xml index 77525f084..9d9dd218e 100644 --- a/plugins/junit/src/test/resources/struts-convention-configuration.xml +++ b/plugins/junit/src/test/resources/struts-convention-configuration.xml @@ -23,8 +23,8 @@ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 484ee03c7..47b42ec84 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-osgi-plugin diff --git a/plugins/osgi/src/main/resources/struts-plugin.xml b/plugins/osgi/src/main/resources/struts-plugin.xml index 6c1f3c592..302c7b45b 100644 --- a/plugins/osgi/src/main/resources/struts-plugin.xml +++ b/plugins/osgi/src/main/resources/struts-plugin.xml @@ -1,8 +1,8 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index bdfb5cf5e..decad9ccd 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-oval-plugin diff --git a/plugins/oval/src/main/resources/struts-plugin.xml b/plugins/oval/src/main/resources/struts-plugin.xml index 259440ee2..75957636e 100644 --- a/plugins/oval/src/main/resources/struts-plugin.xml +++ b/plugins/oval/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index a811d1d17..c20359b16 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-pell-multipart-plugin diff --git a/plugins/pell-multipart/src/main/resources/struts-plugin.xml b/plugins/pell-multipart/src/main/resources/struts-plugin.xml index 1ca6a776f..424fbd2a1 100644 --- a/plugins/pell-multipart/src/main/resources/struts-plugin.xml +++ b/plugins/pell-multipart/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 066a87e24..251f9eb78 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-plexus-plugin diff --git a/plugins/plexus/src/main/resources/struts-plugin.xml b/plugins/plexus/src/main/resources/struts-plugin.xml index dc32d0e63..b345d28a0 100644 --- a/plugins/plexus/src/main/resources/struts-plugin.xml +++ b/plugins/plexus/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/pom.xml b/plugins/pom.xml index c074d3642..7eeddc0f3 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-plugins diff --git a/plugins/portlet-tiles/pom.xml b/plugins/portlet-tiles/pom.xml index 833569ba6..f1918544d 100644 --- a/plugins/portlet-tiles/pom.xml +++ b/plugins/portlet-tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-portlet-tiles-plugin diff --git a/plugins/portlet-tiles/src/main/resources/struts-plugin.xml b/plugins/portlet-tiles/src/main/resources/struts-plugin.xml index 425a21b51..f044e6b62 100644 --- a/plugins/portlet-tiles/src/main/resources/struts-plugin.xml +++ b/plugins/portlet-tiles/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index ddca94ce0..c134cb66c 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-portlet-plugin diff --git a/plugins/portlet/src/main/resources/struts-plugin.xml b/plugins/portlet/src/main/resources/struts-plugin.xml index 478374bfc..2d95d904b 100644 --- a/plugins/portlet/src/main/resources/struts-plugin.xml +++ b/plugins/portlet/src/main/resources/struts-plugin.xml @@ -23,8 +23,8 @@ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/portlet/src/test/resources/struts.xml b/plugins/portlet/src/test/resources/struts.xml index 4b93f295c..15d7a4a41 100644 --- a/plugins/portlet/src/test/resources/struts.xml +++ b/plugins/portlet/src/test/resources/struts.xml @@ -1,7 +1,7 @@ + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index f4fb1237f..2ab0f056b 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-rest-plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index 3eb549cd3..e536a83af 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-sitegraph-plugin diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 239d403da..e881c92d1 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-sitemesh-plugin diff --git a/plugins/sitemesh/src/main/resources/struts-plugin.xml b/plugins/sitemesh/src/main/resources/struts-plugin.xml index c12230ecf..7966f2719 100644 --- a/plugins/sitemesh/src/main/resources/struts-plugin.xml +++ b/plugins/sitemesh/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 7ed9d45ba..b29a60e6e 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-spring-plugin diff --git a/plugins/spring/src/main/resources/struts-plugin.xml b/plugins/spring/src/main/resources/struts-plugin.xml index 2e9b1b16c..eb507726c 100644 --- a/plugins/spring/src/main/resources/struts-plugin.xml +++ b/plugins/spring/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index 741d38de9..2e42fa2d3 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-testng-plugin diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index e6bc1b7f8..08351154f 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT struts2-tiles-plugin diff --git a/plugins/tiles/src/main/resources/struts-plugin.xml b/plugins/tiles/src/main/resources/struts-plugin.xml index 0018a5f37..234e82163 100644 --- a/plugins/tiles/src/main/resources/struts-plugin.xml +++ b/plugins/tiles/src/main/resources/struts-plugin.xml @@ -22,8 +22,8 @@ */ --> + "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" + "http://struts.apache.org/dtds/struts-2.5.dtd"> diff --git a/pom.xml b/pom.xml index 31b322c24..5127eb9a7 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 struts2-parent - 2.5.1-SNAPSHOT + 2.5.2-SNAPSHOT pom Struts 2 http://struts.apache.org/ @@ -85,7 +85,7 @@ ${project.version} 4.1.6.RELEASE - 3.1.4 + 3.1.8 3.3 5.0.2 3.0.5 @@ -711,7 +711,7 @@ commons-fileupload commons-fileupload - 1.3.1 + 1.3.2 commons-io
    diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt index 57bfbf69f..fc1633532 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/validationstyles-1.txt @@ -3,5 +3,5 @@