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 2018/03/16 13:23:08 UTC
[struts] branch master updated (b39433a -> f161053)
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from b39433a Merge pull request #204 from quaff/master
add 0a86e4f WW-4875 Add ability to use Java based configuration
add 55ae024 WW-4875 Add location information for java based configuration
add b5e878e replace String.valueOf with Objects.toString to better handle null values in java configuration
add 302b53d WW-4875 Add convention constant configuration
add 7a9b502 WW-4875 Add json constant configuration
add 9f082b2 Make ConventionConstantConfig inherit map of constants from ConstantConfig
add a049d17 WW-4875 Add rest constant configuration
add b2ff4bb WW-4875 Add spring constant configuration
new f161053 Merge pull request #177 from aleksandr-m/feature/WW-4875
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../xwork2/util/location/LocationUtils.java | 6 +
.../struts2/config/StrutsJavaConfiguration.java} | 24 +-
.../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 +++
.../org/apache/struts2/spring/SpringConstants.java | 21 +-
.../struts2/spring/StrutsSpringObjectFactory.java | 6 +-
.../config/entities/SpringConstantConfig.java | 70 ++
21 files changed, 2360 insertions(+), 59 deletions(-)
copy core/src/{test/java/com/opensymphony/xwork2/util/Tiger.java => main/java/org/apache/struts2/config/StrutsJavaConfiguration.java} (73%)
create mode 100644 core/src/main/java/org/apache/struts2/config/StrutsJavaConfigurationProvider.java
create mode 100644 core/src/main/java/org/apache/struts2/config/entities/BeanConfig.java
create mode 100644 core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
create mode 100644 plugins/convention/src/main/java/org/apache/struts2/convention/config/entities/ConventionConstantConfig.java
create mode 100644 plugins/json/src/main/java/org/apache/struts2/json/config/entities/JSONConstantConfig.java
create mode 100644 plugins/rest/src/main/java/org/apache/struts2/rest/RestConstants.java
create mode 100644 plugins/rest/src/main/java/org/apache/struts2/rest/config/entities/RestConstantConfig.java
copy apps/showcase/src/main/java/org/apache/struts2/showcase/ShowDynamicTreeAction.java => plugins/spring/src/main/java/org/apache/struts2/spring/SpringConstants.java (67%)
create mode 100644 plugins/spring/src/main/java/org/apache/struts2/spring/config/entities/SpringConstantConfig.java
--
To stop receiving notification emails like this one, please contact
lukaszlenart@apache.org.
[struts] 01/01: Merge pull request #177 from
aleksandr-m/feature/WW-4875
Posted by lu...@apache.org.
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 <lu...@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
lukaszlenart@apache.org.