This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit f1610537c8538ef922bce794134e4d15e4e0476d
Merge: b39433a b2ff4bb
Author: Lukasz Lenart <lukasz.len...@gmail.com>
AuthorDate: Fri Mar 16 14:23:06 2018 +0100
Merge pull request #177 from aleksandr-m/feature/WW-4875
WW-4875 Add ability to use Java based configuration
.../xwork2/util/location/LocationUtils.java | 6 +
.../struts2/config/StrutsJavaConfiguration.java | 23 +-
.../config/StrutsJavaConfigurationProvider.java | 174 +++
.../apache/struts2/config/entities/BeanConfig.java | 76 ++
.../struts2/config/entities/ConstantConfig.java | 1308 ++++++++++++++++++++
.../org/apache/struts2/dispatcher/Dispatcher.java | 27 +
.../xwork2/util/location/LocationUtilsTest.java | 27 +
.../config/entities/ConventionConstantConfig.java | 330 +++++
.../org/apache/struts2/json/JSONConstants.java | 1 +
.../java/org/apache/struts2/json/JSONResult.java | 2 +-
.../json/config/entities/JSONConstantConfig.java | 71 ++
.../rest/DefaultContentTypeHandlerManager.java | 2 +-
.../apache/struts2/rest/RestActionInvocation.java | 6 +-
.../org/apache/struts2/rest/RestActionMapper.java | 20 +-
.../struts2/rest/RestActionProxyFactory.java | 4 +-
.../org/apache/struts2/rest/RestConstants.java | 38 +
.../struts2/rest/RestWorkflowInterceptor.java | 10 +-
.../rest/config/entities/RestConstantConfig.java | 196 +++
.../apache/struts2/spring/SpringConstants.java} | 18 +-
.../struts2/spring/StrutsSpringObjectFactory.java | 6 +-
.../config/entities/SpringConstantConfig.java | 70 ++
21 files changed, 2364 insertions(+), 51 deletions(-)
--
To stop receiving notification emails like this one, please contact
lukaszlen...@apache.org.
