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 50E3DE3D2 for ; Fri, 1 Feb 2013 18:02:44 +0000 (UTC) Received: (qmail 88488 invoked by uid 500); 1 Feb 2013 18:02:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 88464 invoked by uid 500); 1 Feb 2013 18:02:44 -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 88457 invoked by uid 99); 1 Feb 2013 18:02:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 18:02:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 18:02:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F14E523889EB; Fri, 1 Feb 2013 18:02:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1441559 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core: conf/DefaultConfiguration.java conf/Property.java util/shell/commands/ConfigCommand.java Date: Fri, 01 Feb 2013 18:02:20 -0000 To: commits@accumulo.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130201180220.F14E523889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kturner Date: Fri Feb 1 18:02:20 2013 New Revision: 1441559 URL: http://svn.apache.org/viewvc?rev=1441559&view=rev Log: ACCUMULO-958 fixed spelling, hid experimental options in shell Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1441559&r1=1441558&r2=1441559&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Fri Feb 1 18:02:20 2013 @@ -47,7 +47,7 @@ public class DefaultConfiguration extend public Iterator> iterator() { TreeMap entries = new TreeMap(); for (Property prop : Property.values()) - if (!prop.isExprimental() && !prop.getType().equals(PropertyType.PREFIX)) + if (!prop.isExperimental() && !prop.getType().equals(PropertyType.PREFIX)) entries.put(prop.getKey(), prop.getDefaultValue()); return entries.entrySet().iterator(); @@ -78,7 +78,7 @@ public class DefaultConfiguration extend ArrayList prefixes = new ArrayList(); TreeMap sortedProps = new TreeMap(); for (Property prop : Property.values()) { - if (prop.isExprimental()) + if (prop.isExperimental()) continue; if (prop.getType().equals(PropertyType.PREFIX)) @@ -90,7 +90,7 @@ public class DefaultConfiguration extend doc.println("

Jump to: "); String delimiter = ""; for (Property prefix : prefixes) { - if (prefix.isExprimental()) + if (prefix.isExperimental()) continue; doc.print(delimiter + "" + prefix.getKey() + "*"); @@ -101,7 +101,7 @@ public class DefaultConfiguration extend doc.println(" "); for (Property prefix : prefixes) { - if (prefix.isExprimental()) + if (prefix.isExperimental()) continue; doc.println(" "); @@ -112,7 +112,7 @@ public class DefaultConfiguration extend boolean highlight = true; for (Property prop : sortedProps.values()) { - if (prop.isExprimental()) + if (prop.isExperimental()) continue; if (prop.getKey().startsWith(prefix.getKey())) { Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1441559&r1=1441558&r2=1441559&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java Fri Feb 1 18:02:20 2013 @@ -373,7 +373,7 @@ public enum Property { return this.description; } - public boolean isExprimental() { + public boolean isExperimental() { return experimental; } Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java?rev=1441559&r1=1441558&r2=1441559&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java Fri Feb 1 18:02:20 2013 @@ -53,7 +53,7 @@ public class ConfigCommand extends Comma final Token cmd = new Token(getName()); final Token sub = new Token("-" + setOpt.getOpt()); for (Property p : Property.values()) { - if (!(p.getKey().endsWith("."))) { + if (!(p.getKey().endsWith(".")) && !p.isExperimental()) { sub.addSubcommand(new Token(p.toString())); } }
" + prefix.getKey() + "*