cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r964961 - in /cassandra/trunk/src/java/org/apache/cassandra/cli: CliOptions.java CliSessionState.java
Date Fri, 16 Jul 2010 21:56:04 GMT
Author: jbellis
Date: Fri Jul 16 21:56:04 2010
New Revision: 964961

URL: http://svn.apache.org/viewvc?rev=964961&view=rev
Log:
make cli framed by default.  patch by Jon Hermes; reviewed by jbellis for CASSANDRA-1290

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java
    cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java?rev=964961&r1=964960&r2=964961&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java Fri Jul 16 21:56:04
2010
@@ -32,7 +32,7 @@ public class CliOptions {
     // Command line options
     private static final String HOST_OPTION = "host";
     private static final String PORT_OPTION = "port";
-    private static final String FRAME_OPTION = "framed";
+    private static final String UNFRAME_OPTION = "unframed";
     private static final String DEBUG_OPTION = "debug";
     private static final String USERNAME_OPTION = "username";
     private static final String PASSWORD_OPTION = "password";
@@ -48,7 +48,7 @@ public class CliOptions {
         options = new Options();
         options.addOption(HOST_OPTION, true, "cassandra server's host name");
         options.addOption(PORT_OPTION, true, "cassandra server's thrift port");  
-        options.addOption(FRAME_OPTION, false, "cassandra server's framed transport");  
+        options.addOption(UNFRAME_OPTION, false, "cassandra server's framed transport");
         options.addOption(DEBUG_OPTION, false, "display stack traces");  
         options.addOption(USERNAME_OPTION, true, "username for cassandra authentication");
         options.addOption(PASSWORD_OPTION, true, "password for cassandra authentication");
@@ -58,7 +58,7 @@ public class CliOptions {
     private static void printUsage()
     {
         System.err.println("");
-        System.err.println("Usage: cassandra-cli --host hostname [--port <portname>]
[--framed] [--debug] [--username username] [--password password] [--keyspace keyspace]");
+        System.err.println("Usage: cassandra-cli --host hostname [--port <portname>]
[--unframed] [--debug] [--username username] [--password password] [--keyspace keyspace]");
         System.err.println("");
     }
 
@@ -94,9 +94,9 @@ public class CliOptions {
         }
 
         // Look to see if frame has been specified
-        if (cmd.hasOption(FRAME_OPTION))
+        if (cmd.hasOption(UNFRAME_OPTION))
         {
-            css.framed = true;
+            css.framed = false;
         }
 
         // Look to see if frame has been specified

Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java?rev=964961&r1=964960&r2=964961&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java Fri Jul 16 21:56:04
2010
@@ -27,13 +27,13 @@ import java.io.PrintStream;
 public class CliSessionState
 {
 
-    public String  hostName;       // cassandra server name
-    public int     thriftPort;     // cassandra server's thrift port
-    public boolean framed = false; // cassandra server's framed transport 
-    public boolean debug = false;  // print stack traces when errors occur in the CLI
-    public String  username;       // cassandra login name (if SimpleAuthenticator is used)
-    public String  password;       // cassandra login password (if SimpleAuthenticator is
used)
-    public String  keyspace;       // cassandra keyspace user is authenticating 			
+    public String  hostName;      // cassandra server name
+    public int     thriftPort;    // cassandra server's thrift port
+    public boolean framed = true; // cassandra server's framed transport 
+    public boolean debug = false; // print stack traces when errors occur in the CLI
+    public String  username;      // cassandra login name (if SimpleAuthenticator is used)
+    public String  password;      // cassandra login password (if SimpleAuthenticator is
used)
+    public String  keyspace;      // cassandra keyspace user is authenticating 			
     /*
      * Streams to read/write from
      */



Mime
View raw message