Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48052DA3C for ; Wed, 29 May 2013 23:38:49 +0000 (UTC) Received: (qmail 70653 invoked by uid 500); 29 May 2013 23:38:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 70627 invoked by uid 500); 29 May 2013 23:38:49 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 70618 invoked by uid 99); 29 May 2013 23:38:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 May 2013 23:38:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 May 2013 23:38:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E39AB23888D2; Wed, 29 May 2013 23:38:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1487682 - in /accumulo/contrib/instamo-archetype: branches/1.4/ branches/1.4/src/main/resources/archetype-resources/src/main/java/ branches/1.4/src/main/resources/archetype-resources/src/test/java/ trunk/ trunk/src/main/resources/archetype... Date: Wed, 29 May 2013 23:38:24 -0000 To: commits@accumulo.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130529233824.E39AB23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;