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 2015/02/28 00:49:47 UTC
[2/3] accumulo git commit: ACCUMULO-3631 Update general.classpaths
default to default in site template
ACCUMULO-3631 Update general.classpaths default to default in site template
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f47fdfe0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f47fdfe0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f47fdfe0
Branch: refs/heads/master
Commit: f47fdfe01c1e66977090a45f3da87962a0bd8a80
Parents: d1aaecb
Author: Josh Elser <el...@apache.org>
Authored: Fri Feb 27 18:23:45 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Feb 27 18:23:45 2015 -0500
----------------------------------------------------------------------
.../start/classloader/AccumuloClassLoader.java | 22 ++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f47fdfe0/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 77b4582..470ea66 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -55,16 +55,26 @@ public class AccumuloClassLoader {
"$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n" +
"$HADOOP_CONF_DIR,\n" +
"$HADOOP_PREFIX/[^.].*.jar,\n" +
- "$HADOOP_PREFIX/lib/[^.].*.jar,\n" +
- "$HADOOP_PREFIX/share/hadoop/common/.*.jar,\n" +
- "$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,\n" +
- "$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,\n" +
- "$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,\n" +
+ "$HADOOP_PREFIX/lib/(?!slf4j)[^.].*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/common/[^.].*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/hdfs/[^.].*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/mapreduce/[^.].*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/yarn/[^.].*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar,\n" +
+ "/usr/hdp/current/hadoop-client/[^.].*.jar,\n" +
+ "/usr/hdp/current/hadoop-client/lib/(?!slf4j)[^.].*.jar,\n" +
+ "/usr/hdp/current/hadoop-hdfs-client/[^.].*.jar,\n" +
+ "/usr/hdp/current/hadoop-mapreduce-client/[^.].*.jar,\n" +
+ "/usr/hdp/current/hadoop-yarn-client/[^.].*.jar,\n" +
+ "/usr/hdp/current/hadoop-yarn-client/lib/jersey.*.jar,\n" +
+ "/usr/hdp/current/hive-client/lib/hive-accumulo-handler.jar\n" +
"/usr/lib/hadoop/[^.].*.jar,\n" +
"/usr/lib/hadoop/lib/[^.].*.jar,\n" +
"/usr/lib/hadoop-hdfs/[^.].*.jar,\n" +
"/usr/lib/hadoop-mapreduce/[^.].*.jar,\n" +
- "/usr/lib/hadoop-yarn/[^.].*.jar,\n"
+ "/usr/lib/hadoop-yarn/[^.].*.jar,\n" +
+ "/usr/lib/hadoop-yarn/lib/jersey.*.jar,\n"
;
/* @formatter:on */