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 2013/12/19 03:55:04 UTC

[04/10] git commit: ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts.

ACCUMULO-2060 Add additional classpath entries that typically contain hadoop artifacts.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40df8cdb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40df8cdb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40df8cdb

Branch: refs/heads/master
Commit: 40df8cdbdf2723ea5c0a74e04a4b2c73df068ba2
Parents: 559b18b
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 18 18:55:38 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 18 18:55:38 2013 -0500

----------------------------------------------------------------------
 .../examples/1GB/native-standalone/accumulo-site.xml |  9 ++++++++-
 conf/examples/1GB/standalone/accumulo-site.xml       |  9 ++++++++-
 .../examples/2GB/native-standalone/accumulo-site.xml | 10 +++++++++-
 conf/examples/2GB/standalone/accumulo-site.xml       | 15 +++++++++++++++
 .../examples/3GB/native-standalone/accumulo-site.xml |  9 ++++++++-
 conf/examples/3GB/standalone/accumulo-site.xml       |  9 ++++++++-
 .../512MB/native-standalone/accumulo-site.xml        |  9 ++++++++-
 conf/examples/512MB/standalone/accumulo-site.xml     |  9 ++++++++-
 8 files changed, 72 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/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 3f21599..3ff1537 100644
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@ -95,12 +95,19 @@
     <property>
       <name>general.classpaths</name>
     <!--
-       Add the following for hadoop-2.0
+       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+       This list may be excessive, but this should cause no issues.
+
        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
        $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
        $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
        $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+       /usr/lib/hadoop/.*.jar,
+       /usr/lib/hadoop/lib/.*.jar,
+       /usr/lib/hadoop-hdfs/.*.jar,
+       /usr/lib/hadoop-mapreduce/.*.jar,
+       /usr/lib/hadoop-yarn/.*.jar,
     -->
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/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 f477092..eddb25f 100644
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@ -90,12 +90,19 @@
     <property>
       <name>general.classpaths</name>
     <!--
-       Add the following for hadoop-2.0
+       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+       This list may be excessive, but this should cause no issues.
+
        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
        $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
        $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
        $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+       /usr/lib/hadoop/.*.jar,
+       /usr/lib/hadoop/lib/.*.jar,
+       /usr/lib/hadoop-hdfs/.*.jar,
+       /usr/lib/hadoop-mapreduce/.*.jar,
+       /usr/lib/hadoop-yarn/.*.jar,
     -->
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/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 835e0fb..811f9f8 100644
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@ -85,11 +85,19 @@
     <property>
       <name>general.classpaths</name>
     <!--
-       Add the following for hadoop-2.0
+       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+       This list may be excessive, but this should cause no issues.
+
        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
        $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
        $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+       $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+       /usr/lib/hadoop/.*.jar,
+       /usr/lib/hadoop/lib/.*.jar,
+       /usr/lib/hadoop-hdfs/.*.jar,
+       /usr/lib/hadoop-mapreduce/.*.jar,
+       /usr/lib/hadoop-yarn/.*.jar,
     -->
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/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 9f5d7fd..690142e 100644
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@ -84,6 +84,21 @@
 
     <property>
       <name>general.classpaths</name>
+    <!--
+       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+       This list may be excessive, but this should cause no issues.
+
+       $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+       $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+       $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+       $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+       $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+       /usr/lib/hadoop/.*.jar,
+       /usr/lib/hadoop/lib/.*.jar,
+       /usr/lib/hadoop-hdfs/.*.jar,
+       /usr/lib/hadoop-mapreduce/.*.jar,
+       /usr/lib/hadoop-yarn/.*.jar,
+    -->
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,
     $ACCUMULO_HOME/src/core/target/classes/,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/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 6730955..1e99a93 100644
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@ -80,12 +80,19 @@
     <property>
       <name>general.classpaths</name>
     <!--
-       Add the following for hadoop-2.0
+       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+       This list may be excessive, but this should cause no issues.
+
        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
        $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
        $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
        $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+       /usr/lib/hadoop/.*.jar,
+       /usr/lib/hadoop/lib/.*.jar,
+       /usr/lib/hadoop-hdfs/.*.jar,
+       /usr/lib/hadoop-mapreduce/.*.jar,
+       /usr/lib/hadoop-yarn/.*.jar,
     -->
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/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 6730955..1e99a93 100644
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@ -80,12 +80,19 @@
     <property>
       <name>general.classpaths</name>
     <!--
-       Add the following for hadoop-2.0
+       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+       This list may be excessive, but this should cause no issues.
+
        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
        $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
        $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
        $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+       /usr/lib/hadoop/.*.jar,
+       /usr/lib/hadoop/lib/.*.jar,
+       /usr/lib/hadoop-hdfs/.*.jar,
+       /usr/lib/hadoop-mapreduce/.*.jar,
+       /usr/lib/hadoop-yarn/.*.jar,
     -->
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/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 f241f4c..2b9584c 100644
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@ -90,12 +90,19 @@
     <property>
       <name>general.classpaths</name>
     <!--
-       Add the following for hadoop-2.0
+       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+       This list may be excessive, but this should cause no issues.
+
        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
        $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
        $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
        $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+       /usr/lib/hadoop/.*.jar,
+       /usr/lib/hadoop/lib/.*.jar,
+       /usr/lib/hadoop-hdfs/.*.jar,
+       /usr/lib/hadoop-mapreduce/.*.jar,
+       /usr/lib/hadoop-yarn/.*.jar,
     -->
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/40df8cdb/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 b51014e..a312a87 100644
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@ -90,12 +90,19 @@
     <property>
       <name>general.classpaths</name>
     <!--
-       Add the following for hadoop-2.0
+       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+       This list may be excessive, but this should cause no issues.
+
        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
        $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
        $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
        $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+       /usr/lib/hadoop/.*.jar,
+       /usr/lib/hadoop/lib/.*.jar,
+       /usr/lib/hadoop-hdfs/.*.jar,
+       /usr/lib/hadoop-mapreduce/.*.jar,
+       /usr/lib/hadoop-yarn/.*.jar,
     -->
       <value>
     $ACCUMULO_HOME/src/server/target/classes/,