Repository: struts Updated Branches: refs/heads/master b4f8d0391 -> c56d95d28
WW-4779 Marks as deprecated the profiling layer Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c56d95d2 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c56d95d2 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c56d95d2 Branch: refs/heads/master Commit: c56d95d28ca4a924ca5f74ee60d4ea72e2b269d4 Parents: b4f8d03 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Tue Apr 4 08:34:39 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Tue Apr 4 08:34:39 2017 +0200 ---------------------------------------------------------------------- .../com/opensymphony/xwork2/interceptor/TimerInterceptor.java | 3 +++ .../com/opensymphony/xwork2/util/profiling/ObjectProfiler.java | 6 ++++++ .../opensymphony/xwork2/util/profiling/ProfilingTimerBean.java | 3 +++ .../com/opensymphony/xwork2/util/profiling/UtilTimerStack.java | 3 +++ 4 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/c56d95d2/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java index d2cc534..e5433ab 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java +++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/TimerInterceptor.java @@ -91,7 +91,10 @@ import org.apache.logging.log4j.Logger; * * @author Jason Carreira * @author Claus Ibsen + * + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class TimerInterceptor extends AbstractInterceptor { private static final Logger LOG = LogManager.getLogger(TimerInterceptor.class); http://git-wip-us.apache.org/repos/asf/struts/blob/c56d95d2/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java index 733bce3..fee2588 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ObjectProfiler.java @@ -33,7 +33,9 @@ import java.lang.reflect.Proxy; /** * @author <a href="mailto:sc...@atlassian.com";>Scott Farquhar</a> + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class ObjectProfiler { /** @@ -135,6 +137,10 @@ public class ObjectProfiler { } +/** + * @deprecated will be dropped with next major release (2.6) + */ +@Deprecated class TimerInvocationHandler implements InvocationHandler { protected Object target; http://git-wip-us.apache.org/repos/asf/struts/blob/c56d95d2/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java index b94f0ab..11554e0 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/profiling/ProfilingTimerBean.java @@ -35,7 +35,10 @@ import java.util.List; * @author <a href="mailto:m...@atlassian.com";>Mike Cannon-Brookes</a> * @author <a href="mailto:sc...@atlassian.com";>Scott Farquhar</a> * @version $Date$ $Id$ + * + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class ProfilingTimerBean implements java.io.Serializable { private static final long serialVersionUID = -6180672043920208784L; http://git-wip-us.apache.org/repos/asf/struts/blob/c56d95d2/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java b/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java index 092cb8d..c1772b8 100644 --- a/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java +++ b/core/src/main/java/com/opensymphony/xwork2/util/profiling/UtilTimerStack.java @@ -266,7 +266,10 @@ import org.apache.logging.log4j.Logger; * </p> * * <!-- END SNIPPET: profileLogFile --> + * + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class UtilTimerStack { // A reference to the current ProfilingTimerBean
