svn commit: r1469896 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/util/shell/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/src/te...

[kturner]

Author: kturner
Date: Fri Apr 19 15:24:37 2013
New Revision: 1469896

URL: http://svn.apache.org/r1469896
Log:
ACCUMULO-1323 made shell behave the way it did in 1.4 when no user was given 
and fixed shell unit test

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)
    
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
    accumulo/trunk/pom.xml   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)
    
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1469860

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1469860

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1469860

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1469896&r1=1469895&r2=1469896&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
 Fri Apr 19 15:24:37 2013
@@ -246,7 +246,7 @@ public class Shell extends ShellOptions 
     String sysUser = System.getProperty("user.name");
     if (sysUser == null)
       sysUser = "root";
-    String user = cl.getOptionValue(usernameOption.getOpt());
+    String user = cl.getOptionValue(usernameOption.getOpt(), sysUser);
 
     String passw = cl.getOptionValue(passwOption.getOpt(), null);
     tabCompletion = !cl.hasOption(tabCompleteOption.getLongOpt());

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1469860

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1469860

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1469860

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1469860

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1469860

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1469860

Modified: 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1469896&r1=1469895&r2=1469896&view=diff
==============================================================================
--- 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java 
(original)
+++ 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java 
Fri Apr 19 15:24:37 2013
@@ -622,12 +622,12 @@ public class ShellServerTest {
     exec("createtable t");
     exec("addsplits a m z");
     exec("getsplits", true, "z", true);
-    exec("merge -f", true);
+    exec("merge --all", true);
     exec("getsplits", true, "z", false);
     exec("deletetable -f t");
     exec("getsplits -t !METADATA", true);
     assertEquals(3, output.get().split("\n").length);
-    exec("merge -f -t !METADATA");
+    exec("merge --all -t !METADATA");
     exec("getsplits -t !METADATA", true);
     assertEquals(2, output.get().split("\n").length);
   }