Updated Branches: refs/heads/master a1495e382 -> cdc1dc9f0
ACCUMULO-1419 Update README, confs and poms to switch default hadoop dependency to 2.2.0. Document the change in default Apache Hadoop dependency. Update configurations to account for new HADOOP_CONF_DIR and hadoop-2 classpath entries. Rename profiles from hadoop-1.0 to hadoop-1.2 and hadoop-2.0 to hadoop-2.2, along with updated dependencies for the hadoop-2.2 profile. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cdc1dc9f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cdc1dc9f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cdc1dc9f Branch: refs/heads/master Commit: cdc1dc9f08beccac7817365f2c08f9f4ceda6923 Parents: a1495e3 Author: Josh Elser <els...@apache.org> Authored: Sun Oct 27 23:20:50 2013 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sun Oct 27 23:20:50 2013 -0400 ---------------------------------------------------------------------- README | 16 +++++----- .../1GB/native-standalone/accumulo-env.sh | 7 +++-- .../1GB/native-standalone/accumulo-site.xml | 15 +++++----- conf/examples/1GB/standalone/accumulo-env.sh | 7 +++-- conf/examples/1GB/standalone/accumulo-site.xml | 15 +++++----- .../2GB/native-standalone/accumulo-env.sh | 7 +++-- .../2GB/native-standalone/accumulo-site.xml | 15 +++++----- conf/examples/2GB/standalone/accumulo-env.sh | 7 +++-- conf/examples/2GB/standalone/accumulo-site.xml | 15 +++++----- .../3GB/native-standalone/accumulo-env.sh | 7 +++-- .../3GB/native-standalone/accumulo-site.xml | 15 +++++----- conf/examples/3GB/standalone/accumulo-env.sh | 7 +++-- conf/examples/3GB/standalone/accumulo-site.xml | 15 +++++----- .../512MB/native-standalone/accumulo-env.sh | 7 +++-- .../512MB/native-standalone/accumulo-site.xml | 15 +++++----- conf/examples/512MB/standalone/accumulo-env.sh | 5 ++-- .../examples/512MB/standalone/accumulo-site.xml | 15 +++++----- conf/examples/crypto/accumulo-site.xml | 31 ++++++++++++-------- conf/examples/vfs-classloader/accumulo-site.xml | 15 +++++----- pom.xml | 22 +++++++------- test/pom.xml | 18 ++++++------ 21 files changed, 142 insertions(+), 134 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/README ---------------------------------------------------------------------- diff --git a/README b/README index 5047bdb..e5f8132 100644 --- a/README +++ b/README @@ -20,17 +20,19 @@ the pom.xml file for the necessary components. You can build an Accumulo binary distribution, which is created in the assemble/target directory, using the following command. Note that maven 3 is required starting with Accumulo v1.5.0. By default, Accumulo compiles -against Hadoop 1.0.4. +against Hadoop 2.2.0, but these artifacts should be compatible with Apache +Hadoop 1.2.x or Apache Hadoop 2.2.x releases. mvn package -P assemble -To compile against a different version that is compatible with Hadoop 1.0, -specify hadoop.version on the command line, -e.g. "-Dhadoop.version=0.20.205.0" or "-Dhadoop.version=1.1.0". +By default, Accumulo compiles against Apache Hadoop 2.2.0. To compile against +a different 2.2-compatible version, specify the profile and version, +e.g. "-Dhadoop.version=0.23.5". -To compile against Hadoop 2.0, specify "-Dhadoop.profile=2.0". By default this uses -2.0.4-alpha. To compile against a different 2.0-compatible version, specify -the profile and version, e.g. "-Dhadoop.profile=2.0 -Dhadoop.version=0.23.5". +To compile against Apache Hadoop 1.2.1, or a different version that is compatible +with Hadoop 1.0, specify hadoop.profile and hadoop.version on the command line, +e.g. "-Dhadoop.profile=1.2 -Dhadoop.version=0.20.205.0" or + "-Dhadoop.profile=1.2 -Dhadoop.version=1.1.0". If you are running on another Unix-like operating system (OSX, etc) then you may wish to build the native libraries. They are not strictly necessary http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/1GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/1GB/native-standalone/accumulo-env.sh b/conf/examples/1GB/native-standalone/accumulo-env.sh index 3f7e63f..26a7866 100755 --- a/conf/examples/1GB/native-standalone/accumulo-env.sh +++ b/conf/examples/1GB/native-standalone/accumulo-env.sh @@ -34,9 +34,10 @@ else HADOOP_PREFIX="$HADOOP_HOME" unset HADOOP_HOME fi -test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" -# hadoop-2.0: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" + +# hadoop-1.2: +#test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 6dae0e7..aaef665 100644 --- a/conf/examples/1GB/native-standalone/accumulo-site.xml +++ b/conf/examples/1GB/native-standalone/accumulo-site.xml @@ -94,15 +94,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/1GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/1GB/standalone/accumulo-env.sh b/conf/examples/1GB/standalone/accumulo-env.sh index d22caed..7d5602c 100755 --- a/conf/examples/1GB/standalone/accumulo-env.sh +++ b/conf/examples/1GB/standalone/accumulo-env.sh @@ -34,9 +34,10 @@ else HADOOP_PREFIX="$HADOOP_HOME" unset HADOOP_HOME fi -test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" -# hadoop-2.0: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" + +# hadoop-1.2: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 29b7860..843a24d 100644 --- a/conf/examples/1GB/standalone/accumulo-site.xml +++ b/conf/examples/1GB/standalone/accumulo-site.xml @@ -94,15 +94,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/2GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/2GB/native-standalone/accumulo-env.sh b/conf/examples/2GB/native-standalone/accumulo-env.sh index d4294c5..682c5d7 100755 --- a/conf/examples/2GB/native-standalone/accumulo-env.sh +++ b/conf/examples/2GB/native-standalone/accumulo-env.sh @@ -34,9 +34,10 @@ else HADOOP_PREFIX="$HADOOP_HOME" unset HADOOP_HOME fi -test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" -# hadoop-2.0: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" + +# hadoop-1.2: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 c0c991a..49a44e3 100644 --- a/conf/examples/2GB/native-standalone/accumulo-site.xml +++ b/conf/examples/2GB/native-standalone/accumulo-site.xml @@ -84,15 +84,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/2GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/2GB/standalone/accumulo-env.sh b/conf/examples/2GB/standalone/accumulo-env.sh index 769971b..ff4853c 100755 --- a/conf/examples/2GB/standalone/accumulo-env.sh +++ b/conf/examples/2GB/standalone/accumulo-env.sh @@ -34,9 +34,10 @@ else HADOOP_PREFIX="$HADOOP_HOME" unset HADOOP_HOME fi -test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" -# hadoop-2.0: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" + +# hadoop-1.2: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 8d84ed8..4e244b7 100644 --- a/conf/examples/2GB/standalone/accumulo-site.xml +++ b/conf/examples/2GB/standalone/accumulo-site.xml @@ -97,15 +97,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/3GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/3GB/native-standalone/accumulo-env.sh b/conf/examples/3GB/native-standalone/accumulo-env.sh index 6823306..da976da 100755 --- a/conf/examples/3GB/native-standalone/accumulo-env.sh +++ b/conf/examples/3GB/native-standalone/accumulo-env.sh @@ -34,9 +34,10 @@ else HADOOP_PREFIX="$HADOOP_HOME" unset HADOOP_HOME fi -test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" -# hadoop-2.0: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" + +# hadoop-1.2: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 b91fc25..ac6d2ae 100644 --- a/conf/examples/3GB/native-standalone/accumulo-site.xml +++ b/conf/examples/3GB/native-standalone/accumulo-site.xml @@ -79,15 +79,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/3GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/3GB/standalone/accumulo-env.sh b/conf/examples/3GB/standalone/accumulo-env.sh index 44c6147..2dd0096 100755 --- a/conf/examples/3GB/standalone/accumulo-env.sh +++ b/conf/examples/3GB/standalone/accumulo-env.sh @@ -34,9 +34,10 @@ else HADOOP_PREFIX="$HADOOP_HOME" unset HADOOP_HOME fi -test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" -# hadoop-2.0: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" + +# hadoop-1.2: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 8ad5a73..5f81dac 100644 --- a/conf/examples/3GB/standalone/accumulo-site.xml +++ b/conf/examples/3GB/standalone/accumulo-site.xml @@ -84,15 +84,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/512MB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/512MB/native-standalone/accumulo-env.sh b/conf/examples/512MB/native-standalone/accumulo-env.sh index 275931c..64432df 100755 --- a/conf/examples/512MB/native-standalone/accumulo-env.sh +++ b/conf/examples/512MB/native-standalone/accumulo-env.sh @@ -34,9 +34,10 @@ else HADOOP_PREFIX="$HADOOP_HOME" unset HADOOP_HOME fi -test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" -# hadoop-2.0: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" + +# hadoop-1.2: +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 4f9d115..09e3e30 100644 --- a/conf/examples/512MB/native-standalone/accumulo-site.xml +++ b/conf/examples/512MB/native-standalone/accumulo-site.xml @@ -89,15 +89,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/512MB/standalone/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/conf/examples/512MB/standalone/accumulo-env.sh b/conf/examples/512MB/standalone/accumulo-env.sh index 8bf637e..d4a4703 100755 --- a/conf/examples/512MB/standalone/accumulo-env.sh +++ b/conf/examples/512MB/standalone/accumulo-env.sh @@ -34,9 +34,10 @@ else HADOOP_PREFIX="$HADOOP_HOME" unset HADOOP_HOME fi -test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" + # hadoop-2.0: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" +# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" +test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 142908e..e6ed6de 100644 --- a/conf/examples/512MB/standalone/accumulo-site.xml +++ b/conf/examples/512MB/standalone/accumulo-site.xml @@ -95,15 +95,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/conf/examples/crypto/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/conf/examples/crypto/accumulo-site.xml b/conf/examples/crypto/accumulo-site.xml index 77bf8db..1975fed 100644 --- a/conf/examples/crypto/accumulo-site.xml +++ b/conf/examples/crypto/accumulo-site.xml @@ -90,18 +90,25 @@ <property> <name>general.classpaths</name> <value> - $ACCUMULO_HOME/server/target/classes/, - $ACCUMULO_HOME/core/target/classes/, - $ACCUMULO_HOME/start/target/classes/, - $ACCUMULO_HOME/fate/target/classes/, - $ACCUMULO_HOME/proxy/target/classes/, - $ACCUMULO_HOME/examples/target/classes/, - $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, - $ACCUMULO_HOME/lib/[^.].*.jar, - $ZOOKEEPER_HOME/zookeeper[^.].*.jar, - $HADOOP_CONF_DIR, - $HADOOP_PREFIX/[^.].*.jar, - $HADOOP_PREFIX/lib/[^.].*.jar, + <!-- Comment the following for hadoop-1.2 --> + $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, + + $ACCUMULO_HOME/server/target/classes/, + $ACCUMULO_HOME/core/target/classes/, + $ACCUMULO_HOME/start/target/classes/, + $ACCUMULO_HOME/fate/target/classes/, + $ACCUMULO_HOME/proxy/target/classes/, + $ACCUMULO_HOME/examples/target/classes/, + $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, + $ACCUMULO_HOME/lib/[^.].*.jar, + $ZOOKEEPER_HOME/zookeeper[^.].*.jar, + $HADOOP_CONF_DIR, + $HADOOP_PREFIX/[^.].*.jar, + $HADOOP_PREFIX/lib/[^.].*.jar, </value> <description>Classpaths that accumulo checks for updates and class files. When using the Security Manager, please remove the ".../target/classes/" values. http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/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 3cff92f..a7a43fa 100644 --- a/conf/examples/vfs-classloader/accumulo-site.xml +++ b/conf/examples/vfs-classloader/accumulo-site.xml @@ -89,15 +89,14 @@ <property> <name>general.classpaths</name> - <!-- - Add the following for hadoop-2.0 - $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, - --> <value> + <!-- Comment the following for hadoop-1.2 --> + $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, + $ACCUMULO_HOME/lib/accumulo-server.jar, $ACCUMULO_HOME/lib/accumulo-core.jar, $ACCUMULO_HOME/lib/accumulo-start.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1628795..2f22e73 100644 --- a/pom.xml +++ b/pom.xml @@ -898,12 +898,13 @@ </reporting> </profile> <profile> - <!-- profile for building against Hadoop 1.0.x - Activate by not specifying hadoop.profile --> - <id>hadoop-1.0</id> + <!-- profile for building against Hadoop 1.2.x + Activate using: mvn -Dhadoop.profile=1.2 --> + <id>hadoop-1.2</id> <activation> <property> - <name>!hadoop.profile</name> + <name>hadoop.profile</name> + <value>1.2</value> </property> </activation> <properties> @@ -913,19 +914,18 @@ </properties> </profile> <profile> - <!-- profile for building against Hadoop 2.0.x - Activate using: mvn -Dhadoop.profile=2.0 --> - <id>hadoop-2.0</id> + <!-- profile for building against Hadoop 2.2.x + Activate by not specifying hadoop.profile --> + <id>hadoop-2.2</id> <activation> <property> - <name>hadoop.profile</name> - <value>2.0</value> + <name>!hadoop.profile</name> </property> </activation> <properties> - <hadoop.version>2.0.5-alpha</hadoop.version> + <hadoop.version>2.2.0</hadoop.version> <httpclient.version>3.1</httpclient.version> - <slf4j.version>1.6.1</slf4j.version> + <slf4j.version>1.7.5</slf4j.version> </properties> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/accumulo/blob/cdc1dc9f/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index e4d32e5..d1e6981 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -209,12 +209,13 @@ </build> </profile> <profile> - <!-- profile for building against Hadoop 1.0.x - Activate by not specifying hadoop.profile --> - <id>hadoop-1.0</id> + <!-- profile for building against Hadoop 1.2.x + Activate using: mvn -Dhadoop.profile=1.2 --> + <id>hadoop-1.2</id> <activation> <property> - <name>!hadoop.profile</name> + <name>hadoop.profile</name> + <value>1.2</value> </property> </activation> <dependencies> @@ -226,13 +227,12 @@ </dependencies> </profile> <profile> - <!-- profile for building against Hadoop 2.0.x - Activate using: mvn -Dhadoop.profile=2.0 --> - <id>hadoop-2.0</id> + <!-- profile for building against Hadoop 2.2.x + Activate by not specifying hadoop.profile --> + <id>hadoop-2.2</id> <activation> <property> - <name>hadoop.profile</name> - <value>2.0</value> + <name>!hadoop.profile</name> </property> </activation> <dependencies>
