accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject svn commit: r1479153 - in /accumulo/contrib/instamo-archetype/trunk: ./ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/src/main/java/ src/main/resources/archetype-resources/src/test/java/
Date Sat, 04 May 2013 18:49:03 GMT
Author: elserj
Date: Sat May  4 18:48:58 2013
New Revision: 1479153

URL: http://svn.apache.org/r1479153
Log:
ACCUMULO-1166 Merge from the 1.4 stuff up to trunk, accounting for the 1.5.0-RC changes

Modified:
    accumulo/contrib/instamo-archetype/trunk/   (props changed)
    accumulo/contrib/instamo-archetype/trunk/README.md
    accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/pom.xml
    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/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat May  4 18:48:58 2013
@@ -0,0 +1 @@
+/accumulo/contrib/instamo-archetype/branches/1.4:1471206-1479140

Modified: accumulo/contrib/instamo-archetype/trunk/README.md
URL: http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/README.md?rev=1479153&r1=1479152&r2=1479153&view=diff
==============================================================================
--- accumulo/contrib/instamo-archetype/trunk/README.md (original)
+++ accumulo/contrib/instamo-archetype/trunk/README.md Sat May  4 18:48:58 2013
@@ -13,7 +13,9 @@ Usage
 Checkout this project and run a `mvn install`. This will install the archetype
 to your local repository.
 
-Then, change to a new directory and run `mvn archetype:generate
--DarchetypeGroupId=org.apache.accumulo -DarchetypeArtifactId=instamo-archetype`
-and Maven will prompt you to enter the rest of the necessary configuration
+Then, change to a new directory and run 
+
+`mvn archetype:generate -DarchetypeGroupId=org.apache.accumulo -DarchetypeArtifactId=instamo-archetype`
+
+Maven will prompt you to enter the rest of the necessary configuration
 parameters (e.g. groupId, artifactId, version and Java package)

Modified: accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/pom.xml?rev=1479153&r1=1479152&r2=1479153&view=diff
==============================================================================
Binary files - no diff available.

Propchange: accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/src/main/java/
------------------------------------------------------------------------------
  Merged /accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/src/main/java:r1471206-1479140

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=1479153&r1=1479152&r2=1479153&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
Sat May  4 18:48:58 2013
@@ -22,7 +22,7 @@ package ${package};
 import java.io.File;
 import java.util.UUID;
 
-import org.apache.accumulo.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.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=1479153&r1=1479152&r2=1479153&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
Sat May  4 18:48:58 2013
@@ -22,10 +22,9 @@ import java.io.File;
 import java.io.IOException;
 import java.lang.InterruptedException;
 import java.lang.Runnable;
-import java.util.Arrays;
 
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.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.4/src/main/resources/archetype-resources/src/test/java:r1471206-1479140

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=1479153&r1=1479152&r2=1479153&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 May  4 18:48:58 2013
@@ -20,7 +20,7 @@
 package ${package};
 
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.test.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;



Mime
View raw message