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:21 UTC
[09/20] struts git commit: Merge branch 'master' of
github.com:victorsosa/struts
Merge branch 'master' of github.com:victorsosa/struts
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f9e4a5e6
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f9e4a5e6
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f9e4a5e6
Branch: refs/heads/master
Commit: f9e4a5e676c2fde1603aa0809cb44c71d2e7a122
Parents: 6b36010 b4facc8
Author: victorsosa <vi...@peopleware.do>
Authored: Tue May 17 08:50:50 2016 -0400
Committer: victorsosa <vi...@peopleware.do>
Committed: Tue May 17 08:50:50 2016 -0400
----------------------------------------------------------------------
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/view/index.jsp | 4 +-
.../struts2/portlet/test/BasePortletTest.java | 20 +++++--
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 | 23 ++++++--
.../xwork2/config/entities/AllowedMethods.java | 41 +++++++++-----
.../xwork2/config/impl/ActionConfigMatcher.java | 1 +
.../config/impl/DefaultConfiguration.java | 10 ++++
.../providers/XmlConfigurationProvider.java | 7 ++-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 6 +--
.../validator/validators/EmailValidator.java | 4 +-
.../org/apache/struts2/StrutsConstants.java | 1 +
.../dispatcher/mapper/DefaultActionMapper.java | 14 ++---
.../MessageStorePreResultListener.java | 3 +-
.../apache/struts2/views/xslt/XSLTResult.java | 7 +--
core/src/main/resources/struts-default.xml | 2 +
.../main/resources/template/simple/submit.ftl | 6 +--
.../template/xhtml/controlheader-core.ftl | 4 +-
.../config/entities/AllowedMethodsTest.java | 46 +++++++++++++---
.../config/impl/ActionConfigMatcherTest.java | 3 ++
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 ++++++
.../DefaultExcludedPatternsCheckerTest.java | 1 -
.../xwork2/validator/EmailValidatorTest.java | 2 +
.../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 +-
.../apache/struts2/rest/RestActionMapper.java | 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 +-
.../tiles/StrutsApplicationResource.java | 4 ++
.../tiles/StrutsTilesContainerFactory.java | 23 ++++----
...StrutsWildcardServletApplicationContext.java | 8 ++-
pom.xml | 6 +--
82 files changed, 398 insertions(+), 130 deletions(-)
----------------------------------------------------------------------