Return-Path: 
 <accumulo-commits-return-941-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
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 EBB069CCE
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Tue, 31 Jan 2012 18:17:25 +0000 (UTC)
Received: (qmail 85853 invoked by uid 500); 31 Jan 2012 18:17:25 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 85803 invoked by uid 500); 31 Jan 2012 18:17:25 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 85794 invoked by uid 99); 31 Jan 2012 18:17:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Jan 2012 18:17:25 +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; Tue, 31 Jan 2012 18:17:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 6BBAB23888E4;
	Tue, 31 Jan 2012 18:17:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: accumulo-commits@incubator.apache.org
From: billie@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120131181701.6BBAB23888E4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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() + "> ";
   }