Merge branch 'develop' into feature/use-js-to-support-multiple-buttons
Conflicts:
core/src/main/resources/struts-default.xml
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3aa88ac1
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3aa88ac1
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3aa88ac1
Branch: refs/heads/feature/use-js-to-support-multiple-buttons
Commit: 3aa88ac1c4477f67b0170802d178f01983192a0f
Parents: 342a89e 5353dfc
Author: Lukasz Lenart <[email protected]>
Authored: Sun Apr 6 16:57:33 2014 +0200
Committer: Lukasz Lenart <[email protected]>
Committed: Sun Apr 6 16:57:33 2014 +0200
----------------------------------------------------------------------
apps/blank/pom.xml | 2 +-
apps/jboss-blank/pom.xml | 2 +-
apps/mailreader/pom.xml | 2 +-
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 | 88 +-
assembly/src/main/assembly/all.xml | 12 +-
assembly/src/main/assembly/docs.xml | 2 +-
bundles/admin/pom.xml | 2 +-
bundles/demo/pom.xml | 2 +-
bundles/pom.xml | 2 +-
core/pom.xml | 2 +-
.../struts2/components/DateTextField.java | 51 ++
.../dispatcher/ServletRedirectResult.java | 6 +-
.../struts2/dispatcher/StrutsResultSupport.java | 75 +-
.../interceptor/DateTextFieldInterceptor.java | 128 +++
.../views/freemarker/FreemarkerResult.java | 18 +-
.../struts2/views/jsp/ui/DateTextFieldTag.java | 35 +
core/src/main/resources/struts-default.xml | 12 +-
.../resources/template/css_xhtml/checkbox.ftl | 17 +-
.../template/css_xhtml/controlfooter.ftl | 7 +-
.../template/css_xhtml/controlheader-core.ftl | 9 +-
.../template/css_xhtml/controlheader.ftl | 7 +-
.../main/resources/template/css_xhtml/reset.ftl | 9 +-
.../template/css_xhtml/submit-close.ftl | 7 +-
.../resources/template/css_xhtml/submit.ftl | 7 +-
.../resources/template/simple/checkboxlist.ftl | 14 +-
.../main/resources/template/simple/radiomap.ftl | 8 -
.../main/resources/template/xhtml/checkbox.ftl | 15 +-
.../template/xhtml/controlheader-core.ftl | 9 +-
core/src/site/resources/tags/checkboxlist.html | 832 +++++++++----------
core/src/site/resources/tags/datetextfield.html | 376 +++++++++
.../dispatcher/ServletRedirectResultTest.java | 109 ++-
.../dispatcher/StrutsResultSupportTest.java | 31 +
.../DateTextFieldInterceptorTest.java | 58 ++
.../views/freemarker/FreeMarkerResultTest.java | 3 +
.../struts2/views/jsp/ui/FormTagTest.java | 82 ++
.../apache/struts2/views/jsp/ui/Formtag-27.txt | 10 +
.../apache/struts2/views/jsp/ui/Formtag-28.txt | 10 +
plugins/cdi/pom.xml | 2 +-
plugins/codebehind/pom.xml | 2 +-
plugins/config-browser/pom.xml | 2 +-
plugins/convention/pom.xml | 2 +-
plugins/dojo/pom.xml | 2 +-
plugins/dwr/pom.xml | 2 +-
plugins/embeddedjsp/pom.xml | 2 +-
plugins/gxp/pom.xml | 2 +-
plugins/jasperreports/pom.xml | 2 +-
plugins/javatemplates/pom.xml | 2 +-
.../views/java/simple/DateTextFieldHandler.java | 91 ++
.../struts2/views/java/simple/SimpleTheme.java | 1 +
.../views/java/simple/DateTextFieldTest.java | 51 ++
plugins/jfreechart/pom.xml | 2 +-
plugins/jsf/pom.xml | 2 +-
plugins/json/pom.xml | 2 +-
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 | 4 +-
plugins/sitegraph/pom.xml | 2 +-
plugins/sitemesh/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
plugins/struts1/pom.xml | 2 +-
plugins/testng/pom.xml | 2 +-
plugins/tiles/pom.xml | 2 +-
plugins/tiles3/pom.xml | 2 +-
pom.xml | 17 +-
xwork-core/pom.xml | 2 +-
.../config/impl/DefaultConfiguration.java | 7 +
.../providers/XmlConfigurationProvider.java | 2 +-
.../conversion/impl/DefaultTypeConverter.java | 4 +-
.../xwork2/interceptor/I18nInterceptor.java | 2 +-
.../interceptor/ParametersInterceptor.java | 2 +-
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 85 +-
.../ognl/accessor/CompoundRootAccessor.java | 27 +-
.../xwork2/spring/SpringObjectFactory.java | 2 +-
.../opensymphony/xwork2/util/TextParseUtil.java | 87 ++
.../validator/DelegatingValidatorContext.java | 21 +-
.../interceptor/ParametersInterceptorTest.java | 99 ++-
.../xwork2/util/TextParseUtilTest.java | 45 +-
.../validator/VisitorFieldValidatorTest.java | 2 +-
.../xwork2/AnnotatedTestBean.properties | 5 -
.../TestBean-beanMessageBundle-validation.xml | 2 +-
98 files changed, 2036 insertions(+), 665 deletions(-)
----------------------------------------------------------------------
