You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/02/27 16:30:20 UTC
svn commit: r1450809 - in /accumulo/branches/1.5/core/src:
main/java/org/apache/accumulo/core/cli/ClientOpts.java
test/java/org/apache/accumulo/core/cli/TestClientOpts.java
test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Author: ecn
Date: Wed Feb 27 15:30:19 2013
New Revision: 1450809
URL: http://svn.apache.org/r1450809
Log:
ACCUMULO-1118 reverting change that breaks "admin stop"
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=1450809&r1=1450808&r2=1450809&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 Wed Feb 27 15:30:19 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("");
+ public Password password = new Password("secret");
@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=1450809&r1=1450808&r2=1450809&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 Wed Feb 27 15:30:19 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("".getBytes()), args.getToken());
+ assertEquals(new PasswordToken().setPassword("secret".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=1450809&r1=1450808&r2=1450809&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 Wed Feb 27 15:30:19 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", "");
+ shell.config("--fake", "-p", "pass");
}
void assertGoodExit(String s, boolean stringPresent) {