accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject svn commit: r1454653 - in /accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src: main/java/ main/java/AccumuloApp.java test/java/ test/java/ExampleAccumuloUnitTest.java
Date Sat, 09 Mar 2013 04:21:02 GMT
Author: elserj
Date: Sat Mar  9 04:21:00 2013
New Revision: 1454653

URL: http://svn.apache.org/r1454653
Log:
ACCUMULO-1166 Start the merging from the 1.5 branch to keep this version in sync

Modified:
    accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/
  (props changed)
    accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java
    accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/
  (props changed)
    accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java

Propchange: accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar  9 04:21:00 2013
@@ -0,0 +1,2 @@
+/accumulo/branches/1.5/examples/instamo/src/main/java/org/apache/accumulo/instamo:1447769-1454650
+/accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo:1412375-1447767

Modified: accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java
URL: http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java?rev=1454653&r1=1454652&r2=1454653&view=diff
==============================================================================
--- accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java
(original)
+++ accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java
Sat Mar  9 04:21:00 2013
@@ -28,18 +28,19 @@ import org.apache.accumulo.core.client.C
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
 
 public class AccumuloApp {
   
-  public static void run(String instanceName, String zookeepers, String rootPassword, String
args[]) throws Exception {
+  public static void run(String instanceName, String zookeepers, AuthenticationToken token,
String args[]) throws Exception {
     // edit this method to play with Accumulo
 
     Instance instance = new ZooKeeperInstance(instanceName, zookeepers);
     
-    Connector conn = instance.getConnector("root", rootPassword);
+    Connector conn = instance.getConnector("root", token);
     
     conn.tableOperations().create("foo");
     

Propchange: accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar  9 04:21:00 2013
@@ -0,0 +1,2 @@
+/accumulo/branches/1.5/examples/instamo/src/test/java/org/apache/accumulo/instamo:1447769-1454652
+/accumulo/trunk/examples/instamo/src/test/java/org/apache/accumulo/instamo:1413918-1447767

Modified: accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
URL: http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java?rev=1454653&r1=1454652&r2=1454653&view=diff
==============================================================================
--- accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
(original)
+++ accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
Sat Mar  9 04:21:00 2013
@@ -19,6 +19,7 @@
  */
 package ${package};
 
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.test.MiniAccumuloCluster;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -48,7 +49,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(), new PasswordToken("superSecret"),
new String[0]);
   }
   
   @AfterClass



Mime
View raw message