struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [50/50] git commit: Merge branch 'develop' into feature/WW-4295-localization
Date Fri, 27 Jun 2014 11:24:18 GMT
Merge branch 'develop' into feature/WW-4295-localization

Conflicts:
	core/src/site/resources/tags/checkboxlist.html


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d20c2f10
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d20c2f10
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d20c2f10

Branch: refs/heads/feature/WW-4295-localization
Commit: d20c2f10b7ccb2830eb255062b45941684b55336
Parents: d67fce1 63de773
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Fri Jun 27 13:15:10 2014 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Fri Jun 27 13:15:10 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 +-
 .../src/main/resources/example.xml              |   6 +-
 .../main/webapp/WEB-INF/example/HelloWorld.jsp  |  28 ++
 .../src/main/webapp/WEB-INF/example/Login.jsp   |  15 +
 .../src/main/webapp/WEB-INF/example/Menu.jsp    |   3 +
 .../src/main/webapp/WEB-INF/example/Missing.jsp |  11 +
 .../main/webapp/WEB-INF/example/Register.jsp    |   3 +
 .../src/main/webapp/WEB-INF/example/Welcome.jsp |  18 +
 .../src/main/webapp/example/HelloWorld.jsp      |  28 --
 .../src/main/webapp/example/Login.jsp           |  15 -
 .../src/main/webapp/example/Menu.jsp            |   3 -
 .../src/main/webapp/example/Missing.jsp         |  11 -
 .../src/main/webapp/example/Register.jsp        |   3 -
 .../src/main/webapp/example/Welcome.jsp         |  18 -
 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 +-
 .../src/main/resources/struts.xml               |   4 +-
 .../src/main/webapp/WEB-INF/jsp/helloWorld.jsp  |  16 +
 .../src/main/webapp/WEB-INF/jsp/index.jsp       |  20 +
 .../src/main/webapp/jsp/helloWorld.jsp          |  16 -
 .../src/main/webapp/jsp/index.jsp               |  20 -
 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 +-
 .../org/apache/struts2/StrutsConstants.java     |  16 +
 .../struts2/components/DateTextField.java       |  51 +++
 .../struts2/components/GenericUIBean.java       |   5 +-
 .../org/apache/struts2/components/UIBean.java   |   9 +-
 .../config/DefaultBeanSelectionProvider.java    |  22 +-
 .../dispatcher/ServletRedirectResult.java       |  48 ++-
 .../struts2/dispatcher/StrutsResultSupport.java |  75 +++-
 .../struts2/interceptor/CookieInterceptor.java  |  75 +++-
 .../interceptor/DateTextFieldInterceptor.java   | 128 +++++++
 .../views/freemarker/FreemarkerResult.java      |  18 +-
 .../struts2/views/jsp/ui/DateTextFieldTag.java  |  35 ++
 .../org/apache/struts2/default.properties       |   6 +-
 .../struts2/interceptor/debugging/browser.ftl   |  21 +-
 .../struts2/interceptor/debugging/console.ftl   |   4 +-
 .../interceptor/debugging/webconsole.html       |  30 +-
 .../struts2/interceptor/debugging/webconsole.js |  99 +++--
 core/src/main/resources/struts-default.xml      |  32 +-
 .../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/datetextfield.html | 376 +++++++++++++++++++
 .../struts2/TestConfigurationProvider.java      |   5 +
 .../dispatcher/ServletRedirectResultTest.java   | 109 ++++--
 .../dispatcher/StrutsResultSupportTest.java     |  31 ++
 .../interceptor/CookieInterceptorTest.java      | 130 +++++++
 .../DateTextFieldInterceptorTest.java           |  58 +++
 .../ExecuteAndWaitInterceptorTest.java          |   2 +
 .../views/freemarker/FreeMarkerResultTest.java  |   3 +
 .../struts2/views/jsp/PropertyTagTest.java      |  30 +-
 .../struts2/views/jsp/ui/FormTagTest.java       |  82 ++++
 .../apache/struts2/views/jsp/ui/SelectTest.java |   2 +-
 .../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 +-
 .../apache/struts2/views/java/DefaultTheme.java |   6 +-
 .../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 +-
 .../struts2/rest/RestActionInvocationTest.java  |   2 +
 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                                         |  14 +-
 src/site/resources/archetype-catalog.xml        |  12 +-
 xwork-core/pom.xml                              |   2 +-
 .../xwork2/DefaultActionInvocation.java         |  54 +--
 .../com/opensymphony/xwork2/XWorkConstants.java |  10 +
 .../xwork2/config/entities/ActionConfig.java    |   1 +
 .../config/entities/ExceptionMappingConfig.java |   1 +
 .../config/entities/InterceptorConfig.java      |   1 +
 .../config/entities/InterceptorStackConfig.java |   1 +
 .../xwork2/config/entities/PackageConfig.java   |   1 +
 .../xwork2/config/entities/ResultConfig.java    |   1 +
 .../config/entities/ResultTypeConfig.java       |   1 +
 .../config/entities/UnknownHandlerConfig.java   |   8 +-
 .../config/impl/DefaultConfiguration.java       |   7 +
 .../providers/XWorkConfigurationProvider.java   |  11 +-
 .../providers/XmlConfigurationProvider.java     |   5 +-
 .../conversion/impl/DefaultTypeConverter.java   |   4 +-
 .../xwork2/interceptor/I18nInterceptor.java     |   2 +-
 .../interceptor/ParametersInterceptor.java      | 127 ++++---
 .../opensymphony/xwork2/mock/MockResult.java    |   2 +
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  | 158 ++++++--
 .../xwork2/ognl/OgnlValueStack.java             |   6 +-
 .../xwork2/ognl/SecurityMemberAccess.java       |  50 ++-
 .../ognl/accessor/CompoundRootAccessor.java     |  27 +-
 .../security/AcceptedPatternsChecker.java       |  82 ++++
 .../DefaultAcceptedPatternsChecker.java         |  86 +++++
 .../DefaultExcludedPatternsChecker.java         |  95 +++++
 .../security/ExcludedPatternsChecker.java       |  82 ++++
 .../xwork2/spring/SpringObjectFactory.java      |   2 +-
 .../opensymphony/xwork2/util/TextParseUtil.java |  87 +++++
 .../xwork2/util/logging/Logger.java             |   4 +
 .../util/logging/commons/CommonsLogger.java     |   4 +
 .../xwork2/util/logging/jdk/JdkLogger.java      |   4 +
 .../xwork2/util/logging/slf4j/Slf4jLogger.java  |   4 +
 .../validator/DelegatingValidatorContext.java   |  21 +-
 .../xwork2/DefaultActionInvocationTest.java     |   8 +
 .../impl/AnnotationXWorkConverterTest.java      |  10 +-
 .../interceptor/ParametersInterceptorTest.java  | 168 ++++++++-
 .../opensymphony/xwork2/ognl/OgnlUtilTest.java  | 164 +++++++-
 .../xwork2/ognl/OgnlValueStackTest.java         |   1 +
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 236 ++++++++++++
 .../DefaultAcceptedPatternsCheckerTest.java     |  56 +++
 .../DefaultExcludedPatternsCheckerTest.java     |  60 +++
 .../xwork2/util/TextParseUtilTest.java          |  45 ++-
 .../validator/VisitorFieldValidatorTest.java    |   2 +-
 .../xwork2/AnnotatedTestBean.properties         |   5 -
 .../TestBean-beanMessageBundle-validation.xml   |   2 +-
 .../test/resources/xwork-class-param-test.xml   |  11 +
 .../src/test/resources/xwork-param-test.xml     |   1 +
 .../src/test/resources/xwork-test-beans.xml     |  24 +-
 165 files changed, 3335 insertions(+), 657 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/d20c2f10/core/src/main/resources/template/simple/checkboxlist.ftl
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/struts/blob/d20c2f10/core/src/main/resources/template/simple/radiomap.ftl
----------------------------------------------------------------------


Mime
View raw message