Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c91647e5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c91647e5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c91647e5 Branch: refs/heads/1.6.0-SNAPSHOT Commit: c91647e5faabc69713ca8bd6f224a38a5625899c Parents: b33fbf4 01cb310 Author: Josh Elser <els...@apache.org> Authored: Mon Feb 3 18:53:30 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 3 18:53:30 2014 -0500 ---------------------------------------------------------------------- .../accumulo/start/classloader/AccumuloClassLoader.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c91647e5/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java ---------------------------------------------------------------------- diff --cc start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java index a68ce0e,8cfbdcc..7051ca5 --- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java +++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java @@@ -59,12 -55,13 +59,17 @@@ public class AccumuloClassLoader "$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/share/hadoop/mapreduce/.*.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" ; + /* @formatter:on */ + + public static final String MAVEN_PROJECT_BASEDIR_PROPERTY_NAME = "general.maven.project.basedir"; + public static final String DEFAULT_MAVEN_PROJECT_BASEDIR_VALUE = ""; private static String SITE_CONF;
