accumulo git commit: ACCUMULO-3953 Add missing license header.

2015-08-05 Thread elserj 
Repository: accumulo
Updated Branches:
  refs/heads/master ccc21487c - 774c2c7cf


ACCUMULO-3953 Add missing license header.


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

Branch: refs/heads/master
Commit: 774c2c7cf3f0652215d2ce598baaa5f3fc9890a6
Parents: ccc2148
Author: Josh Elser els...@apache.org
Authored: Wed Aug 5 12:17:22 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Aug 5 12:17:22 2015 -0400

--
 .../org/apache/accumulo/test/GetFileInfoBulkIT.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/774c2c7c/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java
--
diff --git a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java 
b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java
index 62aef7a..e0a0832 100644
--- a/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/GetFileInfoBulkIT.java
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.test;
 
 import static org.junit.Assert.assertEquals;

[6/6] accumulo git commit: Merge branch '1.7'

2015-08-05 Thread elserj 
Merge branch '1.7'


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

Branch: refs/heads/master
Commit: b16c6453a96ace0db64870fe3f1a8cf59ca40ef2
Parents: b8e19a4 5f76160
Author: Josh Elser els...@apache.org
Authored: Wed Aug 5 12:37:28 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Aug 5 12:37:28 2015 -0400

--

--

[2/6] accumulo git commit: ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

2015-08-05 Thread elserj 
ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

The `find` command may fail (personally, ran into this when the cwd
was a directory that was not readable by the user). We miss this
and blindly proceed. Presently, Accumulo processes will fail miserably
when log4j isn't present. Since the user _may_ add a log4j jar to the
CLASSPATH, we avoid erroring out when CLASSPATH is non-empty

Conflicts:
assemble/bin/accumulo


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

Branch: refs/heads/1.7
Commit: 6425c37dc5ad13b5b9a9cf8151f53a76be845a03
Parents: 48ad87a
Author: Josh Elser els...@apache.org
Authored: Wed Aug 5 12:30:24 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Aug 5 12:36:19 2015 -0400

--
 assemble/bin/accumulo | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6425c37d/assemble/bin/accumulo
--
diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo
index 0c6c137..301d9a3 100755
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@ -117,6 +117,14 @@ esac
 
 XML_FILES=${ACCUMULO_CONF_DIR}
 LOG4J_JAR=$(find -H ${HADOOP_PREFIX}/lib 
${HADOOP_PREFIX}/share/hadoop/common/lib -name 'log4j*.jar' -print 
2/dev/null | head -1)
+
+# The `find` command could fail for environmental reasons or bad configuration
+# Avoid trying to run Accumulo when we can't find the jar
+if [ -z ${LOG4J_JAR} ]; then
+   echo Could not locate Log4j jar in Hadoop installation at ${HADOOP_PREFIX}
+   exit 1
+fi
+
 CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
 
 if [ -z ${JAVA_HOME} -o ! -d ${JAVA_HOME} ]; then

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

2015-08-05 Thread elserj 
Merge branch '1.6' into 1.7

Conflicts:
assemble/bin/accumulo


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

Branch: refs/heads/master
Commit: 5f76160c1d856bc07a09c23e2d03e6b0a113049b
Parents: 4dd8c54 6425c37
Author: Josh Elser els...@apache.org
Authored: Wed Aug 5 12:37:21 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Aug 5 12:37:21 2015 -0400

--
 assemble/bin/accumulo | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5f76160c/assemble/bin/accumulo
--
diff --cc assemble/bin/accumulo
index 6e30c95,301d9a3..a688879
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@@ -112,8 -117,15 +112,16 @@@ esa
  
  XML_FILES=${ACCUMULO_CONF_DIR}
  LOG4J_JAR=$(find -H ${HADOOP_PREFIX}/lib 
${HADOOP_PREFIX}/share/hadoop/common/lib -name 'log4j*.jar' -print 
2/dev/null | head -1)
 
+SLF4J_JARS=${ACCUMULO_HOME}/lib/slf4j-api.jar:${ACCUMULO_HOME}/lib/slf4j-log4j12.jar
+ 
+ # The `find` command could fail for environmental reasons or bad configuration
+ # Avoid trying to run Accumulo when we can't find the jar
 -if [ -z ${LOG4J_JAR} ]; then
++if [ -z ${LOG4J_JAR} -a -z ${CLASSPATH} ]; then
+echo Could not locate Log4j jar in Hadoop installation at 
${HADOOP_PREFIX}
+exit 1
+ fi
+ 
 -CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
 +CLASSPATH=${XML_FILES}:${START_JAR}:${SLF4J_JARS}:${LOG4J_JAR}:${CLASSPATH}
  
  if [ -z ${JAVA_HOME} -o ! -d ${JAVA_HOME} ]; then
 echo JAVA_HOME is not set or is not a directory.  Please make sure it's 
set globally or in conf/accumulo-env.sh

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

2015-08-05 Thread elserj 
Merge branch '1.6' into 1.7

Conflicts:
assemble/bin/accumulo


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

Branch: refs/heads/1.7
Commit: 5f76160c1d856bc07a09c23e2d03e6b0a113049b
Parents: 4dd8c54 6425c37
Author: Josh Elser els...@apache.org
Authored: Wed Aug 5 12:37:21 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Aug 5 12:37:21 2015 -0400

--
 assemble/bin/accumulo | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5f76160c/assemble/bin/accumulo
--
diff --cc assemble/bin/accumulo
index 6e30c95,301d9a3..a688879
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@@ -112,8 -117,15 +112,16 @@@ esa
  
  XML_FILES=${ACCUMULO_CONF_DIR}
  LOG4J_JAR=$(find -H ${HADOOP_PREFIX}/lib 
${HADOOP_PREFIX}/share/hadoop/common/lib -name 'log4j*.jar' -print 
2/dev/null | head -1)
 
+SLF4J_JARS=${ACCUMULO_HOME}/lib/slf4j-api.jar:${ACCUMULO_HOME}/lib/slf4j-log4j12.jar
+ 
+ # The `find` command could fail for environmental reasons or bad configuration
+ # Avoid trying to run Accumulo when we can't find the jar
 -if [ -z ${LOG4J_JAR} ]; then
++if [ -z ${LOG4J_JAR} -a -z ${CLASSPATH} ]; then
+echo Could not locate Log4j jar in Hadoop installation at 
${HADOOP_PREFIX}
+exit 1
+ fi
+ 
 -CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
 +CLASSPATH=${XML_FILES}:${START_JAR}:${SLF4J_JARS}:${LOG4J_JAR}:${CLASSPATH}
  
  if [ -z ${JAVA_HOME} -o ! -d ${JAVA_HOME} ]; then
 echo JAVA_HOME is not set or is not a directory.  Please make sure it's 
set globally or in conf/accumulo-env.sh

[1/6] accumulo git commit: ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

2015-08-05 Thread elserj 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 48ad87a81 - 6425c37dc
  refs/heads/1.7 4dd8c5433 - 5f76160c1
  refs/heads/master b8e19a4ac - b16c6453a


ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

The `find` command may fail (personally, ran into this when the cwd
was a directory that was not readable by the user). We miss this
and blindly proceed. Presently, Accumulo processes will fail miserably
when log4j isn't present. Since the user _may_ add a log4j jar to the
CLASSPATH, we avoid erroring out when CLASSPATH is non-empty

Conflicts:
assemble/bin/accumulo


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

Branch: refs/heads/1.6
Commit: 6425c37dc5ad13b5b9a9cf8151f53a76be845a03
Parents: 48ad87a
Author: Josh Elser els...@apache.org
Authored: Wed Aug 5 12:30:24 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Aug 5 12:36:19 2015 -0400

--
 assemble/bin/accumulo | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6425c37d/assemble/bin/accumulo
--
diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo
index 0c6c137..301d9a3 100755
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@ -117,6 +117,14 @@ esac
 
 XML_FILES=${ACCUMULO_CONF_DIR}
 LOG4J_JAR=$(find -H ${HADOOP_PREFIX}/lib 
${HADOOP_PREFIX}/share/hadoop/common/lib -name 'log4j*.jar' -print 
2/dev/null | head -1)
+
+# The `find` command could fail for environmental reasons or bad configuration
+# Avoid trying to run Accumulo when we can't find the jar
+if [ -z ${LOG4J_JAR} ]; then
+   echo Could not locate Log4j jar in Hadoop installation at ${HADOOP_PREFIX}
+   exit 1
+fi
+
 CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
 
 if [ -z ${JAVA_HOME} -o ! -d ${JAVA_HOME} ]; then

[3/6] accumulo git commit: ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

2015-08-05 Thread elserj 
ACCUMULO-3952 Verify the log4j jar was found in the Hadoop installation.

The `find` command may fail (personally, ran into this when the cwd
was a directory that was not readable by the user). We miss this
and blindly proceed. Presently, Accumulo processes will fail miserably
when log4j isn't present. Since the user _may_ add a log4j jar to the
CLASSPATH, we avoid erroring out when CLASSPATH is non-empty

Conflicts:
assemble/bin/accumulo


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

Branch: refs/heads/master
Commit: 6425c37dc5ad13b5b9a9cf8151f53a76be845a03
Parents: 48ad87a
Author: Josh Elser els...@apache.org
Authored: Wed Aug 5 12:30:24 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Wed Aug 5 12:36:19 2015 -0400

--
 assemble/bin/accumulo | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6425c37d/assemble/bin/accumulo
--
diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo
index 0c6c137..301d9a3 100755
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@ -117,6 +117,14 @@ esac
 
 XML_FILES=${ACCUMULO_CONF_DIR}
 LOG4J_JAR=$(find -H ${HADOOP_PREFIX}/lib 
${HADOOP_PREFIX}/share/hadoop/common/lib -name 'log4j*.jar' -print 
2/dev/null | head -1)
+
+# The `find` command could fail for environmental reasons or bad configuration
+# Avoid trying to run Accumulo when we can't find the jar
+if [ -z ${LOG4J_JAR} ]; then
+   echo Could not locate Log4j jar in Hadoop installation at ${HADOOP_PREFIX}
+   exit 1
+fi
+
 CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
 
 if [ -z ${JAVA_HOME} -o ! -d ${JAVA_HOME} ]; then