ACCUMULO-1166 Start the merging from the 1.5 branch to keep this version in sync
git-svn-id: https://svn.apache.org/repos/asf/accumulo/contrib/instamo-archetype/trunk@1454653 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java b/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java
index d275672..192ebe2 100644
--- a/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java
+++ b/src/main/resources/archetype-resources/src/main/java/AccumuloApp.java
@@ -28,18 +28,19 @@
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");
diff --git a/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java b/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
index 31102aa..c700045 100644
--- a/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
+++ b/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
@@ -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 @@
@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
