You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/06/20 06:34:07 UTC
[1/4] git commit: ACCUMULO-2930: Update classes still using
AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 8f1dc6528 -> d9ee274dc
refs/heads/master 4d7e90aee -> 1078d65da
ACCUMULO-2930: Update classes still using AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f1dc652
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f1dc652
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f1dc652
Branch: refs/heads/master
Commit: 8f1dc6528acb49ecb24b61b25fb3ebec066102f2
Parents: 344b4d3
Author: Dave Marion <dl...@hotmail.com>
Authored: Thu Jun 19 20:12:49 2014 -0400
Committer: Dave Marion <dl...@hotmail.com>
Committed: Thu Jun 19 20:12:49 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/util/LoginProperties.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f1dc652/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
index cf1a065..e1cbd0e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/LoginProperties.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.security.handler.Authenticator;
-import org.apache.accumulo.start.classloader.AccumuloClassLoader;
+import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
/**
*
@@ -36,7 +36,7 @@ public class LoginProperties {
public static void main(String[] args) throws Exception {
AccumuloConfiguration config = ServerConfiguration.getSystemConfiguration(HdfsZooInstance.getInstance());
- Authenticator authenticator = AccumuloClassLoader.getClassLoader().loadClass(config.get(Property.INSTANCE_SECURITY_AUTHENTICATOR))
+ Authenticator authenticator = AccumuloVFSClassLoader.getClassLoader().loadClass(config.get(Property.INSTANCE_SECURITY_AUTHENTICATOR))
.asSubclass(Authenticator.class).newInstance();
List<Set<TokenProperty>> tokenProps = new ArrayList<Set<TokenProperty>>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f1dc652/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 67f2739..7eb9504 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -52,7 +52,7 @@ import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.util.time.SimpleTimer;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.start.classloader.AccumuloClassLoader;
+import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
import org.apache.accumulo.trace.instrument.Span;
import org.apache.accumulo.trace.thrift.RemoteSpan;
import org.apache.accumulo.trace.thrift.SpanReceiver.Iface;
@@ -183,7 +183,7 @@ public class TraceServer implements Watcher {
at = new PasswordToken(conf.get(p).getBytes(Constants.UTF8));
} else {
Properties props = new Properties();
- AuthenticationToken token = AccumuloClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class)
+ AuthenticationToken token = AccumuloVFSClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class)
.newInstance();
int prefixLength = Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length();
[3/4] git commit: ACCUMULO-2926 Fix the multiple slf4j bindings that
ACCUMULO-2808 introduced
Posted by el...@apache.org.
ACCUMULO-2926 Fix the multiple slf4j bindings that ACCUMULO-2808 introduced
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d9ee274d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d9ee274d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d9ee274d
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: d9ee274dcf9b6ce18e2cf7d6fa8304cf516df154
Parents: 8f1dc65
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 19 21:32:03 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 19 21:33:16 2014 -0700
----------------------------------------------------------------------
conf/examples/1GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/1GB/standalone/accumulo-site.xml | 2 +-
conf/examples/2GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/2GB/standalone/accumulo-site.xml | 2 +-
conf/examples/3GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/3GB/standalone/accumulo-site.xml | 2 +-
conf/examples/512MB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/512MB/standalone/accumulo-site.xml | 2 +-
conf/examples/crypto/accumulo-site.xml | 2 +-
conf/examples/vfs-classloader/accumulo-site.xml | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml
index b68059c..cc06eea 100644
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@ -107,7 +107,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml
index 1bca857..96e647a 100644
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@ -107,7 +107,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/native-standalone/accumulo-site.xml b/conf/examples/2GB/native-standalone/accumulo-site.xml
index 9eaa5ff..75f7754 100644
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@ -97,7 +97,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/standalone/accumulo-site.xml b/conf/examples/2GB/standalone/accumulo-site.xml
index c9e0309..0b992c9 100644
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@ -110,7 +110,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/native-standalone/accumulo-site.xml b/conf/examples/3GB/native-standalone/accumulo-site.xml
index 9b82ed3..7f245a7 100644
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@ -92,7 +92,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/standalone/accumulo-site.xml b/conf/examples/3GB/standalone/accumulo-site.xml
index a127cbd..f36a92d 100644
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@ -97,7 +97,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/native-standalone/accumulo-site.xml b/conf/examples/512MB/native-standalone/accumulo-site.xml
index 0e8bdb2..2e7af84 100644
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@ -102,7 +102,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/standalone/accumulo-site.xml b/conf/examples/512MB/standalone/accumulo-site.xml
index 1a30ce7..f677960 100644
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@ -108,7 +108,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/crypto/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/crypto/accumulo-site.xml b/conf/examples/crypto/accumulo-site.xml
index a7e5c54..b905017 100644
--- a/conf/examples/crypto/accumulo-site.xml
+++ b/conf/examples/crypto/accumulo-site.xml
@@ -104,7 +104,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/vfs-classloader/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/vfs-classloader/accumulo-site.xml b/conf/examples/vfs-classloader/accumulo-site.xml
index ea95ea2..2578fc8 100644
--- a/conf/examples/vfs-classloader/accumulo-site.xml
+++ b/conf/examples/vfs-classloader/accumulo-site.xml
@@ -102,7 +102,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
[4/4] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1078d65d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1078d65d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1078d65d
Branch: refs/heads/master
Commit: 1078d65daa6ab78fc9e1936cdfd02ac91bd904dd
Parents: 4d7e90a d9ee274
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 19 21:33:27 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 19 21:33:27 2014 -0700
----------------------------------------------------------------------
conf/examples/1GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/1GB/standalone/accumulo-site.xml | 2 +-
conf/examples/2GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/2GB/standalone/accumulo-site.xml | 2 +-
conf/examples/3GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/3GB/standalone/accumulo-site.xml | 2 +-
conf/examples/512MB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/512MB/standalone/accumulo-site.xml | 2 +-
conf/examples/crypto/accumulo-site.xml | 2 +-
conf/examples/vfs-classloader/accumulo-site.xml | 2 +-
.../java/org/apache/accumulo/server/util/LoginProperties.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
12 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1078d65d/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --cc server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 1aad533,7eb9504..edb28c5
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@@ -181,10 -180,10 +181,10 @@@ public class TraceServer implements Wat
Map<String,String> loginMap = conf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX);
if (loginMap.isEmpty()) {
Property p = Property.TRACE_PASSWORD;
- at = new PasswordToken(conf.get(p).getBytes(Constants.UTF8));
+ at = new PasswordToken(conf.get(p).getBytes(StandardCharsets.UTF_8));
} else {
Properties props = new Properties();
- AuthenticationToken token = AccumuloClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class)
+ AuthenticationToken token = AccumuloVFSClassLoader.getClassLoader().loadClass(conf.get(Property.TRACE_TOKEN_TYPE)).asSubclass(AuthenticationToken.class)
.newInstance();
int prefixLength = Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey().length();
[2/4] git commit: ACCUMULO-2926 Fix the multiple slf4j bindings that
ACCUMULO-2808 introduced
Posted by el...@apache.org.
ACCUMULO-2926 Fix the multiple slf4j bindings that ACCUMULO-2808 introduced
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d9ee274d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d9ee274d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d9ee274d
Branch: refs/heads/master
Commit: d9ee274dcf9b6ce18e2cf7d6fa8304cf516df154
Parents: 8f1dc65
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 19 21:32:03 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 19 21:33:16 2014 -0700
----------------------------------------------------------------------
conf/examples/1GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/1GB/standalone/accumulo-site.xml | 2 +-
conf/examples/2GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/2GB/standalone/accumulo-site.xml | 2 +-
conf/examples/3GB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/3GB/standalone/accumulo-site.xml | 2 +-
conf/examples/512MB/native-standalone/accumulo-site.xml | 2 +-
conf/examples/512MB/standalone/accumulo-site.xml | 2 +-
conf/examples/crypto/accumulo-site.xml | 2 +-
conf/examples/vfs-classloader/accumulo-site.xml | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml
index b68059c..cc06eea 100644
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@ -107,7 +107,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml
index 1bca857..96e647a 100644
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@ -107,7 +107,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/native-standalone/accumulo-site.xml b/conf/examples/2GB/native-standalone/accumulo-site.xml
index 9eaa5ff..75f7754 100644
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@ -97,7 +97,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/2GB/standalone/accumulo-site.xml b/conf/examples/2GB/standalone/accumulo-site.xml
index c9e0309..0b992c9 100644
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@ -110,7 +110,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/native-standalone/accumulo-site.xml b/conf/examples/3GB/native-standalone/accumulo-site.xml
index 9b82ed3..7f245a7 100644
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@ -92,7 +92,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/standalone/accumulo-site.xml b/conf/examples/3GB/standalone/accumulo-site.xml
index a127cbd..f36a92d 100644
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@ -97,7 +97,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/native-standalone/accumulo-site.xml b/conf/examples/512MB/native-standalone/accumulo-site.xml
index 0e8bdb2..2e7af84 100644
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@ -102,7 +102,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/standalone/accumulo-site.xml b/conf/examples/512MB/standalone/accumulo-site.xml
index 1a30ce7..f677960 100644
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@ -108,7 +108,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/crypto/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/crypto/accumulo-site.xml b/conf/examples/crypto/accumulo-site.xml
index a7e5c54..b905017 100644
--- a/conf/examples/crypto/accumulo-site.xml
+++ b/conf/examples/crypto/accumulo-site.xml
@@ -104,7 +104,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d9ee274d/conf/examples/vfs-classloader/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/vfs-classloader/accumulo-site.xml b/conf/examples/vfs-classloader/accumulo-site.xml
index ea95ea2..2578fc8 100644
--- a/conf/examples/vfs-classloader/accumulo-site.xml
+++ b/conf/examples/vfs-classloader/accumulo-site.xml
@@ -102,7 +102,7 @@
$HADOOP_PREFIX/lib/[^.].*.jar,
<!-- Comment the following for hadoop-1 -->
$HADOOP_PREFIX/share/hadoop/common/.*.jar,
- $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,