Merge branch '1.6.1-SNAPSHOT'
Conflicts:
conf/examples/1GB/standalone/log4j.properties
conf/examples/2GB/native-standalone/log4j.properties
conf/examples/2GB/standalone/log4j.properties
conf/examples/3GB/native-standalone/log4j.properties
conf/examples/3GB/standalone/log4j.properties
conf/examples/512MB/native-standalone/log4j.properties
conf/examples/512MB/standalone/log4j.properties
conf/templates/log4j.properties
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/560beced
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/560beced
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/560beced
Branch: refs/heads/master
Commit: 560beced66c7f23261914f5dd3c6fe9ee962bff0
Parents: f295f8f 037ad96
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu Jun 26 19:42:24 2014 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu Jun 26 19:42:24 2014 -0400
----------------------------------------------------------------------
assemble/bin/LogForwarder.sh | 50 +++
assemble/bin/accumulo | 171 ++++++++++
assemble/bin/bootstrap_config.sh | 319 +++++++++++++++++++
assemble/bin/bootstrap_hdfs.sh | 84 +++++
assemble/bin/build_native_library.sh | 74 +++++
assemble/bin/check-slaves | 199 ++++++++++++
assemble/bin/config.sh | 177 ++++++++++
assemble/bin/generate_monitor_certificate.sh | 84 +++++
assemble/bin/start-all.sh | 77 +++++
assemble/bin/start-here.sh | 78 +++++
assemble/bin/start-server.sh | 87 +++++
assemble/bin/stop-all.sh | 68 ++++
assemble/bin/stop-here.sh | 60 ++++
assemble/bin/stop-server.sh | 56 ++++
assemble/bin/tdown.sh | 49 +++
assemble/bin/tool.sh | 93 ++++++
assemble/bin/tup.sh | 46 +++
assemble/conf/examples/crypto/README | 23 ++
assemble/conf/examples/crypto/accumulo-site.xml | 171 ++++++++++
.../examples/vfs-classloader/accumulo-site.xml | 175 ++++++++++
assemble/conf/templates/accumulo-env.sh | 66 ++++
assemble/conf/templates/accumulo-metrics.xml | 60 ++++
assemble/conf/templates/accumulo-site.xml | 132 ++++++++
assemble/conf/templates/accumulo.policy.example | 143 +++++++++
assemble/conf/templates/auditLog.xml | 35 ++
assemble/conf/templates/gc | 16 +
.../conf/templates/generic_logger.properties | 58 ++++
assemble/conf/templates/generic_logger.xml | 83 +++++
assemble/conf/templates/log4j.properties | 42 +++
assemble/conf/templates/masters | 16 +
assemble/conf/templates/monitor | 16 +
.../conf/templates/monitor_logger.properties | 44 +++
assemble/conf/templates/monitor_logger.xml | 64 ++++
assemble/conf/templates/slaves | 16 +
assemble/conf/templates/tracers | 16 +
assemble/pom.xml | 24 ++
assemble/src/main/assemblies/component.xml | 57 ++--
bin/LogForwarder.sh | 50 ---
bin/accumulo | 171 ----------
bin/bootstrap_config.sh | 319 -------------------
bin/bootstrap_hdfs.sh | 84 -----
bin/build_native_library.sh | 74 -----
bin/check-slaves | 199 ------------
bin/config.sh | 177 ----------
bin/generate_monitor_certificate.sh | 84 -----
bin/start-all.sh | 77 -----
bin/start-here.sh | 78 -----
bin/start-server.sh | 87 -----
bin/stop-all.sh | 68 ----
bin/stop-here.sh | 60 ----
bin/stop-server.sh | 56 ----
bin/tdown.sh | 49 ---
bin/tool.sh | 93 ------
bin/tup.sh | 46 ---
conf/accumulo.policy.example | 143 ---------
.../1GB/native-standalone/accumulo-env.sh | 66 ----
.../1GB/native-standalone/accumulo-metrics.xml | 60 ----
.../1GB/native-standalone/accumulo-site.xml | 122 -------
.../examples/1GB/native-standalone/auditLog.xml | 41 ---
conf/examples/1GB/native-standalone/gc | 16 -
.../1GB/native-standalone/generic_logger.xml | 83 -----
.../1GB/native-standalone/log4j.properties | 42 ---
conf/examples/1GB/native-standalone/masters | 16 -
conf/examples/1GB/native-standalone/monitor | 16 -
.../1GB/native-standalone/monitor_logger.xml | 64 ----
conf/examples/1GB/native-standalone/slaves | 16 -
conf/examples/1GB/native-standalone/tracers | 16 -
conf/examples/1GB/standalone/accumulo-env.sh | 66 ----
.../1GB/standalone/accumulo-metrics.xml | 60 ----
conf/examples/1GB/standalone/accumulo-site.xml | 122 -------
conf/examples/1GB/standalone/auditLog.xml | 41 ---
conf/examples/1GB/standalone/gc | 16 -
conf/examples/1GB/standalone/generic_logger.xml | 83 -----
conf/examples/1GB/standalone/log4j.properties | 42 ---
conf/examples/1GB/standalone/masters | 16 -
conf/examples/1GB/standalone/monitor | 16 -
conf/examples/1GB/standalone/monitor_logger.xml | 64 ----
conf/examples/1GB/standalone/slaves | 16 -
conf/examples/1GB/standalone/tracers | 16 -
.../2GB/native-standalone/accumulo-env.sh | 65 ----
.../2GB/native-standalone/accumulo-metrics.xml | 60 ----
.../2GB/native-standalone/accumulo-site.xml | 112 -------
.../examples/2GB/native-standalone/auditLog.xml | 41 ---
conf/examples/2GB/native-standalone/gc | 16 -
.../2GB/native-standalone/generic_logger.xml | 83 -----
.../2GB/native-standalone/log4j.properties | 42 ---
conf/examples/2GB/native-standalone/masters | 16 -
conf/examples/2GB/native-standalone/monitor | 16 -
.../2GB/native-standalone/monitor_logger.xml | 64 ----
conf/examples/2GB/native-standalone/slaves | 16 -
conf/examples/2GB/native-standalone/tracers | 16 -
conf/examples/2GB/standalone/accumulo-env.sh | 66 ----
.../2GB/standalone/accumulo-metrics.xml | 60 ----
conf/examples/2GB/standalone/accumulo-site.xml | 125 --------
conf/examples/2GB/standalone/auditLog.xml | 41 ---
conf/examples/2GB/standalone/gc | 16 -
conf/examples/2GB/standalone/generic_logger.xml | 83 -----
conf/examples/2GB/standalone/log4j.properties | 42 ---
conf/examples/2GB/standalone/masters | 16 -
conf/examples/2GB/standalone/monitor | 16 -
conf/examples/2GB/standalone/monitor_logger.xml | 64 ----
conf/examples/2GB/standalone/slaves | 16 -
conf/examples/2GB/standalone/tracers | 16 -
.../3GB/native-standalone/accumulo-env.sh | 65 ----
.../3GB/native-standalone/accumulo-metrics.xml | 60 ----
.../3GB/native-standalone/accumulo-site.xml | 107 -------
.../examples/3GB/native-standalone/auditLog.xml | 41 ---
conf/examples/3GB/native-standalone/gc | 16 -
.../3GB/native-standalone/generic_logger.xml | 83 -----
.../3GB/native-standalone/log4j.properties | 42 ---
conf/examples/3GB/native-standalone/masters | 16 -
conf/examples/3GB/native-standalone/monitor | 16 -
.../3GB/native-standalone/monitor_logger.xml | 64 ----
conf/examples/3GB/native-standalone/slaves | 16 -
conf/examples/3GB/native-standalone/tracers | 16 -
conf/examples/3GB/standalone/accumulo-env.sh | 65 ----
.../3GB/standalone/accumulo-metrics.xml | 60 ----
conf/examples/3GB/standalone/accumulo-site.xml | 112 -------
conf/examples/3GB/standalone/auditLog.xml | 41 ---
conf/examples/3GB/standalone/gc | 16 -
conf/examples/3GB/standalone/generic_logger.xml | 83 -----
conf/examples/3GB/standalone/log4j.properties | 42 ---
conf/examples/3GB/standalone/masters | 16 -
conf/examples/3GB/standalone/monitor | 16 -
conf/examples/3GB/standalone/monitor_logger.xml | 64 ----
conf/examples/3GB/standalone/slaves | 16 -
conf/examples/3GB/standalone/tracers | 16 -
.../512MB/native-standalone/accumulo-env.sh | 65 ----
.../native-standalone/accumulo-metrics.xml | 60 ----
.../512MB/native-standalone/accumulo-site.xml | 117 -------
.../512MB/native-standalone/auditLog.xml | 41 ---
conf/examples/512MB/native-standalone/gc | 16 -
.../512MB/native-standalone/generic_logger.xml | 83 -----
.../512MB/native-standalone/log4j.properties | 42 ---
conf/examples/512MB/native-standalone/masters | 16 -
conf/examples/512MB/native-standalone/monitor | 16 -
.../512MB/native-standalone/monitor_logger.xml | 64 ----
conf/examples/512MB/native-standalone/slaves | 16 -
conf/examples/512MB/native-standalone/tracers | 16 -
conf/examples/512MB/standalone/accumulo-env.sh | 65 ----
.../512MB/standalone/accumulo-metrics.xml | 60 ----
.../examples/512MB/standalone/accumulo-site.xml | 123 -------
conf/examples/512MB/standalone/auditLog.xml | 41 ---
conf/examples/512MB/standalone/gc | 16 -
.../512MB/standalone/generic_logger.xml | 83 -----
conf/examples/512MB/standalone/log4j.properties | 42 ---
conf/examples/512MB/standalone/masters | 16 -
conf/examples/512MB/standalone/monitor | 16 -
.../512MB/standalone/monitor_logger.xml | 64 ----
conf/examples/512MB/standalone/slaves | 16 -
conf/examples/512MB/standalone/tracers | 16 -
conf/examples/crypto/README | 23 --
conf/examples/crypto/accumulo-site.xml | 171 ----------
conf/examples/vfs-classloader/accumulo-site.xml | 175 ----------
conf/templates/accumulo-env.sh | 66 ----
conf/templates/accumulo-metrics.xml | 60 ----
conf/templates/accumulo-site.xml | 132 --------
conf/templates/accumulo.policy.example | 143 ---------
conf/templates/auditLog.xml | 35 --
conf/templates/gc | 16 -
conf/templates/generic_logger.properties | 58 ----
conf/templates/generic_logger.xml | 83 -----
conf/templates/log4j.properties | 42 ---
conf/templates/masters | 16 -
conf/templates/monitor | 16 -
conf/templates/monitor_logger.properties | 44 ---
conf/templates/monitor_logger.xml | 64 ----
conf/templates/slaves | 16 -
conf/templates/tracers | 16 -
169 files changed, 3002 insertions(+), 7541 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/560beced/assemble/bin/tool.sh
----------------------------------------------------------------------
diff --cc assemble/bin/tool.sh
index 0000000,376983f..8126b3b
mode 000000,100755..100755
--- a/assemble/bin/tool.sh
+++ b/assemble/bin/tool.sh
@@@ -1,0 -1,92 +1,93 @@@
+ #! /usr/bin/env bash
+
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements. See the NOTICE file distributed with
+ # this work for additional information regarding copyright ownership.
+ # The ASF licenses this file to You under the Apache License, Version 2.0
+ # (the "License"); you may not use this file except in compliance with
+ # the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+ # Start: Resolve Script Directory
+ SOURCE="${BASH_SOURCE[0]}"
+ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a
symlink
+ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ $SOURCE != /* ]] && SOURCE="$bin/$SOURCE" # if $SOURCE was a relative
symlink, we need to resolve it relative to the path where the symlink file was
located
+ done
+ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ # Stop: Resolve Script Directory
+
+ . "$bin"/config.sh
+
+ if [ -z "$HADOOP_PREFIX" ] ; then
+ echo "HADOOP_PREFIX is not set. Please make sure it's set globally or in
conf/accumulo-env.sh"
+ exit 1
+ fi
+ if [ -z "$ZOOKEEPER_HOME" ] ; then
+ echo "ZOOKEEPER_HOME is not set. Please make sure it's set globally or in
conf/accumulo-env.sh"
+ exit 1
+ fi
+
+ ZOOKEEPER_CMD='ls -1 $ZOOKEEPER_HOME/zookeeper-[0-9]*[^csn].jar '
+ if [ `eval $ZOOKEEPER_CMD | wc -l` != "1" ] ; then
+ echo "Not exactly one zookeeper jar in $ZOOKEEPER_HOME"
+ exit 1
+ fi
+ ZOOKEEPER_LIB=$(eval $ZOOKEEPER_CMD)
+
+ LIB="$ACCUMULO_HOME/lib"
++MAPREDUCE_LIB="$LIB/accumulo-mapreduce.jar"
+ CORE_LIB="$LIB/accumulo-core.jar"
+ FATE_LIB="$LIB/accumulo-fate.jar"
+ THRIFT_LIB="$LIB/libthrift.jar"
+ TRACE_LIB="$LIB/accumulo-trace.jar"
+ JCOMMANDER_LIB="$LIB/jcommander.jar"
+ COMMONS_VFS_LIB="$LIB/commons-vfs2.jar"
+ GUAVA_LIB="$LIB/guava.jar"
+
+ USERJARS=" "
+ for arg in "$@"; do
+ if [ "$arg" != "-libjars" -a -z "$TOOLJAR" ]; then
+ TOOLJAR="$arg"
+ shift
+ elif [ "$arg" != "-libjars" -a -z "$CLASSNAME" ]; then
+ CLASSNAME="$arg"
+ shift
+ elif [ -z "$USERJARS" ]; then
+ USERJARS=$(echo "$arg" | tr "," " ")
+ shift
+ elif [ "$arg" = "-libjars" ]; then
+ USERJARS=""
+ shift
+ else
+ break
+ fi
+ done
+
-LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$TRACE_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB,$GUAVA_LIB"
-H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB:$GUAVA_LIB"
++LIB_JARS="$THRIFT_LIB,$MAPREDUCE_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$TRACE_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB,$GUAVA_LIB"
++H_JARS="$THRIFT_LIB:$MAPREDUCE_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB:$COMMONS_VFS_LIB:$GUAVA_LIB"
+
+ for jar in $USERJARS; do
+ LIB_JARS="$LIB_JARS,$jar"
+ H_JARS="$H_JARS:$jar"
+ done
+ export HADOOP_CLASSPATH="$H_JARS:$HADOOP_CLASSPATH"
+
+ if [ -z "$CLASSNAME" -o -z "$TOOLJAR" ]; then
+ echo "Usage: tool.sh path/to/myTool.jar my.tool.class.Name [-libjars
my1.jar,my2.jar]" 1>&2
+ exit 1
+ fi
+
+ #echo USERJARS=$USERJARS
+ #echo CLASSNAME=$CLASSNAME
+ #echo HADOOP_CLASSPATH=$HADOOP_CLASSPATH
+ #echo exec "$HADOOP_PREFIX/bin/hadoop" jar "$TOOLJAR" $CLASSNAME -libjars
\"$LIB_JARS\" $ARGS
+ exec "$HADOOP_PREFIX/bin/hadoop" jar "$TOOLJAR" $CLASSNAME -libjars
\"$LIB_JARS\" "$@"
http://git-wip-us.apache.org/repos/asf/accumulo/blob/560beced/assemble/conf/templates/log4j.properties
----------------------------------------------------------------------
diff --cc assemble/conf/templates/log4j.properties
index 0000000,f3eaddc..9858795
mode 000000,100644..100644
--- a/assemble/conf/templates/log4j.properties
+++ b/assemble/conf/templates/log4j.properties
@@@ -1,0 -1,42 +1,42 @@@
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements. See the NOTICE file distributed with
+ # this work for additional information regarding copyright ownership.
+ # The ASF licenses this file to You under the Apache License, Version 2.0
+ # (the "License"); you may not use this file except in compliance with
+ # the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+ # default logging properties:
+ # by default, log everything at INFO or higher to the console
+ log4j.rootLogger=INFO,A1
+
+ # hide Jetty junk
+ log4j.logger.org.mortbay.log=WARN,A1
+
+ # hide "Got brand-new compressor" messages
+ log4j.logger.org.apache.hadoop.io.compress=WARN,A1
+ log4j.logger.org.apache.accumulo.core.file.rfile.bcfile.Compression=WARN,A1
+
+ # hide junk from TestRandomDeletes
+ log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1
+
+ # hide junk from VFS
+ log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1
+
+ # hide almost everything from zookeeper
+ log4j.logger.org.apache.zookeeper=ERROR,A1
+
+ # hide AUDIT messages in the shell, alternatively you could send them to a
different logger
-log4j.logger.org.apache.accumulo.core.util.shell.Shell.audit=WARN,A1
++log4j.logger.org.apache.accumulo.shell.Shell.audit=WARN,A1
+
+ # Send most things to the console
+ log4j.appender.A1=org.apache.log4j.ConsoleAppender
+ log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} [%-8c{2}] %-5p: %m%n
+ log4j.appender.A1.layout=org.apache.log4j.PatternLayout
http://git-wip-us.apache.org/repos/asf/accumulo/blob/560beced/assemble/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/560beced/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------
