Author: kturner
Date: Wed May 29 23:38:24 2013
New Revision: 1487682
URL: http://svn.apache.org/r1487682
Log:
ACCUMULO-1166 updated MAC package
Modified:
accumulo/contrib/instamo-archetype/branches/1.4/ (props changed)
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/
(props changed)
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/ShellExample.java
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/test/java/
(props changed)
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
accumulo/contrib/instamo-archetype/trunk/ (props changed)
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/MapReduceExample.java
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/ShellExample.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/branches/1.4/
------------------------------------------------------------------------------
svn:mergeinfo = /accumulo/contrib/instamo-archetype/branches/1.5:1487681
Propchange:
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/
------------------------------------------------------------------------------
Merged
/accumulo/contrib/instamo-archetype/branches/1.5/src/main/resources/archetype-resources/src/main/java:r1487681
Modified:
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java?rev=1487682&r1=1487681&r2=1487682&view=diff
==============================================================================
---
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java
(original)
+++
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java
Wed May 29 23:38:24 2013
@@ -22,7 +22,7 @@ package ${package};
import java.io.File;
import java.util.UUID;
-import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.server.test.continuous.ContinuousIngest;
import org.apache.accumulo.server.test.continuous.ContinuousVerify;
import org.apache.commons.io.FileUtils;
Modified:
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/ShellExample.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/ShellExample.java?rev=1487682&r1=1487681&r2=1487682&view=diff
==============================================================================
---
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/ShellExample.java
(original)
+++
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java/ShellExample.java
Wed May 29 23:38:24 2013
@@ -24,7 +24,7 @@ import java.lang.InterruptedException;
import java.lang.Runnable;
import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
public class ShellExample implements Runnable {
Propchange:
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/test/java/
------------------------------------------------------------------------------
Merged
/accumulo/contrib/instamo-archetype/branches/1.5/src/main/resources/archetype-resources/src/test/java:r1487681
Modified:
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java?rev=1487682&r1=1487681&r2=1487682&view=diff
==============================================================================
---
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
(original)
+++
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/test/java/ExampleAccumuloUnitTest.java
Wed May 29 23:38:24 2013
@@ -19,7 +19,7 @@
*/
package ${package};
-import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Propchange: accumulo/contrib/instamo-archetype/trunk/
------------------------------------------------------------------------------
Merged /accumulo/contrib/instamo-archetype/branches/1.5:r1487681
Propchange:
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/
------------------------------------------------------------------------------
Merged
/accumulo/contrib/instamo-archetype/branches/1.5/src/main/resources/archetype-resources/src/main/java:r1487681
Modified:
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java?rev=1487682&r1=1487681&r2=1487682&view=diff
==============================================================================
---
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java
(original)
+++
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/MapReduceExample.java
Wed May 29 23:38:24 2013
@@ -22,7 +22,7 @@ package ${package};
import java.io.File;
import java.util.UUID;
-import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.test.continuous.ContinuousIngest;
import org.apache.accumulo.test.continuous.ContinuousVerify;
import org.apache.commons.io.FileUtils;
Modified:
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/ShellExample.java
URL:
http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/ShellExample.java?rev=1487682&r1=1487681&r2=1487682&view=diff
==============================================================================
---
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/ShellExample.java
(original)
+++
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/ShellExample.java
Wed May 29 23:38:24 2013
@@ -24,7 +24,7 @@ import java.lang.InterruptedException;
import java.lang.Runnable;
import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
public class ShellExample implements Runnable {
Propchange:
accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/test/java/
------------------------------------------------------------------------------
Merged
/accumulo/contrib/instamo-archetype/branches/1.5/src/main/resources/archetype-resources/src/test/java:r1487681
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=1487682&r1=1487681&r2=1487682&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
Wed May 29 23:38:24 2013
@@ -20,7 +20,7 @@
package ${package};
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
