Author: ecn
Date: Wed Jan 9 20:43:35 2013
New Revision: 1431051
URL: http://svn.apache.org/viewvc?rev=1431051&view=rev
Log:
ACCUMULO-645 switch to using HADOOP_PREFIX and HADOOP_CONF_DIR
Modified:
accumulo/trunk/bin/config.sh
accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh
accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh
accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh
accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh
accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh
accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh
accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh
accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh
Modified: accumulo/trunk/bin/config.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/bin/config.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/bin/config.sh (original)
+++ accumulo/trunk/bin/config.sh Wed Jan 9 20:43:35 2013
@@ -49,24 +49,23 @@ if [ -z ${ACCUMULO_VERSION} ]; then
ACCUMULO_VERSION=1.5.0-SNAPSHOT
fi
-if [ -z "$HADOOP_HOME" ]
+if [ -z "$HADOOP_PREFIX" ]
then
HADOOP_HOME="`which hadoop`"
- if [ -z "$HADOOP_HOME" ]
+ if [ -z "$HADOOP_PREFIX" ]
then
- echo "You must set HADOOP_HOME"
+ echo "You must set HADOOP_PREFIX"
exit 1
fi
- HADOOP_HOME=`dirname $HADOOP_HOME`
- HADOOP_HOME=`dirname $HADOOP_HOME`
+ HADOOP_HOME=`dirname $HADOOP_PREFIX`
+ HADOOP_HOME=`dirname $HADOOP_PREFIX`
fi
-if [ ! -d "$HADOOP_HOME" ]
+if [ ! -d "$HADOOP_PREFIX" ]
then
- echo "$HADOOP_HOME is not a directory"
+ echo "$HADOOP_PREFIX is not a directory"
exit 1
fi
-export HADOOP_HOME
-export HADOOP_HOME_WARN_SUPPRESS=leavemealone
+export HADOOP_PREFIX
if [ ! -f "$ACCUMULO_HOME/conf/masters" -o ! -f "$ACCUMULO_HOME/conf/slaves" ]
then
Modified: accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh
(original)
+++ accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh Wed Jan
9 20:43:35 2013
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z "$HADOOP_HOME" ]
+then
+ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX="$HADOOP_HOME"
+ unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR" && export
HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
Modified: accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh Wed Jan 9
20:43:35 2013
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z "$HADOOP_HOME" ]
+then
+ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX="$HADOOP_HOME"
+ unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR" && export
HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
Modified: accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh
(original)
+++ accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh Wed Jan
9 20:43:35 2013
@@ -27,9 +27,16 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z "$HADOOP_HOME" ]
+then
+ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX="$HADOOP_HOME"
+ unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR" && export
HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
Modified: accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh Wed Jan 9
20:43:35 2013
@@ -27,9 +27,17 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z "$HADOOP_HOME" ]
+then
+ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX="$HADOOP_HOME"
+ unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR" && export
HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
Modified: accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh
(original)
+++ accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh Wed Jan
9 20:43:35 2013
@@ -27,9 +27,16 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z "$HADOOP_HOME" ]
+then
+ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX="$HADOOP_HOME"
+ unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR" && export
HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
Modified: accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh Wed Jan 9
20:43:35 2013
@@ -27,9 +27,16 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z "$HADOOP_HOME" ]
+then
+ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX="$HADOOP_HOME"
+ unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR" && export
HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
Modified: accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh
(original)
+++ accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh Wed
Jan 9 20:43:35 2013
@@ -27,9 +27,16 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z "$HADOOP_HOME" ]
+then
+ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX="$HADOOP_HOME"
+ unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR" && export
HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
Modified: accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh
URL:
http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh?rev=1431051&r1=1431050&r2=1431051&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh Wed Jan 9
20:43:35 2013
@@ -27,9 +27,16 @@
### you may want to use smaller values, especially when running everything
### on a single machine.
###
+if [ -z "$HADOOP_HOME" ]
+then
+ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
+else
+ HADOOP_PREFIX="$HADOOP_HOME"
+ unset HADOOP_HOME
+fi
+test -z "$HADOOP_CONF_DIR" && export
HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
-test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
