Author: cjnolet
Date: Tue May 21 16:40:44 2013
New Revision: 1484865
URL: http://svn.apache.org/r1484865
Log:
Reversing ACCUMULO-1438
Added:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/
- copied from r1484638,
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/mini/
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/mini/
- copied from r1484638,
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/mini/
accumulo/trunk/server/src/test/resources/FooFilter.jar
- copied unchanged from r1484638,
accumulo/trunk/server/src/test/resources/FooFilter.jar
Removed:
accumulo/trunk/mini/
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/README
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/conf/DefaultConfiguration.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
accumulo/trunk/examples/ (props changed)
accumulo/trunk/examples/simple/pom.xml
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 (contents, props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/proxy/pom.xml
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/ (props changed)
accumulo/trunk/server/pom.xml
accumulo/trunk/server/src/test/resources/log4j.properties
accumulo/trunk/src/ (props changed)
accumulo/trunk/start/pom.xml
accumulo/trunk/test/pom.xml
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
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635,1484644
Modified: accumulo/trunk/README
URL:
http://svn.apache.org/viewvc/accumulo/trunk/README?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/README (original)
+++ accumulo/trunk/README Tue May 21 16:40:44 2013
@@ -295,7 +295,7 @@ The public accumulo API is composed of :
* everything under org.apache.accumulo.core.client, excluding impl packages
* Key, Mutation, Value, and Range in org.apache.accumulo.core.data.
- * org.apache.accumulo.mini
+ * org.apache.accumulo.server.mini
To get started using accumulo review the example and the javadoc for the
packages and classes mentioned above.
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/assemble:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/core:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635
Modified: accumulo/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/pom.xml?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/core/pom.xml (original)
+++ accumulo/trunk/core/pom.xml Tue May 21 16:40:44 2013
@@ -34,22 +34,6 @@
<artifactId>jline</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-vfs2</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</dependency>
@@ -94,6 +78,21 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
Tue May 21 16:40:44 2013
@@ -138,7 +138,7 @@ public class DefaultConfiguration extend
}
doc.println(indent(indentDepth) + "<td" + (isDeprecated ? "
class='deprecated'" : "") + ">" + zoo + "</td>");
doc.println(indent(indentDepth) + "<td" + (isDeprecated ? "
class='deprecated'" : "") + "><pre>"
- + (prop.getRawDefaultValue().isEmpty() ? " " :
prop.getRawDefaultValue().replaceAll(" ", " ")) + "</pre></td>");
+ + (prop.getDefaultValue().isEmpty() ? " " :
prop.getDefaultValue().replaceAll(" ", " ")) + "</pre></td>");
doc.println(indent(indentDepth) + "<td" + (isDeprecated ? "
class='deprecated'" : "") + ">" + (isDeprecated ? "<b><i>Deprecated.</i></b> "
: "")
+ prop.getDescription() + "</td>");
doc.println(indent(--indentDepth) + "</tr>");
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java
Tue May 21 16:40:44 2013
@@ -28,33 +28,31 @@ import org.apache.accumulo.core.util.for
import org.apache.accumulo.core.util.interpret.DefaultScanInterpreter;
import org.apache.accumulo.start.classloader.AccumuloClassLoader;
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.SystemConfiguration;
import org.apache.log4j.Logger;
public enum Property {
// Crypto-related properties
CRYPTO_PREFIX("crypto.", null, PropertyType.PREFIX, "Properties in this
category related to the configuration of both default and custom crypto
modules.",
- true, false),
+ true),
CRYPTO_MODULE_CLASS("crypto.module.class", "NullCryptoModule",
PropertyType.STRING,
"Fully qualified class name of the class that implements the
CryptoModule interface, to be used in setting up encryption at rest for the WAL
and "
- + "(future) other parts of the code.", true, false),
- CRYPTO_CIPHER_SUITE("crypto.cipher.suite", "NullCipher",
PropertyType.STRING, "Describes the cipher suite to use for the write-ahead
log", true, false),
+ + "(future) other parts of the code.", true),
+ CRYPTO_CIPHER_SUITE("crypto.cipher.suite", "NullCipher",
PropertyType.STRING, "Describes the cipher suite to use for the write-ahead
log", true),
CRYPTO_CIPHER_ALGORITHM_NAME("crypto.cipher.algorithm.name", "NullCipher",
PropertyType.STRING,
"States the name of the algorithm used in the corresponding cipher
suite. Do not make these different, unless you enjoy mysterious exceptions and
bugs.",
- true, false),
+ true),
CRYPTO_CIPHER_KEY_LENGTH("crypto.cipher.key.length", "128",
PropertyType.STRING,
- "Specifies the key length *in bits* to use for the symmetric key, should
probably be 128 or 256 unless you really know what you're doing", true, false),
+ "Specifies the key length *in bits* to use for the symmetric key, should
probably be 128 or 256 unless you really know what you're doing", true),
CRYPTO_SECURE_RNG("crypto.secure.rng", "SHA1PRNG", PropertyType.STRING,
- "States the secure random number generator to use, and defaults to the
built-in Sun SHA1PRNG", true, false),
+ "States the secure random number generator to use, and defaults to the
built-in Sun SHA1PRNG", true),
CRYPTO_SECURE_RNG_PROVIDER("crypto.secure.rng.provider", "SUN",
PropertyType.STRING,
- "States the secure random number generator provider to use, and defaults
to the built-in SUN provider", true, false),
+ "States the secure random number generator provider to use, and defaults
to the built-in SUN provider", true),
CRYPTO_SECRET_KEY_ENCRYPTION_STRATEGY_CLASS("crypto.secret.key.encryption.strategy.class",
"NullSecretKeyEncryptionStrategy", PropertyType.STRING,
- "The class Accumulo should use for its key encryption strategy.", true,
false),
+ "The class Accumulo should use for its key encryption strategy.", true),
CRYPTO_DEFAULT_KEY_STRATEGY_HDFS_URI("crypto.default.key.strategy.hdfs.uri",
"", PropertyType.STRING,
- "The URL Accumulo should use to connect to DFS. If this is blank,
Accumulo will obtain this information from the Hadoop configuration", true,
false),
+ "The URL Accumulo should use to connect to DFS. If this is blank,
Accumulo will obtain this information from the Hadoop configuration", true),
CRYPTO_DEFAULT_KEY_STRATEGY_KEY_LOCATION("crypto.default.key.strategy.key.location",
"/accumulo/crypto/secret/keyEncryptionKey", PropertyType.ABSOLUTEPATH,
- "The absolute path of where to store the key encryption key within
HDFS.", true, false),
+ "The absolute path of where to store the key encryption key within
HDFS.", true),
// instance properties (must be the same for every node in an instance)
INSTANCE_PREFIX("instance.", null, PropertyType.PREFIX,
@@ -223,10 +221,10 @@ public enum Property {
MONITOR_BANNER_COLOR("monitor.banner.color", "#c4c4c4", PropertyType.STRING,
"The color of the banner text displayed on the monitor page."),
MONITOR_BANNER_BACKGROUND("monitor.banner.background", "#304065",
PropertyType.STRING,
"The background color of the banner text displayed on the monitor
page."),
- MONITOR_SSL_KEYSTORE("monitor.ssl.keyStore", "", PropertyType.PATH, "The
keystore for enabling monitor SSL.", true, false),
- MONITOR_SSL_KEYSTOREPASS("monitor.ssl.keyStorePassword", "",
PropertyType.STRING, "The keystore password for enabling monitor SSL.", true,
false),
- MONITOR_SSL_TRUSTSTORE("monitor.ssl.trustStore", "", PropertyType.PATH, "The
truststore for enabling monitor SSL.", true, false),
- MONITOR_SSL_TRUSTSTOREPASS("monitor.ssl.trustStorePassword", "",
PropertyType.STRING, "The truststore password for enabling monitor SSL.", true,
false),
+ MONITOR_SSL_KEYSTORE("monitor.ssl.keyStore", "", PropertyType.PATH, "The
keystore for enabling monitor SSL.", true),
+ MONITOR_SSL_KEYSTOREPASS("monitor.ssl.keyStorePassword", "",
PropertyType.STRING, "The keystore password for enabling monitor SSL.", true),
+ MONITOR_SSL_TRUSTSTORE("monitor.ssl.trustStore", "", PropertyType.PATH, "The
truststore for enabling monitor SSL.", true),
+ MONITOR_SSL_TRUSTSTOREPASS("monitor.ssl.trustStorePassword", "",
PropertyType.STRING, "The truststore password for enabling monitor SSL.", true),
TRACE_PREFIX("trace.", null, PropertyType.PREFIX, "Properties in this
category affect the behavior of distributed tracing."),
TRACE_PORT("trace.port.client", "12234", PropertyType.PORT, "The listening
port for the trace server"),
@@ -342,27 +340,26 @@ public enum Property {
+ "You can enable post delegation for a context, which will load
classes from the context first instead of the parent first. "
+ "Do this by setting
general.vfs.context.classpath.<name>.delegation=post, where <name>
is your context name. "
+ "If delegation is not specified, it defaults to loading from
parent classloader first."),
- VFS_CLASSLOADER_CACHE_DIR(AccumuloVFSClassLoader.VFS_CACHE_DIR,
"${java.io.tmpdir}" + File.separator + "accumulo-vfs-cache-${user.name}",
- PropertyType.ABSOLUTEPATH, "Directory to use for the vfs cache. The
cache will keep a soft reference to all of the classes loaded in the VM."
- + " This should be on local disk on each node with sufficient space.
It defaults to ${java.io.tmpdir}/accumulo-vfs-cache-${user.name}", false, true);
+ VFS_CLASSLOADER_CACHE_DIR(AccumuloVFSClassLoader.VFS_CACHE_DIR, new
File(System.getProperty("java.io.tmpdir"), "accumulo-vfs-cache-"
+ + System.getProperty("user.name", "nouser")).getAbsolutePath(),
PropertyType.ABSOLUTEPATH,
+ "Directory to use for the vfs cache. The cache will keep a soft
reference to all of the classes loaded in the VM."
+ + " This should be on local disk on each node with sufficient space.
It defaults to /tmp", false);
private String key, defaultValue, description;
private PropertyType type;
private boolean experimental;
- private boolean interpolated;
static Logger log = Logger.getLogger(Property.class);
- private Property(String name, String defaultValue, PropertyType type, String
description, boolean experimental, boolean interpolated) {
+ private Property(String name, String defaultValue, PropertyType type, String
description, boolean experimental) {
this.key = name;
this.defaultValue = defaultValue;
this.description = description;
this.type = type;
this.experimental = experimental;
- this.interpolated = interpolated;
}
private Property(String name, String defaultValue, PropertyType type, String
description) {
- this(name, defaultValue, type, description, false, false);
+ this(name, defaultValue, type, description, false);
}
@Override
@@ -374,23 +371,8 @@ public enum Property {
return this.key;
}
- public String getRawDefaultValue() {
- return this.defaultValue;
- }
-
public String getDefaultValue() {
- if (this.interpolated) {
- PropertiesConfiguration pconf = new PropertiesConfiguration();
- pconf.append(new SystemConfiguration());
- pconf.addProperty("hack_default_value", this.defaultValue);
- String v = pconf.getString("hack_default_value");
- if (this.type == PropertyType.ABSOLUTEPATH)
- return new File(v).getAbsolutePath();
- else
- return v;
- } else {
- return getRawDefaultValue();
- }
+ return this.defaultValue;
}
public PropertyType getType() {
Modified:
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
---
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
(original)
+++
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
Tue May 21 16:40:44 2013
@@ -16,11 +16,9 @@
*/
package org.apache.accumulo.core.conf;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import java.io.File;
import java.util.HashSet;
import org.junit.Test;
@@ -101,12 +99,4 @@ public class PropertyTest {
// typeCheckValidFormat(PropertyType.ABSOLUTEPATH, "d:\\foo12",
"c:\\foo\\g", "c:\\foo\\c", "c:\\");
typeCheckInvalidFormat(PropertyType.ABSOLUTEPATH, "foo12", "foo/g",
"foo\\c");
}
-
- @Test
- public void testRawDefaultValues() {
- AccumuloConfiguration conf =
AccumuloConfiguration.getDefaultConfiguration();
- assertEquals("${java.io.tmpdir}" + File.separator +
"accumulo-vfs-cache-${user.name}",
Property.VFS_CLASSLOADER_CACHE_DIR.getRawDefaultValue());
- assertEquals(new File(System.getProperty("java.io.tmpdir"),
"accumulo-vfs-cache-" + System.getProperty("user.name")).getAbsolutePath(),
- conf.get(Property.VFS_CLASSLOADER_CACHE_DIR));
- }
}
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/examples:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635
Modified: accumulo/trunk/examples/simple/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/examples/simple/pom.xml?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/examples/simple/pom.xml (original)
+++ accumulo/trunk/examples/simple/pom.xml Tue May 21 16:40:44 2013
@@ -30,10 +30,6 @@
<artifactId>jcommander</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<scope>provided</scope>
@@ -44,6 +40,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<scope>provided</scope>
@@ -59,6 +60,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635
Modified: accumulo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Tue May 21 16:40:44 2013
@@ -81,7 +81,6 @@
<module>assemble</module>
<module>proxy</module>
<module>test</module>
- <module>mini</module>
</modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/accumulo/trunk</connection>
@@ -220,11 +219,6 @@
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-mini</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-proxy</artifactId>
<version>${project.version}</version>
</dependency>
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/pom.xml:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635,1484644
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/proxy/README:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635
Modified: accumulo/trunk/proxy/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/pom.xml?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/proxy/pom.xml (original)
+++ accumulo/trunk/proxy/pom.xml Tue May 21 16:40:44 2013
@@ -34,16 +34,18 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-mini</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -56,6 +58,31 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
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=1484865&r1=1484864&r2=1484865&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 Tue
May 21 16:40:44 2013
@@ -25,7 +25,7 @@ import java.util.Properties;
import org.apache.accumulo.core.cli.Help;
import org.apache.accumulo.proxy.thrift.AccumuloProxy;
-import org.apache.accumulo.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
import org.apache.log4j.Logger;
import org.apache.thrift.TProcessor;
import org.apache.thrift.protocol.TCompactProtocol;
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=1484865&r1=1484864&r2=1484865&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
Tue May 21 16:40:44 2013
@@ -81,7 +81,7 @@ import org.apache.accumulo.proxy.thrift.
import org.apache.accumulo.proxy.thrift.UnknownScanner;
import org.apache.accumulo.proxy.thrift.UnknownWriter;
import org.apache.accumulo.proxy.thrift.WriterOptions;
-import org.apache.accumulo.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
import org.apache.accumulo.server.util.PortUtils;
import org.apache.accumulo.test.functional.SlowIterator;
import org.apache.commons.io.FileUtils;
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/server:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635,1484644
Modified: accumulo/trunk/server/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/pom.xml?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/server/pom.xml (original)
+++ accumulo/trunk/server/pom.xml Tue May 21 16:40:44 2013
@@ -34,24 +34,12 @@
<artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
@@ -93,6 +81,26 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
Modified: accumulo/trunk/server/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/resources/log4j.properties?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/server/src/test/resources/log4j.properties (original)
+++ accumulo/trunk/server/src/test/resources/log4j.properties Tue May 21
16:40:44 2013
@@ -19,3 +19,4 @@ log4j.appender.CA.layout=org.apache.log4
log4j.appender.CA.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
log4j.logger.org.apache.accumulo.server.util.TabletIterator=ERROR
+log4j.logger.org.apache.accumulo.core.client.impl.ServerClient=ERROR
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Reverse-merged
/accumulo/branches/1.5/src:r1484297-1484330,1484332-1484336,1484340-1484579,1484581-1484635
Modified: accumulo/trunk/start/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/start/pom.xml?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/start/pom.xml (original)
+++ accumulo/trunk/start/pom.xml Tue May 21 16:40:44 2013
@@ -30,6 +30,11 @@
<artifactId>commons-vfs2</artifactId>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>provided</scope>
Modified: accumulo/trunk/test/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/pom.xml?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
--- accumulo/trunk/test/pom.xml (original)
+++ accumulo/trunk/test/pom.xml Tue May 21 16:40:44 2013
@@ -34,51 +34,62 @@
<artifactId>jline</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-fate</artifactId>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-mini</artifactId>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-server</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-trace</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
---
accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
(original)
+++
accumulo/trunk/test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
Tue May 21 16:40:44 2013
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.accumulo.fate.zookeeper.ZooLock.AsyncLockWatcher;
import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason;
-import org.apache.accumulo.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.zookeeper.CreateMode;
Modified:
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
---
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
(original)
+++
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
Tue May 21 16:40:44 2013
@@ -27,8 +27,8 @@ import org.apache.accumulo.core.client.I
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.admin.TableOperations;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.mini.MiniAccumuloCluster;
-import org.apache.accumulo.mini.MiniAccumuloConfig;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloConfig;
import org.apache.hadoop.io.Text;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified:
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
---
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
(original)
+++
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
Tue May 21 16:40:44 2013
@@ -47,8 +47,8 @@ import org.apache.accumulo.core.file.Fil
import org.apache.accumulo.core.file.FileSKVWriter;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.mini.MiniAccumuloCluster;
-import org.apache.accumulo.mini.MiniAccumuloConfig;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloConfig;
import org.apache.accumulo.server.trace.TraceServer;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
Modified:
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
---
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
(original)
+++
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
Tue May 21 16:40:44 2013
@@ -16,6 +16,18 @@
*/
package org.apache.accumulo.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
@@ -32,7 +44,7 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
import org.apache.hadoop.io.Text;
import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransportException;
@@ -41,18 +53,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
public class TableOperationsIT {
static TemporaryFolder tempFolder = new TemporaryFolder();
Modified:
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java?rev=1484865&r1=1484864&r2=1484865&view=diff
==============================================================================
---
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
(original)
+++
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
Tue May 21 16:40:44 2013
@@ -35,7 +35,7 @@ import org.apache.accumulo.core.data.Ran
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.mini.MiniAccumuloCluster;
+import org.apache.accumulo.server.mini.MiniAccumuloCluster;
import org.apache.hadoop.io.Text;
import org.junit.After;
import org.junit.Before;
