[struts-site] branch master updated: Adds ToC
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/master by this push: new 954f148 Adds ToC 954f148 is described below commit 954f148ee0d9074af8a9d0a3d57bad27aa0ebd29 Author: Lukasz Lenart AuthorDate: Wed Dec 2 09:30:18 2020 +0100 Adds ToC --- source/core-developers/web-xml.md | 4 1 file changed, 4 insertions(+) diff --git a/source/core-developers/web-xml.md b/source/core-developers/web-xml.md index 6faab8a..bb2d69c 100644 --- a/source/core-developers/web-xml.md +++ b/source/core-developers/web-xml.md @@ -4,6 +4,10 @@ title: web.xml --- # web.xml +{:.no_toc} + +* Will be replaced with the ToC, excluding a header +{:toc} The `web.xml` web application descriptor file represents the core of the Java web application, so it is appropriate that it is also part of the core of the Struts framework. In the `web.xml` file, Struts defines its FilterDispatcher,
[struts-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-site by this push: new f364e78 Automatic Site Publish by Buildbot f364e78 is described below commit f364e78fa30489db12745d2b18ea6a58b9c48ea6 Author: buildbot AuthorDate: Wed Dec 2 08:31:16 2020 + Automatic Site Publish by Buildbot --- output/core-developers/interceptors.html | 7 +-- output/core-developers/struts-default-xml.html | 7 +-- output/core-developers/web-xml.html| 12 +++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/output/core-developers/interceptors.html b/output/core-developers/interceptors.html index e7a346f..a04c195 100644 --- a/output/core-developers/interceptors.html +++ b/output/core-developers/interceptors.html @@ -312,7 +312,10 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t com.opensymphony.xwork2.inject., com.opensymphony.xwork2.ognl., com.opensymphony.xwork2.security., -com.opensymphony.xwork2.util." /> +com.opensymphony.xwork2.util., +org.apache.tomcat., +org.apache.catalina.core., +org.wildfly.extension.undertow.deployment." />- + diff --git a/output/core-developers/struts-default-xml.html b/output/core-developers/struts-default-xml.html index 84c7d00..ffee4ac 100644 --- a/output/core-developers/struts-default-xml.html +++ b/output/core-developers/struts-default-xml.html @@ -229,7 +229,10 @@ setting in struts.properties. com.opensymphony.xwork2.inject., com.opensymphony.xwork2.ognl., com.opensymphony.xwork2.security., -com.opensymphony.xwork2.util." /> +com.opensymphony.xwork2.util., +org.apache.tomcat., +org.apache.catalina.core., +org.wildfly.extension.undertow.deployment." /> - + diff --git a/output/core-developers/web-xml.html b/output/core-developers/web-xml.html index 65493b9..98b6d9e 100644 --- a/output/core-developers/web-xml.html +++ b/output/core-developers/web-xml.html @@ -129,7 +129,17 @@ << back to Core Developers Guide https://github.com/apache/struts-site/edit/master/source/core-developers/web-xml.md"; title="Edit this page on GitHub">Edit on GitHub -web.xml +web.xml + + + Simple Example + Changed filter package in Struts >= 2.5 + Changed Filter Structure in Struts >= 2.1.3 + Exclude specific URLs + Taglib Example + Custom FileManager and FileManagerFactory implementations + Custom configuration provider + The web.xml web application descriptor file represents the core of the Java web application, so it is appropriate that it is also part of the core of the Struts framework. In the web.xml file, Struts defines its FilterDispatcher,
Buildbot success in on jekyll_websites
The Buildbot has detected a passing build on builder jekyll_websites while building struts. Full details are available at: https://ci2.apache.org/#builders/7/builds/291 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by lukaszlenart Blamelist: asfinfra, commits@struts.apache.org Build succeeded! Sincerely, -The Buildbot
[struts] branch master updated (a72d1a8 -> deb4f9f)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git. from a72d1a8 WW-4929 Uses Accept-Language first even with cookies, then fallbacks to Request add b4bc5dc WW-5078 Removes support for DTDs add 8a0cdb4 WW-5078 Uses more informative name for XWorkConfigurationProvider add b2fb778 WW-5078 Drops unneeded DTDs new deb4f9f Merge pull request #452 from apache/WW-5078-removes-xwork-dtds The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../xwork2/config/ConfigurationManager.java| 12 +- .../xwork2/config/impl/MockConfiguration.java | 4 +- ...ava => StrutsDefaultConfigurationProvider.java} | 2 +- .../config/providers/XmlConfigurationProvider.java | 45 ++ .../xwork2/util/XWorkTestCaseHelper.java | 6 +- .../config/StrutsXmlConfigurationProvider.java | 12 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 2 +- core/src/main/resources/struts-default.xml | 8 +- core/src/main/resources/xwork-1.0.dtd | 106 -- core/src/main/resources/xwork-1.1.1.dtd| 123 core/src/main/resources/xwork-1.1.2.dtd| 131 - core/src/main/resources/xwork-1.1.dtd | 115 --- core/src/main/resources/xwork-2.0.dtd | 137 -- core/src/main/resources/xwork-2.1.3.dtd| 146 --- core/src/main/resources/xwork-2.1.dtd | 143 -- core/src/main/resources/xwork-2.3.dtd | 149 --- core/src/main/resources/xwork-2.5.dtd | 151 --- core/src/main/resources/xwork-2.6.dtd | 157 core/src/main/resources/xwork-default.xml | 11 +- .../opensymphony/xwork2/ActionInvocationTest.java | 50 --- .../com/opensymphony/xwork2/ChainResultTest.java | 15 +- .../xwork2/DefaultActionInvocationTest.java| 22 +-- .../xwork2/DefaultActionProxyTest.java | 4 +- .../com/opensymphony/xwork2/DefaultClasstTest.java | 13 +- .../com/opensymphony/xwork2/LocaleAwareTest.java | 5 +- .../opensymphony/xwork2/ProxyInvocationTest.java | 13 +- .../opensymphony/xwork2/WildCardResultTest.java| 3 +- .../xwork2/config/ConfigurationManagerTest.java| 4 +- .../xwork2/config/ConfigurationTest.java | 66 + .../config/providers/ConfigurationTestBase.java| 7 +- ...urationProviderGlobalResultInheritenceTest.java | 2 +- ...tionProviderInterceptorParamOverridingTest.java | 6 +- ...roviderInterceptorStackParamOverridingTest.java | 112 +++--- .../XmlConfigurationProviderInterceptorsTest.java | 33 +++-- .../providers/XmlConfigurationProviderTest.java| 161 +++-- .../xwork2/interceptor/AliasInterceptorTest.java | 25 ++-- .../ChainingInterceptorWithConfigTest.java | 44 +++--- .../interceptor/ParametersInterceptorTest.java | 71 + .../AnnotationWorkflowInterceptorTest.java | 37 +++-- .../xwork2/ognl/SecurityMemberAccessProxyTest.java | 15 +- .../xwork2/spring/ActionsFromSpringTest.java | 38 +++-- .../xwork2/spring/SpringProxyUtilTest.java | 27 ++-- .../ActionAutowiringInterceptorTest.java | 11 +- .../xwork2/util/ClassLoaderUtilTest.java | 12 +- .../opensymphony/xwork2/util/MyBeanActionTest.java | 4 +- .../util/StrutsLocalizedTextProviderTest.java | 125 .../validator/DoubleRangeFieldValidatorTest.java | 4 +- .../xwork2/validator/IntRangeValidatorTest.java| 5 +- .../xwork2/validator/LongRangeValidatorTest.java | 5 +- .../validator/ModelDrivenValidationTest.java | 11 +- .../xwork2/validator/ShortRangeValidatorTest.java | 5 +- .../validator/SimpleActionValidationTest.java | 17 ++- .../xwork2/validator/ValidatorAnnotationTest.java | 7 +- .../factory/PrefixBasedActionProxyFactoryTest.java | 68 - .../interceptor/FetchMetadataInterceptorTest.java | 4 +- .../providers/loadorder1/xwork-test-load-order.xml | 11 +- .../providers/loadorder2/xwork-test-load-order.xml | 11 +- .../providers/loadorder3/xwork-test-load-order.xml | 11 +- .../xwork2/config/providers/xwork- test.xml| 22 ++- .../providers/xwork-include-after-package-2.xml| 12 +- .../providers/xwork-include-after-package.xml | 12 +- .../providers/xwork-include-before-package-2.xml | 12 +- .../providers/xwork-include-before-package.xml | 12 +- .../config/providers/xwork-include-parent.xml | 12 +- .../config/providers/xwork-test-action-invalid.xm
[struts] 01/01: Merge pull request #452 from apache/WW-5078-removes-xwork-dtds
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit deb4f9faefe94dde4404b2f3501dd710b3a69f39 Merge: a72d1a8 b2fb778 Author: Lukasz Lenart AuthorDate: Wed Dec 2 20:11:01 2020 +0100 Merge pull request #452 from apache/WW-5078-removes-xwork-dtds [WW-5078] Removes support for DTDs .../xwork2/config/ConfigurationManager.java| 12 +- .../xwork2/config/impl/MockConfiguration.java | 4 +- ...ava => StrutsDefaultConfigurationProvider.java} | 2 +- .../config/providers/XmlConfigurationProvider.java | 45 ++ .../xwork2/util/XWorkTestCaseHelper.java | 6 +- .../config/StrutsXmlConfigurationProvider.java | 12 +- .../org/apache/struts2/dispatcher/Dispatcher.java | 2 +- core/src/main/resources/struts-default.xml | 8 +- core/src/main/resources/xwork-1.0.dtd | 106 -- core/src/main/resources/xwork-1.1.1.dtd| 123 core/src/main/resources/xwork-1.1.2.dtd| 131 - core/src/main/resources/xwork-1.1.dtd | 115 --- core/src/main/resources/xwork-2.0.dtd | 137 -- core/src/main/resources/xwork-2.1.3.dtd| 146 --- core/src/main/resources/xwork-2.1.dtd | 143 -- core/src/main/resources/xwork-2.3.dtd | 149 --- core/src/main/resources/xwork-2.5.dtd | 151 --- core/src/main/resources/xwork-2.6.dtd | 157 core/src/main/resources/xwork-default.xml | 11 +- .../opensymphony/xwork2/ActionInvocationTest.java | 50 --- .../com/opensymphony/xwork2/ChainResultTest.java | 15 +- .../xwork2/DefaultActionInvocationTest.java| 22 +-- .../xwork2/DefaultActionProxyTest.java | 4 +- .../com/opensymphony/xwork2/DefaultClasstTest.java | 13 +- .../com/opensymphony/xwork2/LocaleAwareTest.java | 5 +- .../opensymphony/xwork2/ProxyInvocationTest.java | 13 +- .../opensymphony/xwork2/WildCardResultTest.java| 3 +- .../xwork2/config/ConfigurationManagerTest.java| 4 +- .../xwork2/config/ConfigurationTest.java | 66 + .../config/providers/ConfigurationTestBase.java| 7 +- ...urationProviderGlobalResultInheritenceTest.java | 2 +- ...tionProviderInterceptorParamOverridingTest.java | 6 +- ...roviderInterceptorStackParamOverridingTest.java | 112 +++--- .../XmlConfigurationProviderInterceptorsTest.java | 33 +++-- .../providers/XmlConfigurationProviderTest.java| 161 +++-- .../xwork2/interceptor/AliasInterceptorTest.java | 25 ++-- .../ChainingInterceptorWithConfigTest.java | 44 +++--- .../interceptor/ParametersInterceptorTest.java | 71 + .../AnnotationWorkflowInterceptorTest.java | 37 +++-- .../xwork2/ognl/SecurityMemberAccessProxyTest.java | 15 +- .../xwork2/spring/ActionsFromSpringTest.java | 38 +++-- .../xwork2/spring/SpringProxyUtilTest.java | 27 ++-- .../ActionAutowiringInterceptorTest.java | 11 +- .../xwork2/util/ClassLoaderUtilTest.java | 12 +- .../opensymphony/xwork2/util/MyBeanActionTest.java | 4 +- .../util/StrutsLocalizedTextProviderTest.java | 125 .../validator/DoubleRangeFieldValidatorTest.java | 4 +- .../xwork2/validator/IntRangeValidatorTest.java| 5 +- .../xwork2/validator/LongRangeValidatorTest.java | 5 +- .../validator/ModelDrivenValidationTest.java | 11 +- .../xwork2/validator/ShortRangeValidatorTest.java | 5 +- .../validator/SimpleActionValidationTest.java | 17 ++- .../xwork2/validator/ValidatorAnnotationTest.java | 7 +- .../factory/PrefixBasedActionProxyFactoryTest.java | 68 - .../interceptor/FetchMetadataInterceptorTest.java | 4 +- .../providers/loadorder1/xwork-test-load-order.xml | 11 +- .../providers/loadorder2/xwork-test-load-order.xml | 11 +- .../providers/loadorder3/xwork-test-load-order.xml | 11 +- .../xwork2/config/providers/xwork- test.xml| 22 ++- .../providers/xwork-include-after-package-2.xml| 12 +- .../providers/xwork-include-after-package.xml | 12 +- .../providers/xwork-include-before-package-2.xml | 12 +- .../providers/xwork-include-before-package.xml | 12 +- .../config/providers/xwork-include-parent.xml | 12 +- .../config/providers/xwork-test-action-invalid.xml | 12 +- .../xwork-test-actions-packagedefaultclassref.xml | 12 +- .../xwork2/config/providers/xwork-test-actions.xml | 22 ++- .../providers/xwork-test-allowed-methods.xml | 12 +- .../providers/xwork-test-bad-inheritance.xml | 12 +- .../config/providers/xwork-test-basic-packages.xml | 20 ++- .../providers/xwork-test-default-package.xml
[struts-site] branch master updated (954f148 -> 3d3d2f8)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git. from 954f148 Adds ToC add 4514ff8 WW-4929 Updates description about I18Interceptor with support for Accept-Language Updates Security Guide with notice about forced expression evaluation add 5020bcc WW-4929 Adds a note about session and cookie storage option new 3d3d2f8 Merge pull request #152 from apache/i18-sec The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: source/core-developers/i18n-interceptor.md | 7 +- source/security/index.md | 100 ++--- 2 files changed, 68 insertions(+), 39 deletions(-)
[struts-site] 01/01: Merge pull request #152 from apache/i18-sec
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-site.git commit 3d3d2f811babed2a64796f345256a45105f01e0a Merge: 954f148 5020bcc Author: Lukasz Lenart AuthorDate: Wed Dec 2 20:13:05 2020 +0100 Merge pull request #152 from apache/i18-sec [WW-4929] Updates description about I18Interceptor with support for Accept-Language source/core-developers/i18n-interceptor.md | 7 +- source/security/index.md | 100 ++--- 2 files changed, 68 insertions(+), 39 deletions(-)
[struts-site] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-site by this push: new 7a002da Automatic Site Publish by Buildbot 7a002da is described below commit 7a002daed8028c4b1f94b1eee7eff8dcc09241a6 Author: buildbot AuthorDate: Wed Dec 2 19:14:04 2020 + Automatic Site Publish by Buildbot --- output/core-developers/i18n-interceptor.html | 7 +- output/core-developers/interceptors.html | 8 +-- output/core-developers/struts-default-xml.html | 8 +-- output/security/index.html | 98 +- 4 files changed, 79 insertions(+), 42 deletions(-) diff --git a/output/core-developers/i18n-interceptor.html b/output/core-developers/i18n-interceptor.html index d3589b4..53a1c7f 100644 --- a/output/core-developers/i18n-interceptor.html +++ b/output/core-developers/i18n-interceptor.html @@ -158,7 +158,12 @@ to and save in a cookie. By default this is requ requestOnlyParameterName (optional) - the name of the HTTP request parameter that dictates the locale to switch to for the current request only, without saving it in the session. By default this is request_only_locale attributeName (optional) - the name of the session key to store the selected locale. By default this is WW_TRANS_I18N_LOCALE - localeStorage (optional) - the name of storage location, it can be none, sessionĀ or cookie. By default this is session + localeStorage (optional) - the name of storage location, it can be accept_language, request, session or cookie, +by default this is session. + supportedLocale (optional) - a set of comma separated locale supported by the application, once storage is set +to accept_language, interceptor will try to match supportedLocale with locale provided in Accept-Language header. +Also in case of using session or cookie, interceptor will try to first match with Accept-Language header +once supportedLocale has been defined. Since Struts 2.6. Examples diff --git a/output/core-developers/interceptors.html b/output/core-developers/interceptors.html index a04c195..ce5508b 100644 --- a/output/core-developers/interceptors.html +++ b/output/core-developers/interceptors.html @@ -258,8 +258,8 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t and {@link com.opensymphony.xwork2.inject.Inject} --> ; +"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN" +"http://struts.apache.org/dtds/struts-2.6.dtd">;@@ -628,10 +628,10 @@ than reiterate the same list of Interceptors, we can bundle these Interceptors t false false - + - + same-origin diff --git a/output/core-developers/struts-default-xml.html b/output/core-developers/struts-default-xml.html index ffee4ac..8d939a1 100644 --- a/output/core-developers/struts-default-xml.html +++ b/output/core-developers/struts-default-xml.html @@ -175,8 +175,8 @@ setting in struts.properties. and {@link com.opensymphony.xwork2.inject.Inject} --> ; +"-//Apache Software Foundation//DTD Struts Configuration 2.6//EN" +"http://struts.apache.org/dtds/struts-2.6.dtd">; @@ -545,10 +545,10 @@ setting in struts.properties. false false - + - + same-origin diff --git a/output/security/index.html b/output/security/index.html index 0fae2a6..6b48f83 100644
Buildbot success in on jekyll_websites
The Buildbot has detected a passing build on builder jekyll_websites while building struts. Full details are available at: https://ci2.apache.org/#builders/7/builds/292 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by lukaszlenart Blamelist: asfinfra, commits@struts.apache.org Build succeeded! Sincerely, -The Buildbot
[struts] branch master updated: Fixes translating id in Form tag
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/master by this push: new 87d42d6 Fixes translating id in Form tag 87d42d6 is described below commit 87d42d60c98b6651141ca6aa20ddc42919fe1ecc Author: Lukasz Lenart AuthorDate: Wed Nov 25 17:12:57 2020 +0100 Fixes translating id in Form tag --- .../main/java/org/apache/struts2/components/Form.java | 2 +- .../org/apache/struts2/views/jsp/ui/FormTagTest.java | 19 +++ .../org/apache/struts2/views/jsp/ui/Formtag-29.txt| 3 +++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/struts2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java index 9758cf3..44bdd09 100644 --- a/core/src/main/java/org/apache/struts2/components/Form.java +++ b/core/src/main/java/org/apache/struts2/components/Form.java @@ -221,7 +221,7 @@ public class Form extends ClosingUIBean { @Override protected void populateComponentHtmlId(Form form) { if (id != null) { -addParameter("id", escape(id)); +super.populateComponentHtmlId(null); } // if no id given, it will be tried to generate it from the action attribute diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java index 1ccbb89..79abd4c 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FormTagTest.java @@ -189,6 +189,25 @@ public class FormTagTest extends AbstractUITagTest { verify(FormTag.class.getResource("Formtag-1.txt")); } +public void testFormId() throws Exception { + +request.setupGetServletPath("/testAction"); + +TestAction testAction = (TestAction) action; +testAction.setFoo("bar"); + +FormTag tag = new FormTag(); +tag.setPageContext(pageContext); +tag.setMethod("post"); +tag.setAction("myAction"); +tag.setId("myid-%{foo}"); + +tag.doStartTag(); +tag.doEndTag(); + +verify(FormTag.class.getResource("Formtag-29.txt")); +} + public void testFormNoNameOrId() throws Exception { request.setupGetServletPath("/testAction"); diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-29.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-29.txt new file mode 100644 index 000..1337f57 --- /dev/null +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-29.txt @@ -0,0 +1,3 @@ + + +