struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [26/28] struts git commit: Merge branch 'release/2.3.22'
Date Thu, 19 Mar 2015 08:50:25 GMT
Merge branch 'release/2.3.22'

Conflicts:
	apps/blank/pom.xml
	apps/jboss-blank/pom.xml
	apps/mailreader/pom.xml
	apps/pom.xml
	apps/portlet/pom.xml
	apps/rest-showcase/pom.xml
	apps/showcase/pom.xml
	archetypes/pom.xml
	archetypes/struts2-archetype-angularjs/pom.xml
	archetypes/struts2-archetype-blank/pom.xml
	archetypes/struts2-archetype-convention/pom.xml
	archetypes/struts2-archetype-dbportlet/pom.xml
	archetypes/struts2-archetype-plugin/pom.xml
	archetypes/struts2-archetype-portlet/pom.xml
	archetypes/struts2-archetype-starter/pom.xml
	assembly/pom.xml
	bom/pom.xml
	bundles/admin/pom.xml
	bundles/demo/pom.xml
	bundles/pom.xml
	core/pom.xml
	plugins/cdi/pom.xml
	plugins/codebehind/pom.xml
	plugins/config-browser/pom.xml
	plugins/convention/pom.xml
	plugins/dojo/pom.xml
	plugins/dwr/pom.xml
	plugins/embeddedjsp/pom.xml
	plugins/gxp/pom.xml
	plugins/jasperreports/pom.xml
	plugins/java8-support/pom.xml
	plugins/javatemplates/pom.xml
	plugins/jfreechart/pom.xml
	plugins/jsf/pom.xml
	plugins/json/pom.xml
	plugins/junit/pom.xml
	plugins/osgi/pom.xml
	plugins/oval/pom.xml
	plugins/pell-multipart/pom.xml
	plugins/plexus/pom.xml
	plugins/pom.xml
	plugins/portlet-tiles/pom.xml
	plugins/portlet/pom.xml
	plugins/rest/pom.xml
	plugins/sitegraph/pom.xml
	plugins/sitemesh/pom.xml
	plugins/spring/pom.xml
	plugins/struts1/pom.xml
	plugins/testng/pom.xml
	plugins/tiles/pom.xml
	plugins/tiles3/pom.xml
	pom.xml
	xwork-core/pom.xml


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

Branch: refs/heads/master
Commit: aeed126a3eb353367855eb7de24d1f8880a31634
Parents: 438d2ce 3e23f21
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Thu Mar 19 09:33:17 2015 +0100
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Thu Mar 19 09:33:17 2015 +0100

----------------------------------------------------------------------
 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                                |  2 +-
 bom/pom.xml                                     |  4 +-
 bundles/admin/pom.xml                           |  2 +-
 bundles/demo/pom.xml                            |  2 +-
 bundles/pom.xml                                 |  2 +-
 core/pom.xml                                    |  2 +-
 .../org/apache/struts2/StrutsConstants.java     |  2 +
 .../apache/struts2/components/Component.java    |  8 +-
 .../org/apache/struts2/components/Date.java     |  8 ++
 .../org/apache/struts2/components/Hidden.java   |  6 --
 .../config/DefaultBeanSelectionProvider.java    |  8 ++
 .../apache/struts2/dispatcher/Dispatcher.java   |  2 +-
 .../dispatcher/ServletActionRedirectResult.java | 13 ++-
 .../dispatcher/ServletRedirectResult.java       |  6 +-
 .../struts2/dispatcher/StrutsResultSupport.java |  7 +-
 .../JakartaStreamMultiPartRequest.java          |  4 +-
 .../multipart/MultiPartRequestWrapper.java      | 11 ++-
 .../interceptor/FileUploadInterceptor.java      |  6 +-
 .../apache/struts2/util/ContentTypeMatcher.java | 16 ++++
 .../struts2/util/DefaultContentTypeMatcher.java | 20 +++++
 .../struts2/util/StrutsTestCaseHelper.java      | 30 ++++++-
 .../struts2/static/inputtransferselect.js       |  2 +-
 .../struts2/static/optiontransferselect.js      |  2 +-
 core/src/main/resources/struts-default.xml      |  2 +
 .../resources/template/css_xhtml/hidden.ftl     | 23 ++++++
 .../ServletActionRedirectResultTest.java        |  3 +-
 .../dispatcher/ServletRedirectResultTest.java   | 30 +++++++
 .../freemarker/FreemarkerResultMockedTest.java  | 84 +++++---------------
 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/java8-support/pom.xml                   |  2 +-
 plugins/javatemplates/pom.xml                   |  2 +-
 .../views/java/simple/SubmitHandler.java        |  4 +-
 plugins/jfreechart/pom.xml                      |  2 +-
 plugins/jsf/pom.xml                             |  2 +-
 plugins/json/pom.xml                            |  2 +-
 .../org/apache/struts2/json/JSONWriter.java     | 13 ++-
 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/struts1/pom.xml                         |  2 +-
 plugins/testng/pom.xml                          |  2 +-
 plugins/tiles/pom.xml                           |  2 +-
 plugins/tiles3/pom.xml                          |  2 +-
 pom.xml                                         |  2 +-
 xwork-core/pom.xml                              |  2 +-
 .../xwork2/ognl/OgnlValueStack.java             |  6 +-
 .../xwork2/ognl/SecurityMemberAccess.java       |  8 +-
 .../xwork2/ognl/OgnlValueStackTest.java         | 14 +++-
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 53 ++++++++++++
 80 files changed, 349 insertions(+), 150 deletions(-)
----------------------------------------------------------------------



Mime
View raw message