Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 29CCD200C4C for ; Tue, 4 Apr 2017 08:34:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2849F160B90; Tue, 4 Apr 2017 06:34:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 70438160B81 for ; Tue, 4 Apr 2017 08:34:50 +0200 (CEST) Received: (qmail 14353 invoked by uid 500); 4 Apr 2017 06:34:49 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 14344 invoked by uid 99); 4 Apr 2017 06:34:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Apr 2017 06:34:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A4E9DFBC6; Tue, 4 Apr 2017 06:34:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Message-Id: <7ded24b3d82146dcb4a7cc9fce0a3c18@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: struts git commit: WW-4779 Marks as deprecated the profiling layer Date: Tue, 4 Apr 2017 06:34:49 +0000 (UTC) archived-at: Tue, 04 Apr 2017 06:34:51 -0000 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 Authored: Tue Apr 4 08:34:39 2017 +0200 Committer: Lukasz Lenart 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 Scott Farquhar + * @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 Mike Cannon-Brookes * @author Scott Farquhar * @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; *

* * + * + * @deprecated will be dropped with next major release (2.6) */ +@Deprecated public class UtilTimerStack { // A reference to the current ProfilingTimerBean