This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 2b0b971 Remove warnings from #1495
add 9f487a0 Switch to Log4j2 (#1528)
No new revisions were added by this update.
Summary of changes:
assemble/conf/accumulo-env.sh | 15 +-
assemble/conf/log4j-monitor.properties | 40 ----
assemble/conf/log4j-service.properties | 62 ------
assemble/conf/log4j.properties | 42 ----
assemble/conf/log4j2-service.properties | 88 ++++++++
.../{accumulo.properties => log4j2.properties} | 30 +--
assemble/pom.xml | 40 +++-
assemble/src/main/assemblies/component.xml | 8 +-
core/pom.xml | 16 +-
.../java/org/apache/accumulo/core/Constants.java | 1 -
.../org/apache/accumulo/core/conf/Property.java | 2 -
.../org/apache/accumulo/core/util/MonitorUtil.java | 3 +-
.../apache/accumulo/core/util/MonitorUtilTest.java | 35 +++-
core/src/test/resources/log4j.properties | 34 ---
core/src/test/resources/log4j2-test.properties | 62 ++++++
hadoop-mapreduce/pom.xml | 4 +-
.../src/test/resources/log4j.properties | 34 ---
.../src/test/resources/log4j2-test.properties | 62 ++++++
iterator-test-harness/pom.xml | 4 +-
.../src/test/resources/log4j2-test.properties | 33 +--
minicluster/pom.xml | 19 +-
.../miniclusterImpl/MiniAccumuloConfigImpl.java | 1 -
.../minicluster/MiniAccumuloClusterTest.java | 3 +-
minicluster/src/test/resources/log4j.properties | 26 ---
.../src/test/resources/log4j2-test.properties | 23 ++-
pom.xml | 42 +++-
server/base/pom.xml | 12 +-
.../accumulo/server/monitor/DedupedLogEvent.java | 71 -------
.../apache/accumulo/server/monitor/LogService.java | 197 ------------------
.../src/test/resources/log4j2-test.properties} | 20 +-
server/gc/pom.xml | 8 +-
.../gc/src/test/resources/log4j2-test.properties | 23 ++-
server/master/pom.xml | 8 +-
server/master/src/test/resources/log4j.properties | 25 ---
.../src/test/resources/log4j2-test.properties} | 20 +-
server/monitor/pom.xml | 30 ++-
.../apache/accumulo/monitor/EmbeddedWebServer.java | 22 +-
.../java/org/apache/accumulo/monitor/Monitor.java | 35 ++--
.../accumulo/monitor/rest/logs/LogEvent.java | 60 ------
.../accumulo/monitor/rest/logs/LogResource.java | 64 ++----
.../monitor/rest/logs/SanitizedLogEvent.java | 65 ++++++
.../{DeadLoggerList.java => SingleLogEvent.java} | 27 +--
.../monitor/rest/status/StatusResource.java | 22 +-
.../monitor/util/AccumuloMonitorAppender.java | 228 ---------------------
.../util/logging/AccumuloMonitorAppender.java | 147 +++++++++++++
.../accumulo/monitor/util/logging/RecentLogs.java | 90 ++++++++
.../accumulo/monitor/resources/js/functions.js | 2 +-
.../org/apache/accumulo/monitor/templates/log.ftl | 14 +-
.../monitor/util/AccumuloMonitorAppenderTest.java | 208 -------------------
server/monitor/src/test/resources/log4j.properties | 23 ---
.../src/test/resources/log4j2-test.properties} | 18 +-
server/native/pom.xml | 6 +-
server/tracer/pom.xml | 8 +-
server/tracer/src/test/resources/log4j.properties | 25 ---
.../resources/log4j2-test.properties} | 20 +-
server/tserver/pom.xml | 8 +-
server/tserver/src/test/resources/log4j.properties | 40 ----
.../src/test/resources/log4j2-test.properties | 80 ++++++++
shell/pom.xml | 10 +-
shell/src/test/resources/log4j.properties | 32 ---
shell/src/test/resources/log4j2-test.properties | 56 +++++
start/pom.xml | 15 +-
.../src/test/resources/log4j2-test.properties | 23 ++-
test/pom.xml | 12 +-
.../accumulo/test/functional/MonitorSslIT.java | 2 +-
.../accumulo/test/functional/ReadWriteIT.java | 4 +-
test/src/main/resources/log4j.properties | 63 ------
test/src/main/resources/log4j2-test.properties | 144 +++++++++++++
68 files changed, 1213 insertions(+), 1503 deletions(-)
delete mode 100644 assemble/conf/log4j-monitor.properties
delete mode 100644 assemble/conf/log4j-service.properties
delete mode 100644 assemble/conf/log4j.properties
create mode 100644 assemble/conf/log4j2-service.properties
copy assemble/conf/{accumulo.properties => log4j2.properties} (53%)
delete mode 100644 core/src/test/resources/log4j.properties
create mode 100644 core/src/test/resources/log4j2-test.properties
delete mode 100644 hadoop-mapreduce/src/test/resources/log4j.properties
create mode 100644 hadoop-mapreduce/src/test/resources/log4j2-test.properties
copy assemble/conf/accumulo.properties =>
iterator-test-harness/src/test/resources/log4j2-test.properties (54%)
delete mode 100644 minicluster/src/test/resources/log4j.properties
copy server/tracer/src/main/scripts/generate-thrift.sh =>
minicluster/src/test/resources/log4j2-test.properties (60%)
mode change 100755 => 100644
delete mode 100644
server/base/src/main/java/org/apache/accumulo/server/monitor/DedupedLogEvent.java
delete mode 100644
server/base/src/main/java/org/apache/accumulo/server/monitor/LogService.java
copy server/{tracer/src/main/scripts/generate-thrift.sh =>
base/src/test/resources/log4j2-test.properties} (64%)
mode change 100755 => 100644
rename start/src/test/resources/log4j.properties =>
server/gc/src/test/resources/log4j2-test.properties (60%)
delete mode 100644 server/master/src/test/resources/log4j.properties
rename server/{base/src/test/resources/log4j.properties =>
master/src/test/resources/log4j2-test.properties} (64%)
delete mode 100644
server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/LogEvent.java
create mode 100644
server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/SanitizedLogEvent.java
copy
server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/{DeadLoggerList.java
=> SingleLogEvent.java} (67%)
delete mode 100644
server/monitor/src/main/java/org/apache/accumulo/monitor/util/AccumuloMonitorAppender.java
create mode 100644
server/monitor/src/main/java/org/apache/accumulo/monitor/util/logging/AccumuloMonitorAppender.java
create mode 100644
server/monitor/src/main/java/org/apache/accumulo/monitor/util/logging/RecentLogs.java
delete mode 100644
server/monitor/src/test/java/org/apache/accumulo/monitor/util/AccumuloMonitorAppenderTest.java
delete mode 100644 server/monitor/src/test/resources/log4j.properties
rename server/{gc/src/test/resources/log4j.properties =>
monitor/src/test/resources/log4j2-test.properties} (69%)
delete mode 100644 server/tracer/src/test/resources/log4j.properties
copy server/tracer/src/{main/scripts/generate-thrift.sh =>
test/resources/log4j2-test.properties} (64%)
mode change 100755 => 100644
delete mode 100644 server/tserver/src/test/resources/log4j.properties
create mode 100644 server/tserver/src/test/resources/log4j2-test.properties
delete mode 100644 shell/src/test/resources/log4j.properties
create mode 100644 shell/src/test/resources/log4j2-test.properties
rename iterator-test-harness/src/test/resources/log4j.properties =>
start/src/test/resources/log4j2-test.properties (64%)
delete mode 100644 test/src/main/resources/log4j.properties
create mode 100644 test/src/main/resources/log4j2-test.properties
