accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1454535 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/conf/ test/src/main/java/org/apache/accumulo/test/scalability/ test/src/test/java/org/apache/accumulo/test/
Date Fri, 08 Mar 2013 20:36:32 GMT
Author: vines
Date: Fri Mar  8 20:36:31 2013
New Revision: 1454535

URL: http://svn.apache.org/r1454535
Log:
ACCUMULO-1156 - Lasts litters of deprecated getConnector calls


Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1454493-1454510,1454512,1454514-1454533

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1454163-1454422,1454424-1454510,1454512,1454514-1454533

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1454535&r1=1454534&r2=1454535&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java Fri Mar
 8 20:36:31 2013
@@ -225,10 +225,10 @@ public enum Property {
   TRACE_PORT("trace.port.client", "12234", PropertyType.PORT, "The listening port for the
trace server"),
   TRACE_TABLE("trace.table", "trace", PropertyType.STRING, "The name of the table to store
distributed traces"),
   @Deprecated
-  TRACE_USER("trace.user", "root", PropertyType.STRING, "The name of the user to store distributed
traces"),
+  TRACE_USER("trace.user", "root", PropertyType.STRING, "DEPRECATED SINCE 1.5, USE trace.principal.
The name of the user to store distributed traces"),
   TRACE_PRINCIPAL("trace.principal", "root", PropertyType.STRING, "The principal to store
distributed traces"),
   @Deprecated
-  TRACE_PASSWORD("trace.password", "secret", PropertyType.STRING, "The password for the user
used to store distributed traces"),
+  TRACE_PASSWORD("trace.password", "secret", PropertyType.STRING, "DEPRECATED SINCE 1.5,
USE trace.login. The password for the user used to store distributed traces"),
   TRACE_LOGIN_PROPERTIES("trace.login", null, PropertyType.PREFIX, "The login credentials
prefix for the principal used to store distributed traces"),
   
   // per table properties

Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java?rev=1454535&r1=1454534&r2=1454535&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java
(original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java
Fri Mar  8 20:36:31 2013
@@ -23,6 +23,7 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.hadoop.io.Text;
 
 public abstract class ScaleTest {
@@ -44,8 +45,9 @@ public abstract class ScaleTest {
     String zookeepers = this.scaleProps.getProperty("ZOOKEEPERS");
     String user = this.scaleProps.getProperty("USER");
     String password = this.scaleProps.getProperty("PASSWORD");
+    System.out.println(password);
     
-    conn = new ZooKeeperInstance(instanceName, zookeepers).getConnector(user, password.getBytes());
+    conn = new ZooKeeperInstance(instanceName, zookeepers).getConnector(user, new PasswordToken(password));
   }
   
   protected void startTimer() {

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java?rev=1454535&r1=1454534&r2=1454535&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
(original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
Fri Mar  8 20:36:31 2013
@@ -67,7 +67,7 @@ public class MiniAccumuloClusterTest {
   
   @Test(timeout = 30000)
   public void test() throws Exception {
-    Connector conn = new ZooKeeperInstance(accumulo.getInstanceName(), accumulo.getZooKeepers()).getConnector("root",
"superSecret");
+    Connector conn = new ZooKeeperInstance(accumulo.getInstanceName(), accumulo.getZooKeepers()).getConnector("root",
new PasswordToken("superSecret"));
     
     conn.tableOperations().create("table1");
     
@@ -82,7 +82,7 @@ public class MiniAccumuloClusterTest {
     
     conn.tableOperations().attachIterator("table1", is);
     
-    Connector uconn = new ZooKeeperInstance(accumulo.getInstanceName(), accumulo.getZooKeepers()).getConnector("user1",
"pass1");
+    Connector uconn = new ZooKeeperInstance(accumulo.getInstanceName(), accumulo.getZooKeepers()).getConnector("user1",
new PasswordToken("pass1"));
     
     BatchWriter bw = uconn.createBatchWriter("table1", new BatchWriterConfig());
     
@@ -138,7 +138,7 @@ public class MiniAccumuloClusterTest {
   @Test(timeout = 30000)
   public void testPerTableClasspath() throws Exception {
     
-    Connector conn = new ZooKeeperInstance(accumulo.getInstanceName(), accumulo.getZooKeepers()).getConnector("root",
"superSecret");
+    Connector conn = new ZooKeeperInstance(accumulo.getInstanceName(), accumulo.getZooKeepers()).getConnector("root",
new PasswordToken("superSecret"));
     
     conn.tableOperations().create("table2");
     



Mime
View raw message