You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/06/12 13:49:20 UTC
[08/20] struts git commit: Merge pull request #15 from apache/master
Merge pull request #15 from apache/master
update pull
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b4facc8e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b4facc8e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b4facc8e
Branch: refs/heads/master
Commit: b4facc8e0674851be581dc74cc262f275734a180
Parents: ca74ac3 104bd92
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Tue May 17 08:39:51 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Tue May 17 08:39:51 2016 -0400
----------------------------------------------------------------------
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 2 +-
archetypes/struts2-archetype-blank/pom.xml | 2 +-
archetypes/struts2-archetype-convention/pom.xml | 2 +-
archetypes/struts2-archetype-dbportlet/pom.xml | 2 +-
archetypes/struts2-archetype-plugin/pom.xml | 2 +-
archetypes/struts2-archetype-portlet/pom.xml | 2 +-
archetypes/struts2-archetype-starter/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bom/pom.xml | 4 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../xwork2/config/entities/ActionConfig.java | 11 ++--
.../xwork2/config/entities/AllowedMethods.java | 4 +-
.../config/impl/DefaultConfiguration.java | 10 ++++
.../providers/XmlConfigurationProvider.java | 6 ++-
.../validator/validators/EmailValidator.java | 4 +-
.../org/apache/struts2/StrutsConstants.java | 1 +
.../dispatcher/mapper/DefaultActionMapper.java | 10 +---
.../MessageStorePreResultListener.java | 3 +-
.../main/resources/template/simple/submit.ftl | 6 +--
.../template/xhtml/controlheader-core.ftl | 4 +-
.../config/impl/ActionConfigMatcherTest.java | 3 ++
.../xwork2/validator/EmailValidatorTest.java | 1 +
.../mapper/DefaultActionMapperTest.java | 30 +++++++++--
.../apache/struts2/views/jsp/ui/SubmitTest.java | 2 +-
.../struts2/views/jsp/ui/TextfieldTest.java | 56 ++++++++++++++++++++
.../apache/struts2/views/jsp/ui/Submit-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/Submit-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/Submit-5.txt | 2 +-
.../apache/struts2/views/jsp/ui/Submit-6.txt | 2 +-
.../struts2/views/jsp/ui/Textfield-12.txt | 11 ++++
.../struts2/views/jsp/ui/Textfield-13.txt | 11 ++++
plugins/bean-validation/pom.xml | 2 +-
plugins/cdi/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
.../PackageBasedActionConfigBuilder.java | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/java8-support/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
plugins/jfreechart/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
.../org/apache/struts2/json/JSONWriterTest.java | 37 +++++++++++++
.../struts2/json/jsonwriter-write-bean-04.txt | 16 ++++++
plugins/junit/pom.xml | 2 +-
plugins/osgi/pom.xml | 2 +-
plugins/oval/pom.xml | 2 +-
plugins/pell-multipart/pom.xml | 2 +-
plugins/plexus/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
plugins/portlet/pom.xml | 2 +-
plugins/rest/pom.xml | 2 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
pom.xml | 4 +-
69 files changed, 251 insertions(+), 81 deletions(-)
----------------------------------------------------------------------