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 2011/11/03 12:31:47 UTC

svn commit: r1197066 - in /incubator/accumulo/branches/1.3: README conf/accumulo-site.xml.example pom.xml src/core/src/main/java/org/apache/accumulo/core/Constants.java src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java

Author: ecn
Date: Thu Nov  3 11:31:46 2011
New Revision: 1197066

URL: http://svn.apache.org/viewvc?rev=1197066&view=rev
Log:
ACCUMULO-116: fix debug on the shell; clean up other release issues

Modified:
    incubator/accumulo/branches/1.3/README   (props changed)
    incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example
    incubator/accumulo/branches/1.3/pom.xml   (props changed)
    incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java
    incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java

Propchange: incubator/accumulo/branches/1.3/README
            ('svn:executable' removed)

Modified: incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example?rev=1197066&r1=1197065&r2=1197066&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example (original)
+++ incubator/accumulo/branches/1.3/conf/accumulo-site.xml.example Thu Nov  3 11:31:46 2011
@@ -42,7 +42,7 @@
 
     <property>
       <name>instance.secret</name>
-      <value></value>
+      <value>DEFAULT</value>
       <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
       </description>
     </property>

Propchange: incubator/accumulo/branches/1.3/pom.xml
            ('svn:executable' removed)

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1197066&r1=1197065&r2=1197066&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/Constants.java Thu Nov  3 11:31:46 2011
@@ -123,7 +123,7 @@ public class Constants {
   public static final int MAX_DATA_TO_PRINT = 64;
   public static final int CLIENT_RETRIES = 5;
   public static final int TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER = 2;
-  public static final String CORE_PACKAGE_NAME = "accumulo.core";
+  public static final String CORE_PACKAGE_NAME = "org.apache.accumulo.core";
   public static final String OLD_PACKAGE_NAME = "cloudbase";
   public static final String VALID_TABLE_NAME_REGEX = "^\\w+$";
   

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1197066&r1=1197065&r2=1197066&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Thu Nov  3 11:31:46 2011
@@ -3435,13 +3435,7 @@ public class Shell {
       if (rand.nextInt(10) == 0) {
         shellState.reader.beep();
         shellState.reader.printNewline();
-        shellState.reader.printString("  CCCCCCCC  LL         OOOOOO   UU    UU  DDDDDDD   BBBBBBB     AAAA    SSSSSSSS  EEEEEEEE\n");
-        shellState.reader.printString("  CC        LL        OO    OO  UU    UU  DD    DD  BB    BB   AA  AA   SS        EE      \n");
-        shellState.reader.printString("  CC        LL        OO    OO  UU    UU  DD    DD  BB    BB  AA    AA  SS        EE      \n");
-        shellState.reader.printString("  CC        LL        OO    OO  UU    UU  DD    DD  BBBBBBB   AAAAAAAA  SSSSSSSS  EEEEEEEE\n");
-        shellState.reader.printString("  CC        LL        OO    OO  UU    UU  DD    DD  BB    BB  AA    AA        SS  EE      \n");
-        shellState.reader.printString("  CC        LL        OO    OO  UU    UU  DD    DD  BB    BB  AA    AA        SS  EE      \n");
-        shellState.reader.printString("  CCCCCCCC  LLLLLLLL   OOOOOO    UUUUUU   DDDDDDD   BBBBBBB   AA    AA  SSSSSSSS  EEEEEEEE\n");
+        shellState.reader.printString("Sortacus lives!");
         shellState.reader.printNewline();
       } else
         throw new ShellCommandException(ErrorCode.UNRECOGNIZED_COMMAND, getName());