Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F257A7C4B for ; Fri, 28 Oct 2011 13:00:33 +0000 (UTC) Received: (qmail 58300 invoked by uid 500); 28 Oct 2011 13:00:33 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 58272 invoked by uid 500); 28 Oct 2011 13:00:33 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 58262 invoked by uid 99); 28 Oct 2011 13:00:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 13:00:33 +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, 28 Oct 2011 13:00:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 998A82388AA9; Fri, 28 Oct 2011 13:00:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1190287 - in /incubator/accumulo/trunk: ./ src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java Date: Fri, 28 Oct 2011 13:00:12 -0000 To: accumulo-commits@incubator.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111028130012.998A82388AA9@eris.apache.org> Author: ecn Date: Fri Oct 28 13:00:12 2011 New Revision: 1190287 URL: http://svn.apache.org/viewvc?rev=1190287&view=rev Log: ACCUMULO-90: merge from 1.3 branch Modified: incubator/accumulo/trunk/ (props changed) incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java Propchange: incubator/accumulo/trunk/ ------------------------------------------------------------------------------ svn:mergeinfo = /incubator/accumulo/branches/1.3:1190280 Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java?rev=1190287&r1=1190286&r2=1190287&view=diff ============================================================================== --- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java (original) +++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java Fri Oct 28 13:00:12 2011 @@ -59,6 +59,7 @@ public class Authorizations implements I validAuthChars['_'] = true; validAuthChars['-'] = true; + validAuthChars[':'] = true; } static final boolean isValidAuthChar(byte b) { Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java?rev=1190287&r1=1190286&r2=1190287&view=diff ============================================================================== --- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java (original) +++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java Fri Oct 28 13:00:12 2011 @@ -1,8 +1,8 @@ package org.apache.accumulo.core.security; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.fail; -import org.apache.accumulo.core.security.ColumnVisibility; import org.junit.Test; public class ColumnVisibilityTest { @@ -39,6 +39,7 @@ public class ColumnVisibilityTest { public void testCompound() { shouldNotThrow("a|b", "a&b", "ab&bc"); shouldNotThrow("A&B&C&D&E", "A|B|C|D|E", "(A|B|C)", "(A)|B|(C)", "A&(B)&(C)", "A&B&(L)"); + shouldNotThrow("_&-&:"); } @Test