You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by am...@apache.org on 2018/05/22 20:46:34 UTC
[struts] branch master updated (b2dcd87 -> a86524e)
This is an automated email from the ASF dual-hosted git repository.
amashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.
from b2dcd87 Merge pull request #221 from yasserzamani/WW-4932
add 2ab4657 remove TimerInterceptor
add 1045836 remove ObjectProfiler
add 14c0f47 remove UtilTimerStack
add 6c0d719 fix RestActionInvocation
add db0f5b5 remove ProfilingTimerBean
add 38c3046 further clean up after rmoving profiling layer
new a86524e Merge pull request #224 from sdutry/WW-4779
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/DefaultActionInvocation.java | 128 ++----
.../opensymphony/xwork2/DefaultActionProxy.java | 35 +-
.../xwork2/interceptor/TimerInterceptor.java | 251 -----------
.../xwork2/util/profiling/ObjectProfiler.java | 177 --------
.../xwork2/util/profiling/ProfilingTimerBean.java | 129 ------
.../xwork2/util/profiling/UtilTimerStack.java | 492 ---------------------
.../xwork2/util/profiling/package.html | 21 -
.../org/apache/struts2/dispatcher/Dispatcher.java | 5 -
.../ProfilingActivationInterceptor.java | 104 -----
core/src/main/resources/struts-default.xml | 2 -
core/src/main/resources/xwork-default.xml | 1 -
.../xwork2/config/ConfigurationTest.java | 4 +-
.../XmlConfigurationProviderActionsTest.java | 6 +-
...onfigurationProviderInterceptorsSpringTest.java | 10 +-
.../XmlConfigurationProviderInterceptorsTest.java | 28 +-
.../xwork2/interceptor/TimerInterceptorTest.java | 163 -------
.../xwork2/spring/SpringObjectFactoryTest.java | 8 +-
.../util/profiling/ProfilingTimerBeanTest.java | 127 ------
.../xwork2/util/profiling/UtilTimerStackTest.java | 136 ------
.../xwork2/config/providers/xwork- test.xml | 4 +-
.../xwork-test-actions-packagedefaultclassref.xml | 4 +-
.../xwork2/config/providers/xwork-test-actions.xml | 4 +-
.../xwork-test-interceptor-defaultref.xml | 4 +-
.../xwork-test-interceptor-inheritance.xml | 4 +-
.../providers/xwork-test-interceptor-params.xml | 4 +-
.../providers/xwork-test-interceptors-basic.xml | 4 +-
.../providers/xwork-test-interceptors-spring.xml | 2 +-
core/src/test/resources/xwork-proxyinvoke.xml | 2 -
core/src/test/resources/xwork-test-default.xml | 2 -
core/src/test/resources/xwork-test-validation.xml | 2 -
.../apache/struts2/rest/RestActionInvocation.java | 47 +-
.../OldDecorator2NewStrutsFreemarkerDecorator.java | 5 -
32 files changed, 121 insertions(+), 1794 deletions(-)
delete mode 100644 core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java
delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java
delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java
delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java
delete mode 100644 core/src/main/java/com/opensymphony/xwork2/util/profiling/package.html
delete mode 100644 core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java
delete mode 100644 core/src/test/java/com/opensymphony/xwork2/interceptor/TimerInterceptorTest.java
delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBeanTest.java
delete mode 100644 core/src/test/java/com/opensymphony/xwork2/util/profiling/UtilTimerStackTest.java
--
To stop receiving notification emails like this one, please contact
amashchenko@apache.org.
[struts] 01/01: Merge pull request #224 from sdutry/WW-4779
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git
commit a86524e22adac1b17b954ba903daca6f42ee6b70
Merge: b2dcd87 38c3046
Author: Aleksandr Mashchenko <al...@users.noreply.github.com>
AuthorDate: Tue May 22 23:46:28 2018 +0300
Merge pull request #224 from sdutry/WW-4779
WW-4779 Remove profiling layer
.../xwork2/DefaultActionInvocation.java | 128 ++----
.../opensymphony/xwork2/DefaultActionProxy.java | 35 +-
.../xwork2/interceptor/TimerInterceptor.java | 251 -----------
.../xwork2/util/profiling/ObjectProfiler.java | 177 --------
.../xwork2/util/profiling/ProfilingTimerBean.java | 129 ------
.../xwork2/util/profiling/UtilTimerStack.java | 492 ---------------------
.../xwork2/util/profiling/package.html | 21 -
.../org/apache/struts2/dispatcher/Dispatcher.java | 5 -
.../ProfilingActivationInterceptor.java | 104 -----
core/src/main/resources/struts-default.xml | 2 -
core/src/main/resources/xwork-default.xml | 1 -
.../xwork2/config/ConfigurationTest.java | 4 +-
.../XmlConfigurationProviderActionsTest.java | 6 +-
...onfigurationProviderInterceptorsSpringTest.java | 10 +-
.../XmlConfigurationProviderInterceptorsTest.java | 28 +-
.../xwork2/interceptor/TimerInterceptorTest.java | 163 -------
.../xwork2/spring/SpringObjectFactoryTest.java | 8 +-
.../util/profiling/ProfilingTimerBeanTest.java | 127 ------
.../xwork2/util/profiling/UtilTimerStackTest.java | 136 ------
.../xwork2/config/providers/xwork- test.xml | 4 +-
.../xwork-test-actions-packagedefaultclassref.xml | 4 +-
.../xwork2/config/providers/xwork-test-actions.xml | 4 +-
.../xwork-test-interceptor-defaultref.xml | 4 +-
.../xwork-test-interceptor-inheritance.xml | 4 +-
.../providers/xwork-test-interceptor-params.xml | 4 +-
.../providers/xwork-test-interceptors-basic.xml | 4 +-
.../providers/xwork-test-interceptors-spring.xml | 2 +-
core/src/test/resources/xwork-proxyinvoke.xml | 2 -
core/src/test/resources/xwork-test-default.xml | 2 -
core/src/test/resources/xwork-test-validation.xml | 2 -
.../apache/struts2/rest/RestActionInvocation.java | 47 +-
.../OldDecorator2NewStrutsFreemarkerDecorator.java | 5 -
32 files changed, 121 insertions(+), 1794 deletions(-)
--
To stop receiving notification emails like this one, please contact
amashchenko@apache.org.