Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 928BF1180E for ; Fri, 22 Aug 2014 22:06:33 +0000 (UTC) Received: (qmail 22832 invoked by uid 500); 22 Aug 2014 22:06:31 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 22738 invoked by uid 500); 22 Aug 2014 22:06:31 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 22592 invoked by uid 99); 22 Aug 2014 22:06:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2014 22:06:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 166539C8CFA; Fri, 22 Aug 2014 22:06:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Fri, 22 Aug 2014 22:06:36 -0000 Message-Id: In-Reply-To: <9389dc07fe784ff8a82dadb8d43d8734@git.apache.org> References: <9389dc07fe784ff8a82dadb8d43d8734@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/9] git commit: ACCUMULO-3019 "Un-deprecate" ServerConfiguration ACCUMULO-3019 "Un-deprecate" ServerConfiguration Suppress all the unnecessary warnings noise due to the deprecation of this class without removing existing usage. One cannot reasonably consider it deprecated if we are still using it so extensively. This only applies to the current branch. It is deprecated in future branches. This commit should be merged to newer branches with the "ours" merge strategy. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/705a60d1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/705a60d1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/705a60d1 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 705a60d19e55c3499c168d3dd3ad5215dd8487c4 Parents: 45d61cb Author: Christopher Tubbs Authored: Fri Aug 22 18:01:33 2014 -0400 Committer: Christopher Tubbs Committed: Fri Aug 22 18:01:33 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/conf/ServerConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/705a60d1/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java index 0793177..50dec57 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java +++ b/server/base/src/main/java/org/apache/accumulo/server/conf/ServerConfiguration.java @@ -25,9 +25,9 @@ import org.apache.accumulo.core.conf.SiteConfiguration; import org.apache.accumulo.core.data.KeyExtent; /** - * @deprecated Use {@link ServerConfigurationFactory} instead. + * Prefer {@link ServerConfigurationFactory} over this class, due to this class being deprecated in future versions with the addition of ACCUMULO-2615. It is + * left un-deprecated here, due to the fact that doing so would generate too much churn and noise. See ACCUMULO-3019. */ -@Deprecated public class ServerConfiguration { private static SecurityPermission CONFIGURATION_PERMISSION = new SecurityPermission("configurationPermission"); @@ -72,6 +72,7 @@ public class ServerConfiguration { static void expireAllTableObservers() { ServerConfigurationFactory.expireAllTableObservers(); } + private final ServerConfigurationFactory scf; public ServerConfiguration(Instance instance) {