Author: vines Date: Tue Feb 26 21:03:43 2013 New Revision: 1450418 URL: http://svn.apache.org/r1450418 Log: ACCUMULO-1118 - updating cli's default password to be empty, and some of the tests appropriately
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1450418&r1=1450417&r2=1450418&view=diff ============================================================================== --- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java (original) +++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java Tue Feb 26 21:03:43 2013 @@ -104,7 +104,7 @@ public class ClientOpts extends Help { public String principal = System.getProperty("user.name"); @Parameter(names = "-p", converter = PasswordConverter.class, description = "Connection password") - public Password password = new Password("secret"); + public Password password = new Password(""); @Parameter(names = "--password", converter = PasswordConverter.class, description = "Enter the connection password", password = true) public Password securePassword = null; Modified: accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java?rev=1450418&r1=1450417&r2=1450418&view=diff ============================================================================== --- accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java (original) +++ accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java Tue Feb 26 21:03:43 2013 @@ -43,7 +43,7 @@ public class TestClientOpts { BatchScannerOpts bsOpts = new BatchScannerOpts(); assertEquals(System.getProperty("user.name"), args.principal); assertNull(args.securePassword); - assertEquals(new PasswordToken().setPassword("secret".getBytes()), args.getToken()); + assertEquals(new PasswordToken().setPassword("".getBytes()), args.getToken()); assertEquals(new Long(cfg.getMaxLatency(TimeUnit.MILLISECONDS)), bwOpts.batchLatency); assertEquals(new Long(cfg.getTimeout(TimeUnit.MILLISECONDS)), bwOpts.batchTimeout); assertEquals(new Long(cfg.getMaxMemory()), bwOpts.batchMemory); Modified: accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java?rev=1450418&r1=1450417&r2=1450418&view=diff ============================================================================== --- accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java (original) +++ accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java Tue Feb 26 21:03:43 2013 @@ -83,7 +83,7 @@ public class ShellTest { output = new TestOutputStream(); shell = new Shell(new ConsoleReader(new FileInputStream(FileDescriptor.in), new OutputStreamWriter(output))); shell.setLogErrorsToConsole(); - shell.config("--fake", "-p", "pass"); + shell.config("--fake", "-p", ""); } void assertGoodExit(String s, boolean stringPresent) {