incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1238728 - in /incubator/accumulo/trunk: pom.xml src/core/pom.xml src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Date Tue, 31 Jan 2012 18:17:01 GMT
Author: billie
Date: Tue Jan 31 18:17:00 2012
New Revision: 1238728

URL: http://svn.apache.org/viewvc?rev=1238728&view=rev
Log:
ACCUMULO-354 reverted accidental check-in

Modified:
    incubator/accumulo/trunk/pom.xml
    incubator/accumulo/trunk/src/core/pom.xml
    incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1238728&r1=1238727&r2=1238728&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Tue Jan 31 18:17:00 2012
@@ -522,11 +522,6 @@
         <artifactId>commons-jci-fam</artifactId>
         <version>1.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.python</groupId>
-        <artifactId>jython</artifactId>
-        <version>2.5.0</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

Modified: incubator/accumulo/trunk/src/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/pom.xml?rev=1238728&r1=1238727&r2=1238728&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/pom.xml (original)
+++ incubator/accumulo/trunk/src/core/pom.xml Tue Jan 31 18:17:00 2012
@@ -111,10 +111,6 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
-      <dependency>
-        <groupId>org.python</groupId>
-        <artifactId>jython</artifactId>
-      </dependency>
   </dependencies>
 
 </project>

Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1238728&r1=1238727&r2=1238728&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Tue Jan 31 18:17:00 2012
@@ -171,7 +171,7 @@ public class Shell {
   
   private Token rootToken;
   public final Map<String,Command> commandFactory = new TreeMap<String,Command>();
-  boolean configError = false;
+  private boolean configError = false;
   
   // Global options flags
   public static final String userOption = "u";
@@ -416,6 +416,8 @@ public class Shell {
       log.warn("Unable to load history file at " + historyPath);
     }
     
+    ShellCompletor userCompletor = null;
+    
     if (execFile != null) {
       java.util.Scanner scanner = new java.util.Scanner(new File(execFile));
       while (scanner.hasNextLine())
@@ -451,23 +453,6 @@ public class Shell {
     }
   }
   
-  ShellCompletor userCompletor = null;
-  
-  public boolean execCommand(String line) {
-    try {
-      System.out.println("trying to execute line in shell: " + line);
-      execCommand(line, disableAuthTimeout, false);
-    } catch (IOException e) {
-      System.out.println("got IOException");
-      return false;
-    }
-    if (exitCode > 0) {
-      System.out.println("got exit code " + exitCode);
-      return false;
-    }
-    return true;
-  }
-  
   public void printInfo() throws IOException {
     reader.printString("\n" + SHELL_DESCRIPTION + "\n" + "- \n" + "- version: " + Constants.VERSION
+ "\n" + "- instance name: "
         + connector.getInstance().getInstanceName() + "\n" + "- instance id: " + connector.getInstance().getInstanceID()
+ "\n" + "- \n"
@@ -509,7 +494,7 @@ public class Shell {
     reader.printString(sb.toString());
   }
   
-  String getDefaultPrompt() {
+  private String getDefaultPrompt() {
     return connector.whoami() + "@" + connector.getInstance().getInstanceName() + (getTableName().isEmpty()
? "" : " ") + getTableName() + "> ";
   }
   



Mime
View raw message