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/25 10:31:30 UTC
[3/4] struts git commit: Merge branch 'apache-master'
Merge branch 'apache-master'
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b4622865
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b4622865
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b4622865
Branch: refs/heads/master
Commit: b4622865893731277ac0034d54d26216f09b7054
Parents: 7985fd1 4f07433
Author: victorsosa <vi...@peopleware.do>
Authored: Fri Jun 24 08:26:27 2016 -0400
Committer: victorsosa <vi...@peopleware.do>
Committed: Fri Jun 24 08:26:27 2016 -0400
----------------------------------------------------------------------
apps/pom.xml | 2 +-
apps/portlet/pom.xml | 2 +-
apps/portlet/src/main/resources/struts-edit.xml | 4 +-
.../src/main/resources/struts-eventing.xml | 4 +-
apps/portlet/src/main/resources/struts-help.xml | 4 +-
.../portlet/src/main/resources/struts-tiles.xml | 4 +-
apps/portlet/src/main/resources/struts-view.xml | 4 +-
apps/portlet/src/main/resources/struts.xml | 4 +-
apps/rest-showcase/pom.xml | 4 +-
apps/showcase/pom.xml | 2 +-
.../main/resources/struts-actionchaining.xml | 4 +-
.../src/main/resources/struts-conversion.xml | 4 +-
.../src/main/resources/struts-filedownload.xml | 4 +-
.../src/main/resources/struts-fileupload.xml | 4 +-
.../src/main/resources/struts-freemarker.xml | 4 +-
.../src/main/resources/struts-hangman.xml | 4 +-
.../src/main/resources/struts-interactive.xml | 4 +-
.../src/main/resources/struts-model-driven.xml | 4 +-
.../src/main/resources/struts-person.xml | 4 +-
.../src/main/resources/struts-tags-non-ui.xml | 4 +-
.../src/main/resources/struts-tags-ui.xml | 4 +-
.../showcase/src/main/resources/struts-tags.xml | 4 +-
.../src/main/resources/struts-tiles.xml | 4 +-
.../src/main/resources/struts-token.xml | 4 +-
.../src/main/resources/struts-validation.xml | 4 +-
.../showcase/src/main/resources/struts-wait.xml | 4 +-
.../showcase/src/main/resources/struts-xslt.xml | 4 +-
apps/showcase/src/main/resources/struts.xml | 4 +-
archetypes/pom.xml | 2 +-
archetypes/struts2-archetype-angularjs/pom.xml | 2 +-
.../src/main/resources/struts.xml | 4 +-
archetypes/struts2-archetype-blank/pom.xml | 2 +-
.../src/main/resources/example.xml | 4 +-
.../src/main/resources/struts.xml | 4 +-
archetypes/struts2-archetype-convention/pom.xml | 2 +-
.../src/main/resources/struts.xml | 4 +-
archetypes/struts2-archetype-dbportlet/pom.xml | 2 +-
.../src/main/resources/struts.xml | 4 +-
archetypes/struts2-archetype-plugin/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
archetypes/struts2-archetype-portlet/pom.xml | 2 +-
.../src/main/resources/struts.xml | 4 +-
archetypes/struts2-archetype-starter/pom.xml | 2 +-
.../src/main/resources/struts.xml | 4 +-
assembly/pom.xml | 2 +-
bom/pom.xml | 9 +--
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../com/opensymphony/xwork2/ActionSupport.java | 4 --
.../xwork2/DefaultActionInvocation.java | 2 +-
.../opensymphony/xwork2/DefaultActionProxy.java | 14 ++++-
.../com/opensymphony/xwork2/XWorkMessages.java | 31 ----------
.../xwork2/config/entities/PackageConfig.java | 7 +++
.../xwork2/conversion/impl/XWorkConverter.java | 2 +-
.../StaticParametersInterceptor.java | 2 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 64 ++++++++++++++++++++
.../validator/DelegatingValidatorContext.java | 2 +-
.../validator/validators/URLValidator.java | 2 +-
.../struts2/components/DoubleListUIBean.java | 2 +-
.../org/apache/struts2/components/I18n.java | 38 +++++++-----
.../apache/struts2/components/ListUIBean.java | 2 +-
.../java/org/apache/struts2/components/Set.java | 2 +-
.../struts2/factory/StrutsResultFactory.java | 2 +-
.../struts2/views/freemarker/tags/TagModel.java | 2 +-
.../xwork2/xwork-messages.properties | 2 +-
.../resources/template/xhtml/controlheader.ftl | 6 +-
.../main/resources/template/xhtml/styles.css | 10 +--
.../opensymphony/xwork2/ActionSupportTest.java | 5 +-
.../xwork2/DefaultActionProxyTest.java | 24 ++++++++
.../opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 +++++
.../xwork2/util/LocalizedTextUtilTest.java | 13 ++--
.../xwork2/validator/URLValidatorTest.java | 1 +
.../apache/struts2/components/UIBeanTest.java | 17 ------
.../struts2/views/jsp/ui/TextfieldTest.java | 16 +++++
.../struts2/views/jsp/ui/CheckboxList-1.txt | 2 +-
.../struts2/views/jsp/ui/CheckboxList-2.txt | 2 +-
.../struts2/views/jsp/ui/CheckboxList-3.txt | 2 +-
.../struts2/views/jsp/ui/CheckboxList-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/ComboBox-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/ComboBox-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/ComboBox-3.txt | 2 +-
.../apache/struts2/views/jsp/ui/ComboBox-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/Component-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/Component-3.txt | 2 +-
.../struts2/views/jsp/ui/DoubleSelect-1.txt | 2 +-
.../struts2/views/jsp/ui/DoubleSelect-2.txt | 2 +-
.../struts2/views/jsp/ui/DoubleSelect-3.txt | 2 +-
.../struts2/views/jsp/ui/DoubleSelect-4.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/File-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/Formtag-11.txt | 2 +-
.../apache/struts2/views/jsp/ui/Formtag-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/Formtag-22.txt | 2 +-
.../apache/struts2/views/jsp/ui/Formtag-24.txt | 2 +-
.../apache/struts2/views/jsp/ui/Formtag-27.txt | 2 +-
.../apache/struts2/views/jsp/ui/Formtag-6.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Label-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Label-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Label-3.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Label-4.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Label-5.txt | 2 +-
.../apache/struts2/views/jsp/ui/OptGroup-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/OptGroup-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/OptGroup-3.txt | 2 +-
.../apache/struts2/views/jsp/ui/OptGroup-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/OptGroup-5.txt | 2 +-
.../apache/struts2/views/jsp/ui/OptGroup-6.txt | 2 +-
.../apache/struts2/views/jsp/ui/OptGroup-7.txt | 2 +-
.../apache/struts2/views/jsp/ui/Password-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Radio-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Radio-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Radio-3.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Radio-4.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Radio-5.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Radio-6.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Radio-7.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-10.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-11.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-12.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-13.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-3.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-5.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-6.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-7.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-8.txt | 2 +-
.../apache/struts2/views/jsp/ui/Select-9.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textarea-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textfield-1.txt | 2 +-
.../struts2/views/jsp/ui/Textfield-12.txt | 2 +-
.../struts2/views/jsp/ui/Textfield-13.txt | 2 +-
.../struts2/views/jsp/ui/Textfield-14.txt | 4 ++
.../apache/struts2/views/jsp/ui/Textfield-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textfield-3.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textfield-4.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textfield-5.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textfield-6.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textfield-7.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textfield-8.txt | 2 +-
.../apache/struts2/views/jsp/ui/Textfield-9.txt | 2 +-
.../views/jsp/ui/inputtransferselect-1.txt | 4 +-
.../views/jsp/ui/optiontransferselect-1.txt | 2 +-
.../views/jsp/ui/optiontransferselect-2.txt | 2 +-
.../views/jsp/ui/optiontransferselect-3.txt | 2 +-
.../views/jsp/ui/optiontransferselect-4.txt | 2 +-
.../views/jsp/ui/optiontransferselect-5.txt | 2 +-
.../views/jsp/ui/optiontransferselect-6.txt | 2 +-
.../views/jsp/ui/optiontransferselect-7.txt | 2 +-
.../apache/struts2/views/jsp/ui/tooltip-1.txt | 2 +-
.../apache/struts2/views/jsp/ui/tooltip-2.txt | 2 +-
.../apache/struts2/views/jsp/ui/tooltip-3.txt | 2 +-
.../apache/struts2/views/jsp/ui/tooltip-4.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-1.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-10.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-11.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-2.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-3.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-4.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-5.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-6.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-7.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-8.txt | 2 +-
.../struts2/views/jsp/ui/updownselecttag-9.txt | 2 +-
.../struts2/views/jsp/ui/validationstyles-1.txt | 2 +-
.../struts2/views/jsp/ui/validationstyles-2.txt | 2 +-
.../struts2/views/jsp/ui/validationstyles-3.txt | 2 +-
.../struts-object-factory-result-builder.xml | 4 +-
plugins/bean-validation/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/cdi/pom.xml | 2 +-
.../cdi/src/main/resources/struts-plugin.xml | 4 +-
plugins/config-browser/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/convention/pom.xml | 2 +-
.../convention/ConventionUnknownHandler.java | 7 ++-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/gxp/pom.xml | 2 +-
.../gxp/src/main/resources/struts-plugin.xml | 4 +-
plugins/jasperreports/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/java8-support/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/javatemplates/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/jfreechart/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/json/pom.xml | 2 +-
.../json/src/main/resources/struts-plugin.xml | 4 +-
plugins/junit/pom.xml | 2 +-
.../struts-convention-configuration.xml | 4 +-
plugins/osgi/pom.xml | 2 +-
.../osgi/src/main/resources/struts-plugin.xml | 4 +-
plugins/oval/pom.xml | 2 +-
.../oval/src/main/resources/struts-plugin.xml | 4 +-
plugins/pell-multipart/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/plexus/pom.xml | 2 +-
.../plexus/src/main/resources/struts-plugin.xml | 4 +-
plugins/pom.xml | 2 +-
plugins/portlet-tiles/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/portlet/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/portlet/src/test/resources/struts.xml | 4 +-
plugins/rest/pom.xml | 2 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
.../src/main/resources/struts-plugin.xml | 4 +-
plugins/spring/pom.xml | 2 +-
.../spring/src/main/resources/struts-plugin.xml | 4 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
.../tiles/src/main/resources/struts-plugin.xml | 4 +-
pom.xml | 6 +-
220 files changed, 449 insertions(+), 358 deletions(-)
----------------------------------------------------------------------