svn commit: r1479227 - in /accumulo/trunk: proxy/src/main/java/org/apache/accumulo/proxy/ proxy/src/test/java/org/apache/accumulo/proxy/ server/src/main/java/org/apache/accumulo/server/mini/ server/sr
Author: elserj
Date: Sun May 5 01:55:52 2013
New Revision: 1479227
URL: http://svn.apache.org/r1479227
Log:
ACCUMULO-1367 Applying patch from Corey Nolet to make MAC a little more
configurable.
Added:
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloConfigTest.java
(with props)
Modified:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloConfig.java
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloClusterTest.java
accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
Modified:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java?rev=1479227&r1=1479226&r2=1479227&view=diff
==
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
(original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java Sun
May 5 01:55:52 2013
@@ -41,7 +41,7 @@ import com.google.common.io.Files;
public class Proxy {
- private static final Logger log = Logger.getLogger(Proxy.class);
+ private static final Logger log = Logger.getLogger(Proxy.class);
public static class PropertiesConverter implements
IStringConverter {
@Override
@@ -96,8 +96,8 @@ public class Proxy {
final File folder = Files.createTempDir();
final MiniAccumuloCluster accumulo = new MiniAccumuloCluster(folder,
"secret");
accumulo.start();
- opts.prop.setProperty("instance", accumulo.getInstanceName());
- opts.prop.setProperty("zookeepers", accumulo.getZooKeepers());
+ opts.prop.setProperty("instance",
accumulo.getConfig().getInstanceName());
+ opts.prop.setProperty("zookeepers",
accumulo.getConfig().getZooKeepers());
Runtime.getRuntime().addShutdownHook(new Thread() {
public void start() {
try {
@@ -110,7 +110,7 @@ public class Proxy {
}
});
}
-
+
Class protoFactoryClass =
Class.forName(opts.prop.getProperty("protocolFactory",
TCompactProtocol.Factory.class.getName()))
.asSubclass(TProtocolFactory.class);
int port = Integer.parseInt(opts.prop.getProperty("port"));
@@ -124,7 +124,7 @@ public class Proxy {
// create the implementor
Object impl =
implementor.getConstructor(Properties.class).newInstance(properties);
-
+
Class proxyProcClass = Class.forName(api.getName() + "$Processor");
Class proxyIfaceClass = Class.forName(api.getName() + "$Iface");
@SuppressWarnings("unchecked")
Modified:
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1479227&r1=1479226&r2=1479227&view=diff
==
---
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
(original)
+++
accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
Sun May 5 01:55:52 2013
@@ -141,8 +141,8 @@ public class SimpleTest {
accumulo.start();
Properties props = new Properties();
-props.put("instance", accumulo.getInstanceName());
-props.put("zookeepers", accumulo.getZooKeepers());
+props.put("instance", accumulo.getConfig().getInstanceName());
+props.put("zookeepers", accumulo.getConfig().getZooKeepers());
props.put("tokenClass", PasswordToken.class.getName());
protocolClass = getRandomProtocol();
@@ -873,5 +873,4 @@ public class SimpleTest {
accumulo.stop();
folder.delete();
}
-
}
Modified:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java?rev=1479227&r1=1479226&r2=1479227&view=diff
==
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
svn commit: r1479211 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/mock/ core/src/main/java/org/apache/accumulo/core/util/shell/ core/src/test/java/org/ap
Author: ctubbsii
Date: Sat May 4 22:44:19 2013
New Revision: 1479211
URL: http://svn.apache.org/r1479211
Log:
ACCUMULO-1348 merged patch to trunk
Added:
accumulo/trunk/core/src/test/resources/shelltest.txt
- copied unchanged from r1479204,
accumulo/branches/1.5/core/src/test/resources/shelltest.txt
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/pom.xml
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1479204
Propchange: accumulo/trunk/assemble/
--
Merged /accumulo/branches/1.5/assemble:r1479204
Propchange: accumulo/trunk/core/
--
Merged /accumulo/branches/1.5/core:r1479204
Modified: accumulo/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1479211&r1=1479210&r2=1479211&view=diff
==
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Sat May 4 22:44:19 2013
@@ -109,6 +109,19 @@
+
+
+
+ org.apache.rat
+ apache-rat-plugin
+
+
+ src/test/resources/shelltest.txt
+
+
+
+
+
org.apache.maven.plugins
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java?rev=1479211&r1=1479210&r2=1479211&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
Sat May 4 22:44:19 2013
@@ -78,8 +78,13 @@ public class MockShell extends Shell {
if (execFile != null) {
java.util.Scanner scanner = new java.util.Scanner(new File(execFile));
- while (scanner.hasNextLine())
-execCommand(scanner.nextLine(), true, isVerbose());
+ try {
+while (scanner.hasNextLine() && !hasExited()) {
+ execCommand(scanner.nextLine(), true, isVerbose());
+}
+ } finally {
+scanner.close();
+ }
} else if (execCommand != null) {
for (String command : execCommand.split("\n")) {
execCommand(command, true, isVerbose());
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1479211&r1=1479210&r2=1479211&view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Sat May 4 22:44:19 2013
@@ -250,7 +250,7 @@ public class Shell extends ShellOptions
if (sysUser == null)
sysUser = "root";
String user = cl.getOptionValue(usernameOption.getOpt(), sysUser);
-
+
String passw = cl.getOptionValue(passwOption.getOpt(), null);
tabCompletion = !cl.hasOption(tabCompleteOption.getLongOpt());
String[] loginOptions = cl.getOptionValues(loginOption.getOpt());
@@ -265,13 +265,13 @@ public class Shell extends ShellOptions
if (loginOptions == null && cl.hasOption(tokenOption.getOpt()))
throw new IllegalArgumentException("Must supply '-" +
loginOption.getOpt() + "' option with '-" + tokenOption.getOpt() + "' option");
-
+
if (passw != null && cl.hasOption(tokenOption.getOpt()))
throw new IllegalArgumentException("Can not supply '-" +
passwOption.getOpt() + "' option with '-" + tokenOption.getOpt() + "' option");
-
+
if (user == null)
throw new MissingArgumentException(usernameOption);
-
+
if (loginOptions != null && cl.hasOption(tok
svn commit: r1479204 - in /accumulo/branches/1.5/core: ./ src/main/java/org/apache/accumulo/core/client/mock/ src/main/java/org/apache/accumulo/core/util/shell/ src/test/java/org/apache/accumulo/core/
Author: ctubbsii
Date: Sat May 4 22:21:14 2013
New Revision: 1479204
URL: http://svn.apache.org/r1479204
Log:
ACCUMULO-1348 Applied patch from Mike Drob to 1.5 branch
Added:
accumulo/branches/1.5/core/src/test/resources/shelltest.txt
Modified:
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Modified: accumulo/branches/1.5/core/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1479204&r1=1479203&r2=1479204&view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Sat May 4 22:21:14 2013
@@ -109,6 +109,19 @@
+
+
+
+ org.apache.rat
+ apache-rat-plugin
+
+
+ src/test/resources/shelltest.txt
+
+
+
+
+
org.apache.maven.plugins
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java?rev=1479204&r1=1479203&r2=1479204&view=diff
==
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
Sat May 4 22:21:14 2013
@@ -78,8 +78,13 @@ public class MockShell extends Shell {
if (execFile != null) {
java.util.Scanner scanner = new java.util.Scanner(new File(execFile));
- while (scanner.hasNextLine())
-execCommand(scanner.nextLine(), true, isVerbose());
+ try {
+while (scanner.hasNextLine() && !hasExited()) {
+ execCommand(scanner.nextLine(), true, isVerbose());
+}
+ } finally {
+scanner.close();
+ }
} else if (execCommand != null) {
for (String command : execCommand.split("\n")) {
execCommand(command, true, isVerbose());
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1479204&r1=1479203&r2=1479204&view=diff
==
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Sat May 4 22:21:14 2013
@@ -246,7 +246,7 @@ public class Shell extends ShellOptions
if (sysUser == null)
sysUser = "root";
String user = cl.getOptionValue(usernameOption.getOpt(), sysUser);
-
+
String passw = cl.getOptionValue(passwOption.getOpt(), null);
tabCompletion = !cl.hasOption(tabCompleteOption.getLongOpt());
String[] loginOptions = cl.getOptionValues(loginOption.getOpt());
@@ -261,13 +261,13 @@ public class Shell extends ShellOptions
if (loginOptions == null && cl.hasOption(tokenOption.getOpt()))
throw new IllegalArgumentException("Must supply '-" +
loginOption.getOpt() + "' option with '-" + tokenOption.getOpt() + "' option");
-
+
if (passw != null && cl.hasOption(tokenOption.getOpt()))
throw new IllegalArgumentException("Can not supply '-" +
passwOption.getOpt() + "' option with '-" + tokenOption.getOpt() + "' option");
-
+
if (user == null)
throw new MissingArgumentException(usernameOption);
-
+
if (loginOptions != null && cl.hasOption(tokenOption.getOpt())) {
Properties props = new Properties();
for (String loginOption : loginOptions)
@@ -279,7 +279,7 @@ public class Shell extends ShellOptions
this.token =
Class.forName(cl.getOptionValue(tokenOption.getOpt())).asSubclass(AuthenticationToken.class).newInstance();
this.token.init(props);
}
-
+
if (!cl.hasOption(fakeOption.getLongOpt())) {
DistributedTrace.enable(instance, new
ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut()),
"shell", InetAddress.getLocalHost()
.getHostName());
@@ -438,8 +438,13 @@ public class Shell extends ShellOptions
if (execFile != null) {
java.util.Scanner scanner = new java.util.Scanner(new File(execFile));
- while (scanner.hasNextLine())
-execCommand(scanner.nextLine(), true, isVerbose());
+ try {
+while (scanner.hasNextLine() && !hasExited()) {
svn commit: r1479159 - in /accumulo/contrib/instamo-archetype/branches/1.5: ./ pom.xml
Author: elserj Date: Sat May 4 19:27:13 2013 New Revision: 1479159 URL: http://svn.apache.org/r1479159 Log: ACCUMULO-1166 Create a 1.5 branch against 1.5.1-SNAPSHOT Added: accumulo/contrib/instamo-archetype/branches/1.5/ - copied from r1479154, accumulo/contrib/instamo-archetype/tags/1.5.0-RC/ Modified: accumulo/contrib/instamo-archetype/branches/1.5/pom.xml Modified: accumulo/contrib/instamo-archetype/branches/1.5/pom.xml URL: http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/branches/1.5/pom.xml?rev=1479159&r1=1479154&r2=1479159&view=diff == Binary files - no diff available.
svn commit: r1479158 - in /accumulo/contrib/instamo-archetype/trunk: pom.xml src/main/resources/archetype-resources/pom.xml
Author: elserj Date: Sat May 4 19:11:30 2013 New Revision: 1479158 URL: http://svn.apache.org/r1479158 Log: ACCUMULO-1166 Promote trunk to 1.6.0-SNAPSHOT Modified: accumulo/contrib/instamo-archetype/trunk/pom.xml accumulo/contrib/instamo-archetype/trunk/src/main/resources/archetype-resources/pom.xml Modified: accumulo/contrib/instamo-archetype/trunk/pom.xml URL: http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/trunk/pom.xml?rev=1479158&r1=1479157&r2=1479158&view=diff == Binary files - no diff available. 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=1479158&r1=1479157&r2=1479158&view=diff == Binary files - no diff available.
svn commit: r1479154 - in /accumulo/contrib/instamo-archetype/tags: ./ 1.5.0-RC/ 1.5.0-RC/pom.xml
Author: elserj Date: Sat May 4 18:52:01 2013 New Revision: 1479154 URL: http://svn.apache.org/r1479154 Log: ACCUMULO-1166 Copy trunk to tags/1.5.0-RC to mimic the 1.5.0-RC that Accumulo itself has Added: accumulo/contrib/instamo-archetype/tags/ accumulo/contrib/instamo-archetype/tags/1.5.0-RC/ - copied from r1479153, accumulo/contrib/instamo-archetype/trunk/ Modified: accumulo/contrib/instamo-archetype/tags/1.5.0-RC/pom.xml Modified: accumulo/contrib/instamo-archetype/tags/1.5.0-RC/pom.xml URL: http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/tags/1.5.0-RC/pom.xml?rev=1479154&r1=1479153&r2=1479154&view=diff == Binary files - no diff available.
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-resou
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;
-i
svn commit: r1479139 - in /accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources: pom.xml src/main/java/MapReduceExample.java src/main/java/ShellExample.java src/test/
Author: elserj
Date: Sat May 4 16:57:20 2013
New Revision: 1479139
URL: http://svn.apache.org/r1479139
Log:
ACCUMULO-1166 Account for the package change of MAC
Modified:
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/pom.xml
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/ExampleAccumuloUnitTest.java
Modified:
accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/contrib/instamo-archetype/branches/1.4/src/main/resources/archetype-resources/pom.xml?rev=1479139&r1=1479138&r2=1479139&view=diff
==
Binary files - no diff available.
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=1479139&r1=1479138&r2=1479139&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
Sat May 4 16:57:20 2013
@@ -22,9 +22,9 @@ package ${package};
import java.io.File;
import java.util.UUID;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
import org.apache.accumulo.server.test.continuous.ContinuousIngest;
import org.apache.accumulo.server.test.continuous.ContinuousVerify;
-import org.apache.accumulo.test.MiniAccumuloCluster;
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=1479139&r1=1479138&r2=1479139&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
Sat May 4 16:57:20 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 {
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=1479139&r1=1479138&r2=1479139&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
Sat May 4 16:57:20 2013
@@ -19,7 +19,7 @@
*/
package ${package};
-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;
svn commit: r1479131 - in /accumulo/branches/1.5: assemble/pom.xml core/pom.xml examples/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.xml test/pom.xml tr
Author: ctubbsii Date: Sat May 4 15:37:11 2013 New Revision: 1479131 URL: http://svn.apache.org/r1479131 Log: [maven-release-plugin] prepare for next development iteration Modified: accumulo/branches/1.5/assemble/pom.xml accumulo/branches/1.5/core/pom.xml accumulo/branches/1.5/examples/pom.xml accumulo/branches/1.5/examples/simple/pom.xml accumulo/branches/1.5/fate/pom.xml accumulo/branches/1.5/pom.xml accumulo/branches/1.5/proxy/pom.xml accumulo/branches/1.5/server/pom.xml accumulo/branches/1.5/start/pom.xml accumulo/branches/1.5/test/pom.xml accumulo/branches/1.5/trace/pom.xml Modified: accumulo/branches/1.5/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479131&r1=1479130&r2=1479131&view=diff == --- accumulo/branches/1.5/assemble/pom.xml (original) +++ accumulo/branches/1.5/assemble/pom.xml Sat May 4 15:37:11 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0 +1.5.1-SNAPSHOT accumulo-assemble pom Modified: accumulo/branches/1.5/core/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1479131&r1=1479130&r2=1479131&view=diff == --- accumulo/branches/1.5/core/pom.xml (original) +++ accumulo/branches/1.5/core/pom.xml Sat May 4 15:37:11 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0 +1.5.1-SNAPSHOT accumulo-core Core Modified: accumulo/branches/1.5/examples/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1479131&r1=1479130&r2=1479131&view=diff == --- accumulo/branches/1.5/examples/pom.xml (original) +++ accumulo/branches/1.5/examples/pom.xml Sat May 4 15:37:11 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0 +1.5.1-SNAPSHOT accumulo-examples pom Modified: accumulo/branches/1.5/examples/simple/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1479131&r1=1479130&r2=1479131&view=diff == --- accumulo/branches/1.5/examples/simple/pom.xml (original) +++ accumulo/branches/1.5/examples/simple/pom.xml Sat May 4 15:37:11 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-examples -1.5.0 +1.5.1-SNAPSHOT accumulo-examples-simple Simple Examples Modified: accumulo/branches/1.5/fate/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1479131&r1=1479130&r2=1479131&view=diff == --- accumulo/branches/1.5/fate/pom.xml (original) +++ accumulo/branches/1.5/fate/pom.xml Sat May 4 15:37:11 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0 +1.5.1-SNAPSHOT accumulo-fate Fate Modified: accumulo/branches/1.5/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1479131&r1=1479130&r2=1479131&view=diff == --- accumulo/branches/1.5/pom.xml (original) +++ accumulo/branches/1.5/pom.xml Sat May 4 15:37:11 2013 @@ -24,7 +24,7 @@ org.apache.accumulo accumulo - 1.5.0 + 1.5.1-SNAPSHOT pom Apache Accumulo Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process. @@ -83,9 +83,9 @@ test - scm:svn:http://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC - scm:svn:https://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC -http://svn.apache.org/viewvc/accumulo/tags/1.5.0-RC + scm:svn:http://svn.apache.org/repos/asf/accumulo/branches/1.5 + scm:svn:https://svn.apache.org/repos/asf/accumulo/branches/1.5 +http://svn.apache.org/viewvc/accumulo/branches/1.5 JIRA Modified: accumulo/branches/1.5/proxy/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/pom.xml?rev=1479131&r1=1479130&r2=1479131&view=diff == --- accumulo/branches/1.5/proxy/pom.xml (original) +++ accumulo/branches/1.5/proxy/pom.xml Sat May 4 15:37:11 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0 +1.5.1-SNAPSHOT accumulo-proxy Proxy Modified: accumulo/branches/1.5/server/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/pom.xml?rev=1479131&r1=
svn commit: r1479129 - /accumulo/tags/1.5.0-RC/
Author: ctubbsii Date: Sat May 4 15:35:58 2013 New Revision: 1479129 URL: http://svn.apache.org/r1479129 Log: [maven-release-plugin] copy for tag 1.5.0-RC Added: accumulo/tags/1.5.0-RC/ (props changed) - copied from r1479128, accumulo/branches/1.5/ Propchange: accumulo/tags/1.5.0-RC/ -- --- svn:ignore (added) +++ svn:ignore Sat May 4 15:35:58 2013 @@ -0,0 +1,8 @@ +logs +walogs +target +.idea +.project +.settings +.pydevproject +accumulo.iml Propchange: accumulo/tags/1.5.0-RC/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sat May 4 15:35:58 2013 @@ -0,0 +1,20 @@ +/accumulo/branches/1.3:1309369,1328076,1330246,1330264,1330944,1349971,1354669 +/accumulo/branches/1.3/src:1309369,1328076,1330246,1349971,1354669 +/accumulo/branches/1.4:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627,1468531,1468958 +/accumulo/branches/1.4/src:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627,1468531,1468958 +/accumulo/branches/1.4.2:1399210,1402681 +/accumulo/branches/1.4.2/src:1399210,1402681 +/accumulo/branches/ACCUMULO-259:1343822-1438343 +/accumulo/branches/ACCUMULO-259-polishing:1449464-1451386 +/accumulo/branches/ACCUMULO-672:1357826,1357829,1357842,1357858,1358236,1359163 +/accumulo/trunk:1447829,1448390,1451208,1456618,1456635,1457910,1463798 +/accumulo/trunk/src:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721 +/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632 +/incubator/accumulo/branches/1.3/src:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632 +/incubator/accumulo/branches/1.3.5rc:1209938 +/incubator/accumulo/branches/1.3.5rc/src:1209938 +/incubator/accumulo/branches/1.4:1201902-1305402 +/incubator/accumulo/branches/1.4/src:1201899-1305402 +/incubator/accumulo/branches/1.4.0rc:1304025,1305326 +/incubator/accumulo/branches/1.4.0rc/src:1304025,1305326 +/incubator/accumulo/trunk/src:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495
svn commit: r1479128 - in /accumulo/branches/1.5: assemble/pom.xml core/pom.xml examples/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.xml test/pom.xml tr
Author: ctubbsii Date: Sat May 4 15:34:30 2013 New Revision: 1479128 URL: http://svn.apache.org/r1479128 Log: [maven-release-plugin] prepare release 1.5.0-RC Modified: accumulo/branches/1.5/assemble/pom.xml accumulo/branches/1.5/core/pom.xml accumulo/branches/1.5/examples/pom.xml accumulo/branches/1.5/examples/simple/pom.xml accumulo/branches/1.5/fate/pom.xml accumulo/branches/1.5/pom.xml accumulo/branches/1.5/proxy/pom.xml accumulo/branches/1.5/server/pom.xml accumulo/branches/1.5/start/pom.xml accumulo/branches/1.5/test/pom.xml accumulo/branches/1.5/trace/pom.xml Modified: accumulo/branches/1.5/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479128&r1=1479127&r2=1479128&view=diff == --- accumulo/branches/1.5/assemble/pom.xml (original) +++ accumulo/branches/1.5/assemble/pom.xml Sat May 4 15:34:30 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0-SNAPSHOT +1.5.0 accumulo-assemble pom Modified: accumulo/branches/1.5/core/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1479128&r1=1479127&r2=1479128&view=diff == --- accumulo/branches/1.5/core/pom.xml (original) +++ accumulo/branches/1.5/core/pom.xml Sat May 4 15:34:30 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0-SNAPSHOT +1.5.0 accumulo-core Core Modified: accumulo/branches/1.5/examples/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1479128&r1=1479127&r2=1479128&view=diff == --- accumulo/branches/1.5/examples/pom.xml (original) +++ accumulo/branches/1.5/examples/pom.xml Sat May 4 15:34:30 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0-SNAPSHOT +1.5.0 accumulo-examples pom Modified: accumulo/branches/1.5/examples/simple/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1479128&r1=1479127&r2=1479128&view=diff == --- accumulo/branches/1.5/examples/simple/pom.xml (original) +++ accumulo/branches/1.5/examples/simple/pom.xml Sat May 4 15:34:30 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-examples -1.5.0-SNAPSHOT +1.5.0 accumulo-examples-simple Simple Examples Modified: accumulo/branches/1.5/fate/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1479128&r1=1479127&r2=1479128&view=diff == --- accumulo/branches/1.5/fate/pom.xml (original) +++ accumulo/branches/1.5/fate/pom.xml Sat May 4 15:34:30 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.0-SNAPSHOT +1.5.0 accumulo-fate Fate Modified: accumulo/branches/1.5/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1479128&r1=1479127&r2=1479128&view=diff == --- accumulo/branches/1.5/pom.xml (original) +++ accumulo/branches/1.5/pom.xml Sat May 4 15:34:30 2013 @@ -24,7 +24,7 @@ org.apache.accumulo accumulo - 1.5.0-SNAPSHOT + 1.5.0 pom Apache Accumulo Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process. @@ -83,9 +83,9 @@ test - scm:svn:http://svn.apache.org/repos/asf/accumulo/branches/1.5 - scm:svn:https://svn.apache.org/repos/asf/accumulo/branches/1.5 -http://svn.apache.org/viewvc/accumulo/branches/1.5 + scm:svn:http://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC + scm:svn:https://svn.apache.org/repos/asf/accumulo/tags/1.5.0-RC +http://svn.apache.org/viewvc/accumulo/tags/1.5.0-RC JIRA @@ -502,7 +502,7 @@ - + @@ -515,7 +515,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -541,7 +541,7 @@ -
svn commit: r1479127 - /accumulo/file
Author: ctubbsii Date: Sat May 4 15:17:57 2013 New Revision: 1479127 URL: http://svn.apache.org/r1479127 Log: ACCUMULO-970 remove dummy file added in prev test commit Removed: accumulo/file
svn commit: r1479124 - /accumulo/branches/1.5/proxy/README
Author: elserj
Date: Sat May 4 15:14:30 2013
New Revision: 1479124
URL: http://svn.apache.org/r1479124
Log:
ACCUMULO-1375 Pull the changes from 1.4 (which came from 1.6) to 1.5
Modified:
accumulo/branches/1.5/proxy/README (contents, props changed)
Modified: accumulo/branches/1.5/proxy/README
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/README?rev=1479124&r1=1479123&r2=1479124&view=diff
==
--- accumulo/branches/1.5/proxy/README (original)
+++ accumulo/branches/1.5/proxy/README Sat May 4 15:14:30 2013
@@ -44,9 +44,9 @@ Accumulo 1.5 instance, or when run stand
4. Execution
-Connect to the Accumulo installation directory and run the following command.
+Run the following command.
- ${ACCUMULO_HOME}/bin/accumulo proxy -p proxy/proxy.properties
+ ${ACCUMULO_HOME}/bin/accumulo proxy -p ${ACCUMULO_HOME}/proxy/proxy.properties
5. Clients
Propchange: accumulo/branches/1.5/proxy/README
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat May 4 15:14:30 2013
@@ -0,0 +1,20 @@
+/accumulo/branches/1.3/proxy/README:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src/proxy/README:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4/proxy/README:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627,1468531,1468958
+/accumulo/branches/1.4/src/proxy/README:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627,1467288-1479121
+/accumulo/branches/1.4.2/proxy/README:1399210,1402681
+/accumulo/branches/1.4.2/src/proxy/README:1399210,1402681
+/accumulo/branches/ACCUMULO-259/proxy/README:1343822-1438343
+/accumulo/branches/ACCUMULO-259-polishing/proxy/README:1449464-1451386
+/accumulo/branches/ACCUMULO-672/proxy/README:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk/proxy/README:1447829,1448390,1451208,1456618,1456635,1457910,1463798
+/accumulo/trunk/src/proxy/README:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721
+/incubator/accumulo/branches/1.3/proxy/README:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3/src/proxy/README:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
+/incubator/accumulo/branches/1.3.5rc/proxy/README:1209938
+/incubator/accumulo/branches/1.3.5rc/src/proxy/README:1209938
+/incubator/accumulo/branches/1.4/proxy/README:1201902-1305402
+/incubator/accumulo/branches/1.4/src/proxy/README:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc/proxy/README:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src/proxy/README:1304025,1305326
+/incubator/accumulo/trunk/src/proxy/README:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495
svn commit: r1479123 - /accumulo/file
Author: ctubbsii Date: Sat May 4 15:13:37 2013 New Revision: 1479123 URL: http://svn.apache.org/r1479123 Log: ACCUMULO-970 add dummy file to test commit, in preparation for release Added: accumulo/file Added: accumulo/file URL: http://svn.apache.org/viewvc/accumulo/file?rev=1479123&view=auto == (empty)
svn commit: r1479113 - /accumulo/branches/1.4/src/proxy/README
Author: elserj
Date: Sat May 4 14:18:52 2013
New Revision: 1479113
URL: http://svn.apache.org/r1479113
Log:
ACCUMULO-1375 Pull back the final proxy/README from trunk to 1.4
Modified:
accumulo/branches/1.4/src/proxy/README
Modified: accumulo/branches/1.4/src/proxy/README
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/proxy/README?rev=1479113&r1=1479112&r2=1479113&view=diff
==
--- accumulo/branches/1.4/src/proxy/README (original)
+++ accumulo/branches/1.4/src/proxy/README Sat May 4 14:18:52 2013
@@ -16,33 +16,47 @@ Notice:Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
-This is a thrift proxy server to interact with the Accumulo database.
+This module provides proxy server for Apache Accumulo. It enables using
languages
+other than Java to interact with the database.
1. Building
-To compile, you must first install Thrift 0.6.1.
+The proxy server is built by the Accumulo build process. Read ../../README
+for more information.
-After thrift is installed, compile the project with:
-mvn clean install
-This will compile the thrift and java files, and will provide C++, python and
ruby bindings.
+2. Installation
-2. Proxy Server Execution
+The proxy server is installed during the Accumulo installation process. Read
../../README
+for more information.
-Please note that the proxy can only function correctly when connected to an
Accumulo 1.4 instance, or when run standalone in the Mock configuration.
-To run the server, edit the configuration file with parameters suited for your
Accumulo installation. If you wish to instead use an in-memory Mock instance,
set:
- useMockInstance=true
-This option will override any "real" Accumulo instance information.
+3. Configuration
-Once the properties file is configured correctly, run this command:
-./bin/accumulo proxy -p proxy/proxy.properties
+Please note the proxy server only functions correctly when connected to an
+Accumulo 1.4 instance, or when run standalone in the Mock configuration.
-3. Clients
+ - Edit the proxy.properties file.
+- Change the useMockInstance value to 'true' if you wish to use an
in-memory Mock instance.
+- Change the useMiniAccumulo value to 'true' if you wish to use a Mini
Accumulo Cluster.
+- When using a "real" Accumulo instance:
+- Ensure useMockInstance and useMiniAccumulo are both set to 'false'
+- Set the instance name
+- Set the list of ZooKeepers
-An example java client is incuded with this distribution in the class
TestProxyClient. Also the unit tests included show how to use the proxy. Normal
Accumulo APIs are emulated whereever possible.
+4. Execution
-Additional client examples can be found in the examples directory. These
clients are tested and function, however, the setup for each language is beyond
the scope of this document currently.
+Run the following command.
-In general, to create a client for a new language one must compile the
proxy.thrift API (along with the accumulo core data.thrift API) to the language
of choice.
-Then one includes the resulting generated code along with the thrift core
library for that language to use the proxy.
+ ${ACCUMULO_HOME}/bin/accumulo proxy -p ${ACCUMULO_HOME}/proxy/proxy.properties
-As a note, many of the clients here assume "secret" is your root password.
Protip: to make the examples work, change this code to your password, do not
change your root password to "secret".
+5. Clients
+
+You need the language-specific library for Thrift installed to be able to use
said Thrift client
+code in that language. In other words, you need to install the Python Thrift
library to use the Python
+example. Typically, your operating system's package manager will be able to
automatically install
+these for you in an expected location such as
/usr/lib/python/site-packages/thrift.
+
+An example Java client is incuded with this distribution in the class
TestProxyClient. Also the
+unit tests included show how to use the proxy. Normal Accumulo APIs are
emulated wherever possible.
+
+Additional client examples can be found in the examples directory. These
clients are tested and
+functional; however, the setup for each language is beyond the scope of this
document currently.
