[struts-site] branch asf-site updated: Updates production by Jenkins
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 c06c039 Updates production by Jenkins c06c039 is described below commit c06c039f85fa8c28ab7fc4ea3f06865d78a54329 Author: jenkins AuthorDate: Thu Dec 6 08:00:52 2018 + Updates production by Jenkins --- content/core-developers/action-mapper.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/core-developers/action-mapper.html b/content/core-developers/action-mapper.html index 4c65a54..436d396 100644 --- a/content/core-developers/action-mapper.html +++ b/content/core-developers/action-mapper.html @@ -279,7 +279,7 @@ and “restful” which is org.apache.struts2.di A prefix based action mapper that is capable of delegating to other ActionMappers based on the request’s prefix. It is configured through struts.xml. For example, with the following entries in struts.xml: -+ [struts] branch master updated: Fixes ActionMapper javadocs and references 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 749c131 Fixes ActionMapper javadocs and references 749c131 is described below commit 749c131de917c2ad9833ac521441359919d9385a Author: Lukasz Lenart AuthorDate: Thu Dec 6 09:04:00 2018 +0100 Fixes ActionMapper javadocs and references --- core/src/main/java/org/apache/struts2/StrutsConstants.java | 2 +- .../org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java | 2 +- core/src/main/resources/org/apache/struts2/default.properties | 3 ++- core/src/main/resources/struts-default.xml | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java b/core/src/main/java/org/apache/struts2/StrutsConstants.java index f786305..68bf36d 100644 --- a/core/src/main/java/org/apache/struts2/StrutsConstants.java +++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java @@ -171,7 +171,7 @@ public final class StrutsConstants { /** Location of additional localization properties files to load */ public static final String STRUTS_CUSTOM_I18N_RESOURCES = "struts.custom.i18n.resources"; -/** The org.apache.struts2.dispatcher.mapper.ActionMapper implementation class */ +/** A name of a bean implementing org.apache.struts2.dispatcher.mapper.ActionMapper interface */ public static final String STRUTS_MAPPER_CLASS = "struts.mapper.class"; /** diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java index 1702b58..13aade8 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/PrefixBasedActionMapper.java @@ -41,7 +41,7 @@ import java.util.Map; * * * - *+ * * * * diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties index 9cd2c6b..a465567 100644 --- a/core/src/main/resources/org/apache/struts2/default.properties +++ b/core/src/main/resources/org/apache/struts2/default.properties @@ -73,7 +73,8 @@ struts.multipart.maxSize=2097152 # struts.custom.properties=application,org/apache/struts2/extension/custom ### How request URLs are mapped to and from actions -#struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper +### Vy default 'struts' name is used which maps to DefaultActionMapper +#struts.mapper.class=restful ### Used by the DefaultActionMapper ### You may provide a comma separated list, e.g. struts.action.extension=action,jnlp,do diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 15cc5f9..8c49fc7 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -89,6 +89,7 @@ + @@ -171,8 +172,6 @@ - -
[struts] 01/01: Merge pull request #286 from aleksandr-m/feature/WW-4987_optgroup
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 81ac9b2d47b94138d52616a9ae6042e313a7a868 Merge: 749c131 48d40ae Author: Lukasz Lenart AuthorDate: Thu Dec 6 10:08:03 2018 +0100 Merge pull request #286 from aleksandr-m/feature/WW-4987_optgroup WW-4987 Add list attributes to optgroup tag .../org/apache/struts2/components/OptGroup.java| 15 .../apache/struts2/views/jsp/ui/OptGroupTag.java | 18 ++ .../main/resources/template/simple/optgroup.ftl| 21 core/src/site/resources/tags/optgroup.html | 24 + .../apache/struts2/views/jsp/ui/OptGroupTest.java | 36 +++ .../org/apache/struts2/views/jsp/ui/OptGroup-8.txt | 40 ++ 6 files changed, 154 insertions(+)
[struts] branch master updated (749c131 -> 81ac9b2)
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 749c131 Fixes ActionMapper javadocs and references add c0eafac WW-4987 Add listCssClass to optgroup tag add 94210a0 WW-4987 Add test for listCssClass in optgroup tag add 3c24bae Add listCssStyle to optgroup tag add 123a090 Add listTitle to optgroup tag add 60dfc4d Improve optgroup template add 48d40ae Improve optgroup list attributes test new 81ac9b2 Merge pull request #286 from aleksandr-m/feature/WW-4987_optgroup 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: .../org/apache/struts2/components/OptGroup.java| 15 .../apache/struts2/views/jsp/ui/OptGroupTag.java | 18 ++ .../main/resources/template/simple/optgroup.ftl| 21 core/src/site/resources/tags/optgroup.html | 24 + .../apache/struts2/views/jsp/ui/OptGroupTest.java | 36 +++ .../org/apache/struts2/views/jsp/ui/OptGroup-8.txt | 40 ++ 6 files changed, 154 insertions(+) create mode 100644 core/src/test/resources/org/apache/struts2/views/jsp/ui/OptGroup-8.txt
