accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1442777 - in /accumulo/trunk: examples/instamo/src/main/java/org/apache/accumulo/instamo/ examples/instamo/src/test/java/org/apache/accumulo/instamo/ proxy/src/main/java/org/apache/accumulo/proxy/ proxy/src/test/java/org/apache/accumulo/pr...
Date Tue, 05 Feb 2013 22:42:59 GMT
Author: kturner
Date: Tue Feb  5 22:42:59 2013
New Revision: 1442777

URL: http://svn.apache.org/viewvc?rev=1442777&view=rev
Log:
ACCUMULO-1034 switched camel case of zookeeper in mini accumulo cluster to be consistent w/
zookeeper project

Modified:
    accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java
    accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/instamo/ExampleAccumuloUnitTest.java
    accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
    accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java

Modified: accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java?rev=1442777&r1=1442776&r2=1442777&view=diff
==============================================================================
--- accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java
(original)
+++ accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java
Tue Feb  5 22:42:59 2013
@@ -56,7 +56,7 @@ public class MapReduceExample {
       
       System.out.println("\n   ---- Running Mapred Against Accumulo\n");
       
-      run(la.getInstanceName(), la.getZookeepers(), "pass1234", args);
+      run(la.getInstanceName(), la.getZooKeepers(), "pass1234", args);
       
       System.out.println("\n   ---- Ran Mapred Against Accumulo\n");
       

Modified: accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/instamo/ExampleAccumuloUnitTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/instamo/ExampleAccumuloUnitTest.java?rev=1442777&r1=1442776&r2=1442777&view=diff
==============================================================================
--- accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/instamo/ExampleAccumuloUnitTest.java
(original)
+++ accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/instamo/ExampleAccumuloUnitTest.java
Tue Feb  5 22:42:59 2013
@@ -46,7 +46,7 @@ public class ExampleAccumuloUnitTest {
 
   @Test(timeout = 30000)
   public void test() throws Exception {
-    AccumuloApp.run(accumulo.getInstanceName(), accumulo.getZookeepers(), "superSecret",
new String[0]);
+    AccumuloApp.run(accumulo.getInstanceName(), accumulo.getZooKeepers(), "superSecret",
new String[0]);
   }
   
   @AfterClass

Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java?rev=1442777&r1=1442776&r2=1442777&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java Tue Feb  5 22:42:59
2013
@@ -84,7 +84,7 @@ public class Proxy {
       final MiniAccumuloCluster accumulo = new MiniAccumuloCluster(folder, "secret");
       accumulo.start();
       opts.prop.setProperty(api+".instancename", accumulo.getInstanceName());
-      opts.prop.setProperty(api+".zookeepers", accumulo.getZookeepers());
+      opts.prop.setProperty(api+".zookeepers", accumulo.getZooKeepers());
       Runtime.getRuntime().addShutdownHook(new Thread() {
         public void start() {
           try {

Modified: accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1442777&r1=1442776&r2=1442777&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original)
+++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Tue Feb 
5 22:42:59 2013
@@ -122,7 +122,7 @@ public class SimpleTest {
   
     Properties props = new Properties();
     props.put("org.apache.accumulo.proxy.ProxyServer.instancename", accumulo.getInstanceName());
-    props.put("org.apache.accumulo.proxy.ProxyServer.zookeepers", accumulo.getZookeepers());
+    props.put("org.apache.accumulo.proxy.ProxyServer.zookeepers", accumulo.getZooKeepers());
     
     protocolClass = getRandomProtocol();
     System.out.println(protocolClass.getName());

Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java?rev=1442777&r1=1442776&r2=1442777&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java Tue
Feb  5 22:42:59 2013
@@ -346,7 +346,7 @@ public class MiniAccumuloCluster {
    * @return zookeeper connection string
    */
   
-  public String getZookeepers() {
+  public String getZooKeepers() {
     return "localhost:" + zooKeeperPort;
   }
   

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java?rev=1442777&r1=1442776&r2=1442777&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
(original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
Tue Feb  5 22:42:59 2013
@@ -95,16 +95,16 @@ public class ZooLockTest {
 
   @Test(timeout = 10000)
   public void testDeleteParent() throws Exception {
-    accumulo.getZookeepers();
+    accumulo.getZooKeepers();
     
     String parent = "/zltest-" + this.hashCode() + "-l" + pdCount++;
 
     
-    ZooLock zl = new ZooLock(accumulo.getZookeepers(), 30000, "digest", "secret".getBytes(),
parent);
+    ZooLock zl = new ZooLock(accumulo.getZooKeepers(), 30000, "digest", "secret".getBytes(),
parent);
 
     Assert.assertFalse(zl.isLocked());
 
-    ZooReaderWriter zk = ZooReaderWriter.getInstance(accumulo.getZookeepers(), 30000, "digest",
"secret".getBytes());
+    ZooReaderWriter zk = ZooReaderWriter.getInstance(accumulo.getZooKeepers(), 30000, "digest",
"secret".getBytes());
     
     // intentionally created parent after lock
     zk.mkdirs(parent);
@@ -127,11 +127,11 @@ public class ZooLockTest {
   
   @Test(timeout = 10000)
   public void testNoParent() throws Exception {
-    accumulo.getZookeepers();
+    accumulo.getZooKeepers();
     
     String parent = "/zltest-" + this.hashCode() + "-l" + pdCount++;
     
-    ZooLock zl = new ZooLock(accumulo.getZookeepers(), 30000, "digest", "secret".getBytes(),
parent);
+    ZooLock zl = new ZooLock(accumulo.getZooKeepers(), 30000, "digest", "secret".getBytes(),
parent);
 
     Assert.assertFalse(zl.isLocked());
     
@@ -149,14 +149,14 @@ public class ZooLockTest {
 
   @Test(timeout = 10000)
   public void testDeleteLock() throws Exception {
-    accumulo.getZookeepers();
+    accumulo.getZooKeepers();
     
     String parent = "/zltest-" + this.hashCode() + "-l" + pdCount++;
     
-    ZooReaderWriter zk = ZooReaderWriter.getInstance(accumulo.getZookeepers(), 30000, "digest",
"secret".getBytes());
+    ZooReaderWriter zk = ZooReaderWriter.getInstance(accumulo.getZooKeepers(), 30000, "digest",
"secret".getBytes());
     zk.mkdirs(parent);
     
-    ZooLock zl = new ZooLock(accumulo.getZookeepers(), 30000, "digest", "secret".getBytes(),
parent);
+    ZooLock zl = new ZooLock(accumulo.getZooKeepers(), 30000, "digest", "secret".getBytes(),
parent);
 
     Assert.assertFalse(zl.isLocked());
     
@@ -182,14 +182,14 @@ public class ZooLockTest {
   
   @Test(timeout = 10000)
   public void testDeleteWaiting() throws Exception {
-    accumulo.getZookeepers();
+    accumulo.getZooKeepers();
     
     String parent = "/zltest-" + this.hashCode() + "-l" + pdCount++;
     
-    ZooReaderWriter zk = ZooReaderWriter.getInstance(accumulo.getZookeepers(), 30000, "digest",
"secret".getBytes());
+    ZooReaderWriter zk = ZooReaderWriter.getInstance(accumulo.getZooKeepers(), 30000, "digest",
"secret".getBytes());
     zk.mkdirs(parent);
     
-    ZooLock zl = new ZooLock(accumulo.getZookeepers(), 30000, "digest", "secret".getBytes(),
parent);
+    ZooLock zl = new ZooLock(accumulo.getZooKeepers(), 30000, "digest", "secret".getBytes(),
parent);
 
     Assert.assertFalse(zl.isLocked());
     
@@ -205,7 +205,7 @@ public class ZooLockTest {
     Assert.assertNull(lw.reason);
     
     
-    ZooLock zl2 = new ZooLock(accumulo.getZookeepers(), 30000, "digest", "secret".getBytes(),
parent);
+    ZooLock zl2 = new ZooLock(accumulo.getZooKeepers(), 30000, "digest", "secret".getBytes(),
parent);
     
     TestALW lw2 = new TestALW();
     
@@ -214,7 +214,7 @@ public class ZooLockTest {
     Assert.assertFalse(lw2.locked);
     Assert.assertFalse(zl2.isLocked());
     
-    ZooLock zl3 = new ZooLock(accumulo.getZookeepers(), 30000, "digest", "secret".getBytes(),
parent);
+    ZooLock zl3 = new ZooLock(accumulo.getZooKeepers(), 30000, "digest", "secret".getBytes(),
parent);
     
     TestALW lw3 = new TestALW();
     
@@ -249,16 +249,16 @@ public class ZooLockTest {
   
   @Test(timeout = 10000)
   public void testUnexpectedEvent() throws Exception {
-    accumulo.getZookeepers();
+    accumulo.getZooKeepers();
     
     String parent = "/zltest-" + this.hashCode() + "-l" + pdCount++;
     
-    ZooKeeper zk = new ZooKeeper(accumulo.getZookeepers(), 30000, null);
+    ZooKeeper zk = new ZooKeeper(accumulo.getZooKeepers(), 30000, null);
     zk.addAuthInfo("digest", "secret".getBytes());
     
     zk.create(parent, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
     
-    ZooLock zl = new ZooLock(accumulo.getZookeepers(), 30000, "digest", "secret".getBytes(),
parent);
+    ZooLock zl = new ZooLock(accumulo.getZooKeepers(), 30000, "digest", "secret".getBytes(),
parent);
     
     Assert.assertFalse(zl.isLocked());
     
@@ -292,9 +292,9 @@ public class ZooLockTest {
     
     String parent = "/zltest-" + this.hashCode() + "-l" + pdCount++;
     
-    ZooLock zl = new ZooLock(accumulo.getZookeepers(), 1000, "digest", "secret".getBytes(),
parent);
+    ZooLock zl = new ZooLock(accumulo.getZooKeepers(), 1000, "digest", "secret".getBytes(),
parent);
 
-    ZooKeeper zk = new ZooKeeper(accumulo.getZookeepers(), 1000, null);
+    ZooKeeper zk = new ZooKeeper(accumulo.getZooKeepers(), 1000, null);
     zk.addAuthInfo("digest", "secret".getBytes());
     
     for (int i = 0; i < 10; i++) {

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=1442777&r1=1442776&r2=1442777&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
Tue Feb  5 22:42:59 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",
"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",
"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",
"superSecret");
     
     conn.tableOperations().create("table2");
     



Mime
View raw message