You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pr...@apache.org on 2015/12/02 19:32:12 UTC

[1/2] hive git commit: HIVE-12020: Revert log4j2 xml configuration to properties based configuration (Prasanth Jayachandran reviewed by Sergey Shelukhin)

Repository: hive
Updated Branches:
  refs/heads/master cc4709f64 -> e2d9ada8d


http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/bin/runLlapDaemon.sh
----------------------------------------------------------------------
diff --git a/llap-server/bin/runLlapDaemon.sh b/llap-server/bin/runLlapDaemon.sh
index b39c4fd..b015ccb 100755
--- a/llap-server/bin/runLlapDaemon.sh
+++ b/llap-server/bin/runLlapDaemon.sh
@@ -23,7 +23,8 @@ set -x
 #   LLAP_DAEMON_USER_CLASSPATH
 #   LLAP_DAEMON_HEAPSIZE - MB
 #   LLAP_DAEMON_OPTS - additional options
-#   LLAP_DAEMON_LOGGER - default is INFO,console
+#   LLAP_DAEMON_LOG_LEVEL - default is INFO
+#   LLAP_DAEMON_LOGGER - default is console
 #   LLAP_DAEMON_LOG_DIR - defaults to /tmp
 #   LLAP_DAEMON_TMP_DIR - defaults to /tmp
 #   LLAP_DAEMON_LOG_FILE - 
@@ -48,7 +49,8 @@ shift
 
 
 JAVA=$JAVA_HOME/bin/java
-LOG_LEVEL_DEFAULT="INFO,console"
+LOG_LEVEL_DEFAULT="INFO"
+LOGGER_DEFAULT="console"
 JAVA_OPTS_BASE="-server -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps"
 
 # CLASSPATH initially contains $HADOOP_CONF_DIR & $YARN_CONF_DIR
@@ -71,8 +73,13 @@ if [ ! -d "${LLAP_DAEMON_CONF_DIR}" ]; then
 fi
 
 if [ ! -n "${LLAP_DAEMON_LOGGER}" ]; then
-  echo "LLAP_DAEMON_LOGGER not defined... using defaults"
-  LLAP_DAEMON_LOGGER=${LOG_LEVEL_DEFAULT}
+  echo "LLAP_DAEMON_LOGGER not defined... using default: ${LOGGER_DEFAULT}"
+  LLAP_DAEMON_LOGGER=${LOGGER_DEFAULT}
+fi
+
+if [ ! -n "${LLAP_DAEMON_LOG_LEVEL}" ]; then
+  echo "LLAP_DAEMON_LOG_LEVEL not defined... using default: ${LOG_LEVEL_DEFAULT}"
+  LLAP_DAEMON_LOG_LEVEL=${LOG_LEVEL_DEFAULT}
 fi
 
 CLASSPATH=${LLAP_DAEMON_CONF_DIR}:${LLAP_DAEMON_HOME}/lib/*:`${HADOOP_PREFIX}/bin/hadoop classpath`:.
@@ -120,10 +127,11 @@ if [ -n "$LLAP_DAEMON_TMP_DIR" ]; then
   export LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Djava.io.tmpdir=$LLAP_DAEMON_TMP_DIR"
 fi
 
-LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dlog4j.configuration=llap-daemon-log4j.properties"
+LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dlog4j.configurationFile=llap-daemon-log4j2.properties"
 LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.log.dir=${LLAP_DAEMON_LOG_DIR}"
 LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.log.file=${LLAP_DAEMON_LOG_FILE}"
 LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.root.logger=${LLAP_DAEMON_LOGGER}"
+LLAP_DAEMON_OPTS="${LLAP_DAEMON_OPTS} -Dllap.daemon.log.level=${LLAP_DAEMON_LOG_LEVEL}"
 
 exec "$JAVA" -Dproc_llapdaemon -Xms${LLAP_DAEMON_HEAPSIZE}m -Xmx${LLAP_DAEMON_HEAPSIZE}m ${LLAP_DAEMON_OPTS} -classpath "$CLASSPATH" $CLASS "$@"
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java
index 30a38c8..f03a2ff 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/TaskRunnerCallable.java
@@ -169,8 +169,7 @@ public class TaskRunnerCallable extends CallableWithNdc<TaskRunner2Result> {
     ExecutorService executorReal = Executors.newFixedThreadPool(1,
         new ThreadFactoryBuilder()
             .setDaemon(true)
-            .setNameFormat(
-                "TezTaskRunner_" + request.getFragmentSpec().getFragmentIdentifierString())
+            .setNameFormat("TezTaskRunner")
             .build());
     executor = MoreExecutors.listeningDecorator(executorReal);
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/main/resources/llap-daemon-log4j.properties
----------------------------------------------------------------------
diff --git a/llap-server/src/main/resources/llap-daemon-log4j.properties b/llap-server/src/main/resources/llap-daemon-log4j.properties
deleted file mode 100644
index 51593e9..0000000
--- a/llap-server/src/main/resources/llap-daemon-log4j.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.
-
-# Define some default values that can be overridden by system properties
-llap.daemon.root.logger=INFO,console
-llap.daemon.log.dir=.
-llap.daemon.log.file=llapdaemon.log
-
-# Define the root logger to the system property "llap.daemon.root.logger".
-log4j.rootLogger=${llap.daemon.root.logger}
-
-# Logging Threshold
-log4j.threshold=ALL
-
-# Null Appender
-log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
-
-#
-# Rolling File Appender - cap space usage at 5gb.
-#
-llap.daemon.log.maxfilesize=256MB
-llap.daemon.log.maxbackupindex=20
-log4j.appender.RFA=org.apache.log4j.RollingFileAppender
-log4j.appender.RFA.File=${llap.daemon.log.dir}/${llap.daemon.log.file}
-
-log4j.appender.RFA.MaxFileSize=${llap.daemon.log.maxfilesize}
-log4j.appender.RFA.MaxBackupIndex=${llap.daemon.log.maxbackupindex}
-
-log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} [%t(%x)] %p %c: %m%n
-# Debugging Pattern format
-#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-
-#
-# Daily Rolling File Appender
-#
-
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${llap.daemon.log.dir}/${llap.daemon.log.file}
-
-# Rollver at midnight
-log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
-
-# 30-day backup
-#log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} [%t(%x)] %p %c: %m%n
-# Debugging Pattern format
-#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this 
-#
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%t(%x)] %p %c{2} : %m%n

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/main/resources/llap-daemon-log4j2.properties
----------------------------------------------------------------------
diff --git a/llap-server/src/main/resources/llap-daemon-log4j2.properties b/llap-server/src/main/resources/llap-daemon-log4j2.properties
new file mode 100644
index 0000000..5051ca5
--- /dev/null
+++ b/llap-server/src/main/resources/llap-daemon-log4j2.properties
@@ -0,0 +1,93 @@
+# 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.
+
+status = INFO
+name = LlapDaemonLog4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.llap.daemon.log.level = INFO
+property.llap.daemon.root.logger = console
+property.llap.daemon.log.dir = .
+property.llap.daemon.log.file = llapdaemon.log
+property.llap.daemon.historylog.file = llapdaemon_history.log
+property.llap.daemon.log.maxfilesize = 256MB
+property.llap.daemon.log.maxbackupindex = 20
+
+# list of all appenders
+appenders = console, RFA, HISTORYAPPENDER
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t%x] %p %c{2} : %m%n
+
+# rolling file appender
+appender.RFA.type = RollingFile
+appender.RFA.name = RFA
+appender.RFA.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}
+appender.RFA.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}_%i
+appender.RFA.layout.type = PatternLayout
+appender.RFA.layout.pattern = %d{ISO8601} %-5p [%t%x]: %c{2} (%F:%M(%L)) - %m%n
+appender.RFA.policies.type = Policies
+appender.RFA.policies.size.type = SizeBasedTriggeringPolicy
+appender.RFA.policies.size.size = ${sys:llap.daemon.log.maxfilesize}
+appender.RFA.strategy.type = DefaultRolloverStrategy
+appender.RFA.strategy.max = ${sys:llap.daemon.log.maxbackupindex}
+
+# history file appender
+appender.HISTORYAPPENDER.type = RollingFile
+appender.HISTORYAPPENDER.name = HISTORYAPPENDER
+appender.HISTORYAPPENDER.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}
+appender.HISTORYAPPENDER.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}_%i
+appender.HISTORYAPPENDER.layout.type = PatternLayout
+appender.HISTORYAPPENDER.layout.pattern = %m%n
+appender.HISTORYAPPENDER.policies.type = Policies
+appender.HISTORYAPPENDER.policies.size.type = SizeBasedTriggeringPolicy
+appender.HISTORYAPPENDER.policies.size.size = ${sys:llap.daemon.log.maxfilesize}
+appender.HISTORYAPPENDER.strategy.type = DefaultRolloverStrategy
+appender.HISTORYAPPENDER.strategy.max = ${sys:llap.daemon.log.maxbackupindex}
+
+# list of all loggers
+loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX, HistoryLogger
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+logger.DataNucleus.name = DataNucleus
+logger.DataNucleus.level = ERROR
+
+logger.Datastore.name = Datastore
+logger.Datastore.level = ERROR
+
+logger.JPOX.name = JPOX
+logger.JPOX.level = ERROR
+
+logger.HistoryLogger.name = org.apache.hadoop.hive.llap.daemon.HistoryLogger
+logger.HistoryLogger.level = INFO
+logger.HistoryLogger.additivity = false
+logger.HistoryLogger.appenderRefs = HistoryAppender
+logger.HistoryLogger.appenderRef.HistoryAppender.ref = HISTORYAPPENDER
+
+# root logger
+rootLogger.level = ${sys:llap.daemon.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:llap.daemon.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/main/resources/llap.py
----------------------------------------------------------------------
diff --git a/llap-server/src/main/resources/llap.py b/llap-server/src/main/resources/llap.py
index f62f504..26756ce 100644
--- a/llap-server/src/main/resources/llap.py
+++ b/llap-server/src/main/resources/llap.py
@@ -46,7 +46,8 @@ class Llap(Script):
     # location containing llap-daemon-site.xml, tez and yarn configuration xmls as well.
     os.environ['LLAP_DAEMON_CONF_DIR'] = format("{app_root}/conf/")
     os.environ['LLAP_DAEMON_LOG_DIR'] = format("{app_log_dir}/")
-    os.environ['LLAP_DAEMON_LOGGER'] = format("{app_log_level}")
+    os.environ['LLAP_DAEMON_LOGGER'] = format("{app_logger}")
+    os.environ['LLAP_DAEMON_LOG_LEVEL'] = format("{app_log_level}")
     os.environ['LLAP_DAEMON_HEAPSIZE'] = format("{memory_val}")
     os.environ['LLAP_DAEMON_PID_DIR'] = dirname(format("{pid_file}"))
     os.environ['LLAP_DAEMON_LD_PATH'] = format('{library_path}')

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/main/resources/params.py
----------------------------------------------------------------------
diff --git a/llap-server/src/main/resources/params.py b/llap-server/src/main/resources/params.py
index d6a4fa0..8972ba1 100644
--- a/llap-server/src/main/resources/params.py
+++ b/llap-server/src/main/resources/params.py
@@ -30,6 +30,7 @@ pid_file = config['configurations']['global']['pid_file']
 additional_cp = config['configurations']['global']['additional_cp']
 app_log_dir = config['configurations']['global']['app_log_dir']
 app_tmp_dir = config['configurations']['global']['app_tmp_dir']
+app_logger = config['configurations']['global']['app_logger']
 app_log_level = config['configurations']['global']['app_log_level']
 daemon_args = config['configurations']['global']['daemon_args']
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/main/resources/templates.py
----------------------------------------------------------------------
diff --git a/llap-server/src/main/resources/templates.py b/llap-server/src/main/resources/templates.py
index dae0afb..5a39eeb 100644
--- a/llap-server/src/main/resources/templates.py
+++ b/llap-server/src/main/resources/templates.py
@@ -74,7 +74,8 @@ appConfig = """
     "site.global.app_user": "yarn",
     "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/",
     "site.global.app_tmp_dir": "${AGENT_WORK_ROOT}/tmp/",
-    "site.global.app_log_level": "%(daemon_loglevel)s,RFA",
+    "site.global.app_logger": "RFA",
+    "site.global.app_log_level": "%(daemon_loglevel)s",
     "site.global.additional_cp": "%(hadoop_home)s",
     "site.global.daemon_args": "%(daemon_args)s",
     "site.global.library_path": "%(hadoop_home)s/lib/native",

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/test/resources/llap-daemon-log4j.properties
----------------------------------------------------------------------
diff --git a/llap-server/src/test/resources/llap-daemon-log4j.properties b/llap-server/src/test/resources/llap-daemon-log4j.properties
deleted file mode 100644
index 209436e..0000000
--- a/llap-server/src/test/resources/llap-daemon-log4j.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.
-
-# Define some default values that can be overridden by system properties
-llap.daemon.root.logger=INFO,console
-llap.daemon.log.dir=.
-llap.daemon.log.file=llapdaemon.log
-
-llap.daemon.historylog.file=llapdaemon_history.log
-log4j.logger.org.apache.hadoop.hive.llap.daemon.HistoryLogger=INFO,HISTORYAPPENDER
-
-# Define the root logger to the system property "llap.daemon.root.logger".
-log4j.rootLogger=${llap.daemon.root.logger}
-
-# Logging Threshold
-log4j.threshold=ALL
-
-
-# Null Appender
-log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
-
-
-
-# History Events appender
-log4j.appender.HISTORYAPPENDER=org.apache.log4j.RollingFileAppender
-log4j.appender.HISTORYAPPENDER.File=${llap.daemon.log.dir}/${llap.daemon.historylog.file}
-log4j.appender.HISTORYAPPENDER.MaxFileSize=${llap.daemon.log.maxfilesize}
-log4j.appender.HISTORYAPPENDER.MaxBackupIndex=${llap.daemon.log.maxbackupindex}
-log4j.appender.HISTORYAPPENDER.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.HISTORYAPPENDER.layout.ConversionPattern=%m%n
-
-
-
-# Rolling File Appender - cap space usage at 5gb.
-#
-llap.daemon.log.maxfilesize=256MB
-llap.daemon.log.maxbackupindex=20
-log4j.appender.RFA=org.apache.log4j.RollingFileAppender
-log4j.appender.RFA.File=${llap.daemon.log.dir}/${llap.daemon.log.file}
-log4j.appender.RFA.Append=true
-
-log4j.appender.RFA.MaxFileSize=${llap.daemon.log.maxfilesize}
-log4j.appender.RFA.MaxBackupIndex=${llap.daemon.log.maxbackupindex}
-
-log4j.appender.RFA.layout=org.apache.log4j.EnhancedPatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} [%t(%x)] %p %c: %m%n
-# Debugging Pattern format
-#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-
-#
-# Daily Rolling File Appender
-#
-
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${llap.daemon.log.dir}/${llap.daemon.log.file}
-
-# Rollver at midnight
-log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
-
-# 30-day backup
-#log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.EnhancedPatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} [%t(%x)] %p %c: %m%n
-# Debugging Pattern format
-#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this 
-#
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%t(%x)] %p %c{2} : %m%n

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/test/resources/llap-daemon-log4j2.properties
----------------------------------------------------------------------
diff --git a/llap-server/src/test/resources/llap-daemon-log4j2.properties b/llap-server/src/test/resources/llap-daemon-log4j2.properties
new file mode 100644
index 0000000..7b5f4ed
--- /dev/null
+++ b/llap-server/src/test/resources/llap-daemon-log4j2.properties
@@ -0,0 +1,93 @@
+# 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.
+
+status = INFO
+name = LlapDaemonLog4j2Test
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.llap.daemon.log.level = INFO
+property.llap.daemon.root.logger = console
+property.llap.daemon.log.dir = .
+property.llap.daemon.log.file = llapdaemon.log
+property.llap.daemon.historylog.file = llapdaemon_history.log
+property.llap.daemon.log.maxfilesize = 256MB
+property.llap.daemon.log.maxbackupindex = 20
+
+# list of all appenders
+appenders = console, RFA, HISTORYAPPENDER
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t%x] %p %c{2} : %m%n
+
+# rolling file appender
+appender.RFA.type = RollingFile
+appender.RFA.name = RFA
+appender.RFA.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}
+appender.RFA.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.log.file}_%i
+appender.RFA.layout.type = PatternLayout
+appender.RFA.layout.pattern = %d{ISO8601} %-5p [%t%x]: %c{2} (%F:%M(%L)) - %m%n
+appender.RFA.policies.type = Policies
+appender.RFA.policies.size.type = SizeBasedTriggeringPolicy
+appender.RFA.policies.size.size = ${sys:llap.daemon.log.maxfilesize}
+appender.RFA.strategy.type = DefaultRolloverStrategy
+appender.RFA.strategy.max = ${sys:llap.daemon.log.maxbackupindex}
+
+# history file appender
+appender.HISTORYAPPENDER.type = RollingFile
+appender.HISTORYAPPENDER.name = HISTORYAPPENDER
+appender.HISTORYAPPENDER.fileName = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}
+appender.HISTORYAPPENDER.filePattern = ${sys:llap.daemon.log.dir}/${sys:llap.daemon.historylog.file}_%i
+appender.HISTORYAPPENDER.layout.type = PatternLayout
+appender.HISTORYAPPENDER.layout.pattern = %m%n
+appender.HISTORYAPPENDER.policies.type = Policies
+appender.HISTORYAPPENDER.policies.size.type = SizeBasedTriggeringPolicy
+appender.HISTORYAPPENDER.policies.size.size = ${sys:llap.daemon.log.maxfilesize}
+appender.HISTORYAPPENDER.strategy.type = DefaultRolloverStrategy
+appender.HISTORYAPPENDER.strategy.max = ${sys:llap.daemon.log.maxbackupindex}
+
+# list of all loggers
+loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX, HistoryLogger
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+logger.DataNucleus.name = DataNucleus
+logger.DataNucleus.level = ERROR
+
+logger.Datastore.name = Datastore
+logger.Datastore.level = ERROR
+
+logger.JPOX.name = JPOX
+logger.JPOX.level = ERROR
+
+logger.HistoryLogger.name = org.apache.hadoop.hive.llap.daemon.HistoryLogger
+logger.HistoryLogger.level = INFO
+logger.HistoryLogger.additivity = false
+logger.HistoryLogger.appenderRefs = HistoryAppender
+logger.HistoryLogger.appenderRef.HistoryAppender.ref = HISTORYAPPENDER
+
+# root logger
+rootLogger.level = ${sys:llap.daemon.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:llap.daemon.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/llap-server/src/test/resources/log4j.properties b/llap-server/src/test/resources/log4j.properties
deleted file mode 100644
index 531b68b..0000000
--- a/llap-server/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#   Licensed 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.
-
-# log4j configuration used during build and unit tests
-
-log4j.rootLogger=info,stdout
-log4j.threshhold=ALL
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/llap-server/src/test/resources/log4j2.properties b/llap-server/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..ad1b5ce
--- /dev/null
+++ b/llap-server/src/test/resources/log4j2.properties
@@ -0,0 +1,38 @@
+# 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.
+
+status = INFO
+name = LlapLog4j2Test
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.llap.daemon.log.level = INFO
+property.llap.daemon.root.logger = console
+
+# list of all appenders
+appenders = console
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_OUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{ISO8601} %-5p [%t%x] %c{2} (%F:%M(%L)) - %m%n
+
+# root logger
+rootLogger.level = ${sys:llap.daemon.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:llap.daemon.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/packaging/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml
index 742b3db..ac323f7 100644
--- a/packaging/src/main/assembly/bin.xml
+++ b/packaging/src/main/assembly/bin.xml
@@ -295,7 +295,7 @@
       <fileMode>644</fileMode>
       <includes>
         <include>webhcat-default.xml</include>
-        <include>webhcat-log4j2.xml</include>
+        <include>webhcat-log4j2.properties</include>
       </includes>
       <filtered>true</filtered>
       <outputDirectory>hcatalog/etc/webhcat</outputDirectory>
@@ -343,24 +343,24 @@
 
   <files>
     <file>
-      <source>${project.parent.basedir}/common/src/main/resources/hive-log4j2.xml</source>
+      <source>${project.parent.basedir}/common/src/main/resources/hive-log4j2.properties</source>
       <outputDirectory>conf</outputDirectory>
-      <destName>hive-log4j2.xml.template</destName>
+      <destName>hive-log4j2.properties.template</destName>
     </file>
     <file>
-      <source>${project.parent.basedir}/ql/src/main/resources/hive-exec-log4j2.xml</source>
+      <source>${project.parent.basedir}/ql/src/main/resources/hive-exec-log4j2.properties</source>
       <outputDirectory>conf</outputDirectory>
-      <destName>hive-exec-log4j2.xml.template</destName>
+      <destName>hive-exec-log4j2.properties.template</destName>
     </file>
     <file>
-      <source>${project.parent.basedir}/beeline/src/main/resources/beeline-log4j2.xml</source>
+      <source>${project.parent.basedir}/beeline/src/main/resources/beeline-log4j2.properties</source>
       <outputDirectory>conf</outputDirectory>
-      <destName>beeline-log4j2.xml.template</destName>
+      <destName>beeline-log4j2.properties.template</destName>
     </file>
     <file>
-      <source>${project.parent.basedir}/llap-server/src/main/resources/llap-daemon-log4j.properties</source>
+      <source>${project.parent.basedir}/llap-server/src/main/resources/llap-daemon-log4j2.properties</source>
       <outputDirectory>conf</outputDirectory>
-      <destName>llap-daemon-log4j.properties.template</destName>
+      <destName>llap-daemon-log4j2.properties.template</destName>
     </file>
     <file>
       <source>${project.parent.basedir}/hcatalog/README.txt</source>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 22b4ca8..306ef6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
     <kryo.version>3.0.3</kryo.version>
     <libfb303.version>0.9.3</libfb303.version>
     <libthrift.version>0.9.3</libthrift.version>
-    <log4j2.version>2.4</log4j2.version>
+    <log4j2.version>2.4.1</log4j2.version>
     <opencsv.version>2.3</opencsv.version>
     <mockito-all.version>1.9.5</mockito-all.version>
     <mina.version>2.0.0-M5</mina.version>
@@ -988,7 +988,7 @@
             <!-- required for hive-exec jar path and tests which reference a jar -->
             <maven.local.repository>${maven.repo.local}</maven.local.repository>
             <mapred.job.tracker>local</mapred.job.tracker>
-            <log4j.configurationFile>${test.log4j.scheme}${test.tmp.dir}/conf/hive-log4j2.xml</log4j.configurationFile>
+            <log4j.configurationFile>${test.log4j.scheme}${test.tmp.dir}/conf/hive-log4j2.properties</log4j.configurationFile>
             <log4j.debug>true</log4j.debug>
             <!-- don't diry up /tmp -->
             <java.io.tmpdir>${test.tmp.dir}</java.io.tmpdir>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/java/org/apache/hadoop/hive/ql/log/HiveEventCounter.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/log/HiveEventCounter.java b/ql/src/java/org/apache/hadoop/hive/ql/log/HiveEventCounter.java
index 46662c4..a6b576f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/log/HiveEventCounter.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/log/HiveEventCounter.java
@@ -40,7 +40,7 @@ import com.google.common.annotations.VisibleForTesting;
 
 /**
  * A log4J2 Appender that simply counts logging events in four levels:
- * fatal, error, warn and info. The class name is used in log4j2.xml
+ * fatal, error, warn and info. The class name can be used in log4j2.properties
  */
 @Plugin(name = "HiveEventCounter", category = "Core", elementType = "appender", printObject = true)
 public class HiveEventCounter extends AbstractAppender {

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/main/resources/hive-exec-log4j.properties
----------------------------------------------------------------------
diff --git a/ql/src/main/resources/hive-exec-log4j.properties b/ql/src/main/resources/hive-exec-log4j.properties
deleted file mode 100644
index 4c9c012..0000000
--- a/ql/src/main/resources/hive-exec-log4j.properties
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.
-
-# Define some default values that can be overridden by system properties
-hive.log.threshold=ALL
-hive.root.logger=INFO,FA
-hive.log.dir=${java.io.tmpdir}/${user.name}
-hive.query.id=hadoop
-hive.log.file=${hive.query.id}.log
-
-# Define the root logger to the system property "hadoop.root.logger".
-log4j.rootLogger=${hive.root.logger}, EventCounter
-
-# Logging Threshold
-log4j.threshhold=${hive.log.threshold}
-
-#
-# File Appender
-#
-
-log4j.appender.FA=org.apache.log4j.FileAppender
-log4j.appender.FA.File=${hive.log.dir}/${hive.log.file}
-log4j.appender.FA.layout=org.apache.log4j.PatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-# Debugging Pattern format
-log4j.appender.FA.layout.ConversionPattern=%d{ISO8601} %-5p [%t(%x)]: %c{2} (%F:%M(%L)) - %m%n
-
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this
-#
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%t(%x)] %p %c{2}: %m%n
-
-#custom logging levels
-#log4j.logger.xxx=DEBUG
-
-#
-# Event Counter Appender
-# Sends counts of logging messages at different severity levels to Hadoop Metrics.
-#
-log4j.appender.EventCounter=org.apache.hadoop.hive.shims.HiveEventCounter
-
-
-log4j.category.DataNucleus=ERROR,FA
-log4j.category.Datastore=ERROR,FA
-log4j.category.Datastore.Schema=ERROR,FA
-log4j.category.JPOX.Datastore=ERROR,FA
-log4j.category.JPOX.Plugin=ERROR,FA
-log4j.category.JPOX.MetaData=ERROR,FA
-log4j.category.JPOX.Query=ERROR,FA
-log4j.category.JPOX.General=ERROR,FA
-log4j.category.JPOX.Enhancer=ERROR,FA
-
-
-# Silence useless ZK logs
-log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,FA
-log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,FA

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/main/resources/hive-exec-log4j2.properties
----------------------------------------------------------------------
diff --git a/ql/src/main/resources/hive-exec-log4j2.properties b/ql/src/main/resources/hive-exec-log4j2.properties
new file mode 100644
index 0000000..4fba04c
--- /dev/null
+++ b/ql/src/main/resources/hive-exec-log4j2.properties
@@ -0,0 +1,66 @@
+# 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.
+
+status = INFO
+name = HiveExecLog4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.hive.log.level = INFO
+property.hive.root.logger = FA
+property.hive.query.id = hadoop
+property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
+property.hive.log.file = ${sys:hive.query.id}.log
+
+# list of all appenders
+appenders = console, FA
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# simple file appender
+appender.FA.type = File
+appender.FA.name = FA
+appender.FA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
+appender.FA.layout.type = PatternLayout
+appender.FA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n
+
+# list of all loggers
+loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+logger.DataNucleus.name = DataNucleus
+logger.DataNucleus.level = ERROR
+
+logger.Datastore.name = Datastore
+logger.Datastore.level = ERROR
+
+logger.JPOX.name = JPOX
+logger.JPOX.level = ERROR
+
+# root logger
+rootLogger.level = ${sys:hive.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/main/resources/hive-exec-log4j2.xml
----------------------------------------------------------------------
diff --git a/ql/src/main/resources/hive-exec-log4j2.xml b/ql/src/main/resources/hive-exec-log4j2.xml
deleted file mode 100644
index d4728e4..0000000
--- a/ql/src/main/resources/hive-exec-log4j2.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="HiveExecLog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="hive.log.level">INFO</Property>
-    <Property name="hive.root.logger">FA</Property>
-    <Property name="hive.log.dir">${sys:java.io.tmpdir}/${sys:user.name}</Property>
-    <Property name="hive.query.id">hadoop</Property>
-    <Property name="hive.log.file">${sys:hive.query.id}.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} [%t(%x)]: %p %c{2}: %m%n"/>
-    </Console>
-
-    <!-- Regular File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <File name="FA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t(%x)]: %c{2} (%F:%M(%L)) - %m%n" />
-    </File>
-
-    <!-- Daily Rolling File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session -->
-    <!-- <RollingFile name="DRFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-      </Policies>
-      <DefaultRolloverStrategy max="30"/>
-    </RollingFile> -->
-
-    <!-- Size based Rolling File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- <RollingFile name="RFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%i">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <SizeBasedTriggeringPolicy size="256 MB" />
-      </Policies>
-      <DefaultRolloverStrategy max="10"/>
-    </RollingFile> -->
-
-    <!-- HiveEventCounter appender is loaded from Configuration packages attribute.Sends counts of logging messages at different severity levels to Hadoop Metrics. -->
-    <HiveEventCounter name="EventCounter"/>
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:hive.log.level}">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-      <AppenderRef ref="EventCounter" />
-    </Root>
-
-    <Logger name="org.apache.zookeeper.server.NIOServerCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxnSocketNIO" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="DataNucleus" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore.Schema" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Plugin" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Metadata" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Query" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.General" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/main/resources/tez-container-log4j2.properties
----------------------------------------------------------------------
diff --git a/ql/src/main/resources/tez-container-log4j2.properties b/ql/src/main/resources/tez-container-log4j2.properties
new file mode 100644
index 0000000..5d2b138
--- /dev/null
+++ b/ql/src/main/resources/tez-container-log4j2.properties
@@ -0,0 +1,47 @@
+# 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.
+
+status = INFO
+name = TezContainerLog4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.tez.container.log.level = INFO
+property.tez.container.root.logger = CLA
+property.tez.container.log.dir = ${sys:yarn.app.container.log.dir}
+property.tez.container.log.file = syslog
+
+# list of all appenders
+appenders = CLA
+
+# daily rolling file appender
+appender.CLA.type = RollingFile
+appender.CLA.name = CLA
+appender.CLA.fileName = ${sys:tez.container.log.dir}/${sys:tez.container.log.file}
+appender.CLA.filePattern = ${sys:tez.container.log.dir}/${sys:tez.container.log.file}.%d{yyyy-MM-dd}
+appender.CLA.layout.type = PatternLayout
+appender.CLA.layout.pattern = %d{ISO8601} %p [%t] %c{2}: %m%n
+appender.CLA.policies.type = Policies
+appender.CLA.policies.time.type = TimeBasedTriggeringPolicy
+appender.CLA.policies.time.interval = 1
+appender.CLA.policies.time.modulate = true
+appender.CLA.strategy.type = DefaultRolloverStrategy
+appender.CLA.strategy.max = 30
+
+# root logger
+rootLogger.level = ${sys:tez.container.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:tez.container.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/main/resources/tez-container-log4j2.xml
----------------------------------------------------------------------
diff --git a/ql/src/main/resources/tez-container-log4j2.xml b/ql/src/main/resources/tez-container-log4j2.xml
deleted file mode 100644
index 604e586..0000000
--- a/ql/src/main/resources/tez-container-log4j2.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="trace" strict="true" name="TezContainerLog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="tez.container.log.level">INFO</Property>
-    <Property name="tez.container.root.logger">CLA</Property>
-    <Property name="tez.container.log.dir">${sys:yarn.app.container.log.dir}</Property>
-    <Property name="tez.container.log.file">syslog</Property>
-  </Properties>
-
-  <Appenders>
-    <RollingFile name="CLA" fileName="${sys:tez.container.log.dir}/${sys:tez.container.log.file}"
-     filePattern="${sys:tez.container.log.dir}/${sys:tez.container.log.file}.%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%d{ISO8601} %p [%t] %c{2}: %m%n" />
-      <Policies>
-        <!-- Rollover at mignight (interval = 1 means daily) -->
-        <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-      </Policies>
-      <!-- 30-day backup -->
-      <!-- <DefaultRolloverStrategy max="30"/> -->
-    </RollingFile>
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:tez.container.log.level}">
-      <AppenderRef ref="${sys:tez.container.root.logger}"/>
-    </Root>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/test/org/apache/hadoop/hive/ql/log/TestLog4j2Appenders.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/log/TestLog4j2Appenders.java b/ql/src/test/org/apache/hadoop/hive/ql/log/TestLog4j2Appenders.java
index cc2ad4e..c54b350 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/log/TestLog4j2Appenders.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/log/TestLog4j2Appenders.java
@@ -36,7 +36,7 @@ public class TestLog4j2Appenders {
 
   @Before
   public void setup() {
-    // programmatically set root logger level to INFO. By default if log4j2-test.xml is not
+    // programmatically set root logger level to INFO. By default if log4j2-test.properties is not
     // available root logger will use ERROR log level
     LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
     Configuration config = ctx.getConfiguration();
@@ -47,7 +47,7 @@ public class TestLog4j2Appenders {
 
   @Test
   public void testStringAppender() throws Exception {
-    // Get the RootLogger which, if you don't have log4j2-test.xml defined, will only log ERRORs
+    // Get the RootLogger which, if you don't have log4j2-test.properties defined, will only log ERRORs
     Logger logger = LogManager.getRootLogger();
     // Create a String Appender to capture log output
     StringAppender appender = StringAppender.createStringAppender("%m");
@@ -83,10 +83,7 @@ public class TestLog4j2Appenders {
 
     logger.fatal("Test");
 
-    // HiveEventCounter will be loaded from hive-log4j2-test.xml before tests are run. The 2 log
-    // info msgs from previous test case will also be counted along with 4 log info msgs in this
-    // test and hence we assert for 6 here
-    assertEquals(6, appender.getInfo());
+    assertEquals(4, appender.getInfo());
     assertEquals(3, appender.getError());
     assertEquals(2, appender.getWarn());
     assertEquals(1, appender.getFatal());

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/test/org/apache/hadoop/hive/ql/metadata/StringAppender.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/metadata/StringAppender.java b/ql/src/test/org/apache/hadoop/hive/ql/metadata/StringAppender.java
index 275b66b..60fb3d1 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/metadata/StringAppender.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/metadata/StringAppender.java
@@ -77,7 +77,7 @@ public class StringAppender
     if (nullablePatternString == null) {
       layout = PatternLayout.createDefaultLayout();
     } else {
-      layout = PatternLayout.createLayout(nullablePatternString, configuration,
+      layout = PatternLayout.createLayout(nullablePatternString, null, configuration,
           null, null, true, false, null, null);
     }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java b/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
index 9fd8516..b96de63 100755
--- a/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
@@ -249,7 +249,7 @@ public class TestHive extends TestCase {
    * @throws Throwable
    */
   public void testMetaStoreApiTiming() throws Throwable {
-    // Get the RootLogger which, if you don't have log4j2-test.xml defined, will only log ERRORs
+    // Get the RootLogger which, if you don't have log4j2-test.properties defined, will only log ERRORs
     Logger logger = LogManager.getLogger("hive.ql.metadata.Hive");
     Level oldLevel = logger.getLevel();
     LoggerContext ctx = (LoggerContext) LogManager.getContext(false);

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/service/src/java/org/apache/hive/service/cli/operation/LogDivertAppender.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/cli/operation/LogDivertAppender.java b/service/src/java/org/apache/hive/service/cli/operation/LogDivertAppender.java
index 7531778..59dc433 100644
--- a/service/src/java/org/apache/hive/service/cli/operation/LogDivertAppender.java
+++ b/service/src/java/org/apache/hive/service/cli/operation/LogDivertAppender.java
@@ -53,9 +53,9 @@ public class LogDivertAppender
   private static LoggerContext context = (LoggerContext) LogManager.getContext(false);
   private static Configuration configuration = context.getConfiguration();
   public static final Layout<? extends Serializable> verboseLayout = PatternLayout.createLayout(
-      "%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n", configuration, null, null, true, false, null, null);
+      "%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n", null, configuration, null, null, true, false, null, null);
   public static final Layout<? extends Serializable> nonVerboseLayout = PatternLayout.createLayout(
-      "%-5p : %m%n", configuration, null, null, true, false, null, null);
+      "%-5p : %m%n", null, configuration, null, null, true, false, null, null);
 
   private final OperationManager operationManager;
   private final StringOutputStreamManager manager;

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/spark-client/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/spark-client/src/test/resources/log4j2.properties b/spark-client/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..c65ef87
--- /dev/null
+++ b/spark-client/src/test/resources/log4j2.properties
@@ -0,0 +1,38 @@
+# 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.
+
+status = INFO
+name = SparkClientLog4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.spark.log.level = DEBUG
+property.spark.root.logger = console
+
+# list of all appenders
+appenders = console
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
+
+# root logger
+rootLogger.level = ${sys:spark.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:spark.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/spark-client/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/spark-client/src/test/resources/log4j2.xml b/spark-client/src/test/resources/log4j2.xml
deleted file mode 100644
index a435069..0000000
--- a/spark-client/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="SparkClientLog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="spark.log.level">DEBUG</Property>
-    <Property name="spark.root.logger">console</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n"/>
-    </Console>
-  </Appenders>
-
-  <Loggers>
-    <Root level="DEBUG">
-      <AppenderRef ref="${sys:spark.root.logger}" level="${sys:spark.log.level}"/>
-    </Root>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/testutils/ptest2/pom.xml
----------------------------------------------------------------------
diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml
index 51a0aaf..4dcd4a2 100644
--- a/testutils/ptest2/pom.xml
+++ b/testutils/ptest2/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
   <name>hive-ptest</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <log4j2.version>2.3</log4j2.version>
+    <log4j2.version>2.4.1</log4j2.version>
   </properties>
 
   <repositories>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/testutils/ptest2/src/main/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/main/resources/log4j2.properties b/testutils/ptest2/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..85f1b64
--- /dev/null
+++ b/testutils/ptest2/src/main/resources/log4j2.properties
@@ -0,0 +1,77 @@
+# 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.
+
+status = INFO
+name = PTest2Log4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.hive.ptest.log.level = DEBUG
+property.hive.ptest.root.logger = FILE
+property.hive.ptest.log.dir = target
+property.hive.ptest.log.file = ptest.log
+
+# list of all appenders
+appenders = console, FILE
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
+
+# simple file appender
+appender.FILE.type = RollingFile
+appender.FILE.name = FILE
+appender.FILE.fileName = ${sys:hive.ptest.log.dir}/${sys:hive.ptest.log.file}
+appender.FILE.filePattern = ${sys:hive.ptest.log.dir}/${sys:hive.ptest.log.file}.%i
+appender.FILE.layout.type = PatternLayout
+appender.FILE.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+appender.FILE.policies.type = Policies
+appender.FILE.policies.size.type = SizeBasedTriggeringPolicy
+appender.FILE.policies.size.size = 50MB
+appender.FILE.strategy.type = DefaultRolloverStrategy
+appender.FILE.strategy.max = 1
+
+# list of all loggers
+loggers = Http, SpringFramework, OrgJclouds, Jclouds, Hive, NIOServerCnxn, ClientCnxnSocketNIO
+
+logger.Http.name = org.apache.http
+logger.Http.level = TRACE
+
+logger.SpringFramework.name = org.springframework
+logger.SpringFramework.level = INFO
+
+logger.OrgJclouds.name = org.jclouds
+logger.OrgJclouds.level = INFO
+
+logger.Jclouds.name = jclouds
+logger.Jclouds.level = INFO
+
+logger.Hive.name = org.apache.hive
+logger.Hive.level = DEBUG
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+# root logger
+rootLogger.level = ${sys:hive.ptest.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:hive.ptest.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/testutils/ptest2/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/main/resources/log4j2.xml b/testutils/ptest2/src/main/resources/log4j2.xml
deleted file mode 100644
index 8eb3234..0000000
--- a/testutils/ptest2/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="PTest2Log4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="hive.ptest.log.level">DEBUG</Property>
-    <Property name="hive.ptest.root.logger">FILE</Property>
-    <Property name="hive.ptest.log.dir">target</Property>
-    <Property name="hive.ptest.log.file">ptest.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n"/>
-    </Console>
-
-    <!-- Size based Rolling File Appender -->
-    <RollingFile name="FILE" fileName="${sys:hive.ptest.log.dir}/${sys:hive.ptest.log.file}"
-     filePattern="${sys:hive.ptest.log.dir}/${sys:hive.ptest.log.file}.%i">
-      <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" />
-      <Policies>
-        <SizeBasedTriggeringPolicy size="50 MB" />
-      </Policies>
-      <DefaultRolloverStrategy max="1"/>
-    </RollingFile>
-
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:hive.ptest.log.level}">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Root>
-
-    <Logger name="org.apache.http" level="INFO">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Logger>
-    <Logger name="org.springframework" level="INFO">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Logger>
-    <Logger name="org.jclouds" level="INFO">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Logger>
-    <Logger name="jclouds" level="INFO">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hive" level="DEBUG">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.http" level="TRACE">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Logger>
-
-    <!-- Silence useless ZK logs -->
-    <Logger name="org.apache.zookeeper.server.NIOServerCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxnSocketNIO" level="WARN">
-      <AppenderRef ref="${sys:hive.ptest.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>


[2/2] hive git commit: HIVE-12020: Revert log4j2 xml configuration to properties based configuration (Prasanth Jayachandran reviewed by Sergey Shelukhin)

Posted by pr...@apache.org.
HIVE-12020: Revert log4j2 xml configuration to properties based configuration (Prasanth Jayachandran reviewed by Sergey Shelukhin)


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

Branch: refs/heads/master
Commit: e2d9ada8d40bb13dfdd1c920b38926e680307849
Parents: cc4709f
Author: Prasanth Jayachandran <j....@gmail.com>
Authored: Wed Dec 2 12:28:04 2015 -0600
Committer: Prasanth Jayachandran <j....@gmail.com>
Committed: Wed Dec 2 12:28:04 2015 -0600

----------------------------------------------------------------------
 .../main/resources/beeline-log4j2.properties    |  45 +++++
 beeline/src/main/resources/beeline-log4j2.xml   |  41 -----
 bin/ext/beeline.sh                              |   2 +-
 .../org/apache/hadoop/hive/common/LogUtils.java |   4 +-
 .../org/apache/hadoop/hive/conf/HiveConf.java   |   4 +-
 common/src/main/resources/hive-log4j.properties |  88 ----------
 .../src/main/resources/hive-log4j2.properties   |  73 ++++++++
 common/src/main/resources/hive-log4j2.xml       | 110 ------------
 .../hadoop/hive/conf/TestHiveLogging.java       |  28 +--
 .../resources/hive-exec-log4j2-test.properties  |  65 +++++++
 .../test/resources/hive-exec-log4j2-test.xml    |  85 ----------
 .../test/resources/hive-log4j2-test.properties  |  72 ++++++++
 common/src/test/resources/hive-log4j2-test.xml  |  94 ----------
 data/conf/hive-log4j2.properties                | 123 ++++++++++++++
 data/conf/hive-log4j2.xml                       | 170 -------------------
 data/conf/llap/hive-site.xml                    |   4 +-
 data/conf/spark/log4j2.properties               |  69 ++++++++
 data/conf/spark/log4j2.xml                      |  74 --------
 data/conf/tez/hive-site.xml                     |   4 +-
 docs/xdocs/language_manual/cli.xml              |   2 +-
 hcatalog/bin/hcat_server.sh                     |   2 +-
 hcatalog/bin/templeton.cmd                      |   2 +-
 hcatalog/scripts/hcat_server_start.sh           |   2 +-
 .../content/xdocs/configuration.xml             |   2 +-
 .../src/documentation/content/xdocs/install.xml |   2 +-
 .../config/hive/hive-log4j2.properties          |  72 ++++++++
 .../deployers/config/hive/hive-log4j2.xml       | 110 ------------
 .../templeton/deployers/start_hive_services.sh  |   2 +-
 .../webhcat/svr/src/main/bin/webhcat_server.sh  |   2 +-
 .../src/main/config/webhcat-log4j2.properties   |  75 ++++++++
 .../svr/src/main/config/webhcat-log4j2.xml      |  74 --------
 .../main/java/org/apache/hive/hplsql/Exec.java  |   2 +-
 itests/pom.xml                                  |   2 +-
 llap-server/bin/llap-daemon-env.sh              |   5 +-
 llap-server/bin/llapDaemon.sh                   |   6 +-
 llap-server/bin/runLlapDaemon.sh                |  18 +-
 .../llap/daemon/impl/TaskRunnerCallable.java    |   3 +-
 .../main/resources/llap-daemon-log4j.properties |  78 ---------
 .../resources/llap-daemon-log4j2.properties     |  93 ++++++++++
 llap-server/src/main/resources/llap.py          |   3 +-
 llap-server/src/main/resources/params.py        |   1 +
 llap-server/src/main/resources/templates.py     |   3 +-
 .../test/resources/llap-daemon-log4j.properties |  94 ----------
 .../resources/llap-daemon-log4j2.properties     |  93 ++++++++++
 llap-server/src/test/resources/log4j.properties |  19 ---
 .../src/test/resources/log4j2.properties        |  38 +++++
 packaging/src/main/assembly/bin.xml             |  18 +-
 pom.xml                                         |   4 +-
 .../hadoop/hive/ql/log/HiveEventCounter.java    |   2 +-
 .../main/resources/hive-exec-log4j.properties   |  77 ---------
 .../main/resources/hive-exec-log4j2.properties  |  66 +++++++
 ql/src/main/resources/hive-exec-log4j2.xml      | 109 ------------
 .../resources/tez-container-log4j2.properties   |  47 +++++
 ql/src/main/resources/tez-container-log4j2.xml  |  48 ------
 .../hadoop/hive/ql/log/TestLog4j2Appenders.java |   9 +-
 .../hadoop/hive/ql/metadata/StringAppender.java |   2 +-
 .../hadoop/hive/ql/metadata/TestHive.java       |   2 +-
 .../cli/operation/LogDivertAppender.java        |   4 +-
 .../src/test/resources/log4j2.properties        |  38 +++++
 spark-client/src/test/resources/log4j2.xml      |  39 -----
 testutils/ptest2/pom.xml                        |   2 +-
 .../ptest2/src/main/resources/log4j2.properties |  77 +++++++++
 testutils/ptest2/src/main/resources/log4j2.xml  |  79 ---------
 63 files changed, 1110 insertions(+), 1473 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/beeline/src/main/resources/beeline-log4j2.properties
----------------------------------------------------------------------
diff --git a/beeline/src/main/resources/beeline-log4j2.properties b/beeline/src/main/resources/beeline-log4j2.properties
new file mode 100644
index 0000000..103d722
--- /dev/null
+++ b/beeline/src/main/resources/beeline-log4j2.properties
@@ -0,0 +1,45 @@
+# 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.
+
+status = INFO
+name = BeelineLog4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.hive.log.level = WARN
+property.hive.root.logger = console
+
+# list of all appenders
+appenders = console
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# list of all loggers
+loggers = HiveConnection
+
+# HiveConnection logs useful info for dynamic service discovery
+logger.HiveConnection.name = org.apache.hive.jdbc.HiveConnection
+logger.HiveConnection.level = INFO
+
+# root logger
+rootLogger.level = ${sys:hive.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/beeline/src/main/resources/beeline-log4j2.xml
----------------------------------------------------------------------
diff --git a/beeline/src/main/resources/beeline-log4j2.xml b/beeline/src/main/resources/beeline-log4j2.xml
deleted file mode 100644
index 55ec0f5..0000000
--- a/beeline/src/main/resources/beeline-log4j2.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="BeelineLog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="hive.log.level">WARN</Property>
-    <Property name="hive.root.logger">console</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n"/>
-    </Console>
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:hive.log.level}">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Root>
-    <!-- HiveConnection logs useful info for dynamic service discovery -->
-    <logger name="org.apache.hive.jdbc.HiveConnection" level="INFO"/>
-  </Loggers>
-
-</Configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/bin/ext/beeline.sh
----------------------------------------------------------------------
diff --git a/bin/ext/beeline.sh b/bin/ext/beeline.sh
index 9de8f6c..90e562f 100644
--- a/bin/ext/beeline.sh
+++ b/bin/ext/beeline.sh
@@ -31,7 +31,7 @@ beeline () {
     hadoopClasspath="${HADOOP_CLASSPATH}:"
   fi
   export HADOOP_CLASSPATH="${hadoopClasspath}${HIVE_CONF_DIR}:${beelineJarPath}:${superCsvJarPath}:${jlineJarPath}:${jdbcStandaloneJarPath}"
-  export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.configurationFile=beeline-log4j2.xml "
+  export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Dlog4j.configurationFile=beeline-log4j2.properties "
 
   exec $HADOOP jar ${beelineJarPath} $CLASS $HIVE_OPTS "$@"
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/common/LogUtils.java b/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
index 3be8733..adcf805 100644
--- a/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
+++ b/common/src/java/org/apache/hadoop/hive/common/LogUtils.java
@@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory;
  */
 public class LogUtils {
 
-  private static final String HIVE_L4J = "hive-log4j2.xml";
-  private static final String HIVE_EXEC_L4J = "hive-exec-log4j2.xml";
+  private static final String HIVE_L4J = "hive-log4j2.properties";
+  private static final String HIVE_EXEC_L4J = "hive-exec-log4j2.properties";
   private static final Logger l4j = LoggerFactory.getLogger(LogUtils.class);
 
   @SuppressWarnings("serial")

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index e984b6e..7f96071 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -1744,12 +1744,12 @@ public class HiveConf extends Configuration {
     // logging configuration
     HIVE_LOG4J_FILE("hive.log4j.file", "",
         "Hive log4j configuration file.\n" +
-        "If the property is not set, then logging will be initialized using hive-log4j2.xml found on the classpath.\n" +
+        "If the property is not set, then logging will be initialized using hive-log4j2.properties found on the classpath.\n" +
         "If the property is set, the value must be a valid URI (java.net.URI, e.g. \"file:///tmp/my-logging.xml\"), \n" +
         "which you can then extract a URL from and pass to PropertyConfigurator.configure(URL)."),
     HIVE_EXEC_LOG4J_FILE("hive.exec.log4j.file", "",
         "Hive log4j configuration file for execution mode(sub command).\n" +
-        "If the property is not set, then logging will be initialized using hive-exec-log4j2.xml found on the classpath.\n" +
+        "If the property is not set, then logging will be initialized using hive-exec-log4j2.properties found on the classpath.\n" +
         "If the property is set, the value must be a valid URI (java.net.URI, e.g. \"file:///tmp/my-logging.xml\"), \n" +
         "which you can then extract a URL from and pass to PropertyConfigurator.configure(URL)."),
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/main/resources/hive-log4j.properties
----------------------------------------------------------------------
diff --git a/common/src/main/resources/hive-log4j.properties b/common/src/main/resources/hive-log4j.properties
deleted file mode 100644
index 7e62c71..0000000
--- a/common/src/main/resources/hive-log4j.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.
-
-# Define some default values that can be overridden by system properties
-hive.log.threshold=ALL
-hive.root.logger=INFO,DRFA
-hive.log.dir=${java.io.tmpdir}/${user.name}
-hive.log.file=hive.log
-
-# Define the root logger to the system property "hadoop.root.logger".
-log4j.rootLogger=${hive.root.logger}, EventCounter
-
-# Logging Threshold
-log4j.threshold=${hive.log.threshold}
-
-#
-# Daily Rolling File Appender
-#
-# Use the PidDailyerRollingFileAppend class instead if you want to use separate log files
-# for different CLI session.
-#
-# log4j.appender.DRFA=org.apache.hadoop.hive.ql.log.PidDailyRollingFileAppender
-
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-
-log4j.appender.DRFA.File=${hive.log.dir}/${hive.log.file}
-
-# Rollver at midnight
-log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
-
-# 30-day backup
-#log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-# Debugging Pattern format
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t(%x)]: %c{2} (%F:%M(%L)) - %m%n
-
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this
-#
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} [%t(%x)]: %p %c{2}: %m%n
-log4j.appender.console.encoding=UTF-8
-
-#custom logging levels
-#log4j.logger.xxx=DEBUG
-
-#
-# Event Counter Appender
-# Sends counts of logging messages at different severity levels to Hadoop Metrics.
-#
-log4j.appender.EventCounter=org.apache.hadoop.hive.shims.HiveEventCounter
-
-
-log4j.category.DataNucleus=ERROR,DRFA
-log4j.category.Datastore=ERROR,DRFA
-log4j.category.Datastore.Schema=ERROR,DRFA
-log4j.category.JPOX.Datastore=ERROR,DRFA
-log4j.category.JPOX.Plugin=ERROR,DRFA
-log4j.category.JPOX.MetaData=ERROR,DRFA
-log4j.category.JPOX.Query=ERROR,DRFA
-log4j.category.JPOX.General=ERROR,DRFA
-log4j.category.JPOX.Enhancer=ERROR,DRFA
-
-
-# Silence useless ZK logs
-log4j.logger.org.apache.zookeeper.server.NIOServerCnxn=WARN,DRFA
-log4j.logger.org.apache.zookeeper.ClientCnxnSocketNIO=WARN,DRFA

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/main/resources/hive-log4j2.properties
----------------------------------------------------------------------
diff --git a/common/src/main/resources/hive-log4j2.properties b/common/src/main/resources/hive-log4j2.properties
new file mode 100644
index 0000000..12cd9ac
--- /dev/null
+++ b/common/src/main/resources/hive-log4j2.properties
@@ -0,0 +1,73 @@
+# 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.
+
+status = INFO
+name = HiveLog4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.hive.log.level = INFO
+property.hive.root.logger = DRFA
+property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
+property.hive.log.file = hive.log
+
+# list of all appenders
+appenders = console, DRFA
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# daily rolling file appender
+appender.DRFA.type = RollingFile
+appender.DRFA.name = DRFA
+appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
+# Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session
+appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}
+appender.DRFA.layout.type = PatternLayout
+appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n
+appender.DRFA.policies.type = Policies
+appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
+appender.DRFA.policies.time.interval = 1
+appender.DRFA.policies.time.modulate = true
+appender.DRFA.strategy.type = DefaultRolloverStrategy
+appender.DRFA.strategy.max = 30
+
+# list of all loggers
+loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+logger.DataNucleus.name = DataNucleus
+logger.DataNucleus.level = ERROR
+
+logger.Datastore.name = Datastore
+logger.Datastore.level = ERROR
+
+logger.JPOX.name = JPOX
+logger.JPOX.level = ERROR
+
+# root logger
+rootLogger.level = ${sys:hive.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/main/resources/hive-log4j2.xml
----------------------------------------------------------------------
diff --git a/common/src/main/resources/hive-log4j2.xml b/common/src/main/resources/hive-log4j2.xml
deleted file mode 100644
index 50b03b5..0000000
--- a/common/src/main/resources/hive-log4j2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="HiveLog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="hive.log.level">INFO</Property>
-    <Property name="hive.root.logger">DRFA</Property>
-    <Property name="hive.log.dir">${sys:java.io.tmpdir}/${sys:user.name}</Property>
-    <Property name="hive.log.file">hive.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} [%t(%x)]: %p %c{2}: %m%n"/>
-    </Console>
-
-    <!-- Regular File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- <File name="FA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-    </File> -->
-
-    <!-- Daily Rolling File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session -->
-    <RollingFile name="DRFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t(%x)]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <!-- Rollover at mignight (interval = 1 means daily) -->
-        <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-      </Policies>
-      <!-- 30-day backup -->
-      <!-- <DefaultRolloverStrategy max="30"/> -->
-    </RollingFile>
-
-    <!-- Size based Rolling File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- <RollingFile name="RFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%i">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <SizeBasedTriggeringPolicy size="256 MB" />
-      </Policies>
-      <DefaultRolloverStrategy max="10"/>
-    </RollingFile> -->
-
-    <!-- HiveEventCounter appender is loaded from Configuration packages attribute.Sends counts of logging messages at different severity levels to Hadoop Metrics. -->
-    <HiveEventCounter name="EventCounter"/>
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:hive.log.level}">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-      <AppenderRef ref="EventCounter" />
-    </Root>
-
-    <Logger name="org.apache.zookeeper.server.NIOServerCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxnSocketNIO" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="DataNucleus" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore.Schema" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Plugin" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Metadata" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Query" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.General" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
----------------------------------------------------------------------
diff --git a/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java b/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
index 92269e7..fd6eda2 100644
--- a/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
+++ b/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
@@ -17,9 +17,7 @@
  */
 package org.apache.hadoop.hive.conf;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.InputStreamReader;
 
 import org.apache.hadoop.hive.common.LogUtils;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
@@ -34,13 +32,8 @@ import junit.framework.TestCase;
  * Loads configuration files located in common/src/test/resources.
  */
 public class TestHiveLogging extends TestCase {
-  private final Runtime runTime;
-  private Process process;
-
   public TestHiveLogging() {
     super();
-    runTime = Runtime.getRuntime();
-    process = null;
   }
 
   private void configLog(String hiveLog4jTest, String hiveExecLog4jTest)
@@ -57,25 +50,6 @@ public class TestHiveLogging extends TestCase {
     assertEquals(expectedLog4jExecPath, conf.getVar(ConfVars.HIVE_EXEC_LOG4J_FILE));
   }
 
-  private void runCmd(String cmd) throws Exception {
-    process = runTime.exec(cmd);
-    process.waitFor();
-  }
-
-  private void getCmdOutput(String logFile) throws Exception {
-    boolean logCreated = false;
-    BufferedReader buf = new BufferedReader(
-      new InputStreamReader(process.getInputStream()));
-    String line = "";
-    while((line = buf.readLine()) != null) {
-      line = line.replace("//", "/");
-      if (line.equals(logFile)) {
-        logCreated = true;
-      }
-    }
-    assertEquals(true, logCreated);
-  }
-
   public void cleanLog(File logFile) {
     if (logFile.exists()) {
       logFile.delete();
@@ -107,6 +81,6 @@ public class TestHiveLogging extends TestCase {
     String customLogName = "hiveLog4j2Test.log";
     File customLogFile = new File(customLogPath, customLogName);
     RunTest(customLogFile,
-      "hive-log4j2-test.xml", "hive-exec-log4j2-test.xml");
+      "hive-log4j2-test.properties", "hive-exec-log4j2-test.properties");
   }
 }

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/test/resources/hive-exec-log4j2-test.properties
----------------------------------------------------------------------
diff --git a/common/src/test/resources/hive-exec-log4j2-test.properties b/common/src/test/resources/hive-exec-log4j2-test.properties
new file mode 100644
index 0000000..9afa5fe
--- /dev/null
+++ b/common/src/test/resources/hive-exec-log4j2-test.properties
@@ -0,0 +1,65 @@
+# 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.
+
+status = INFO
+name = HiveExecLog4j2Test
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.hive.log.level = INFO
+property.hive.root.logger = FA
+property.hive.log.dir = ${sys:test.tmp.dir}/${sys:user.name}-TestHiveLogging
+property.hive.log.file = hiveExecLog4j2Test.log
+
+# list of all appenders
+appenders = console, FA
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# simple file appender
+appender.FA.type = File
+appender.FA.name = FA
+appender.FA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
+appender.FA.layout.type = PatternLayout
+appender.FA.layout.pattern = %d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+
+# list of all loggers
+loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+logger.DataNucleus.name = DataNucleus
+logger.DataNucleus.level = ERROR
+
+logger.Datastore.name = Datastore
+logger.Datastore.level = ERROR
+
+logger.JPOX.name = JPOX
+logger.JPOX.level = ERROR
+
+# root logger
+rootLogger.level = ${sys:hive.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/test/resources/hive-exec-log4j2-test.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/hive-exec-log4j2-test.xml b/common/src/test/resources/hive-exec-log4j2-test.xml
deleted file mode 100644
index 03487de..0000000
--- a/common/src/test/resources/hive-exec-log4j2-test.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="HiveExecLog4j2Test"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="hive.log.level">INFO</Property>
-    <Property name="hive.root.logger">FA</Property>
-    <Property name="hive.log.dir">${sys:test.tmp.dir}/${sys:user.name}-TestHiveLogging</Property>
-    <Property name="hive.log.file">hiveExecLog4j2Test.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n"/>
-    </Console>
-
-    <File name="FA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}">
-      <PatternLayout pattern="%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n" />
-    </File>
-
-    <!-- HiveEventCounter appender is loaded from Configuration packages attribute.Sends counts of logging messages at different severity levels to Hadoop Metrics. -->
-    <HiveEventCounter name="EventCounter"/>
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:hive.log.level}">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-      <AppenderRef ref="EventCounter" />
-    </Root>
-
-    <!-- Silence useless ZK logs -->
-    <Logger name="org.apache.zookeeper.server.NIOServerCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxnSocketNIO" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-
-    <Logger name="DataNucleus" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore.Schema" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Plugin" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Metadata" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Query" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.General" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/test/resources/hive-log4j2-test.properties
----------------------------------------------------------------------
diff --git a/common/src/test/resources/hive-log4j2-test.properties b/common/src/test/resources/hive-log4j2-test.properties
new file mode 100644
index 0000000..ca69a8f
--- /dev/null
+++ b/common/src/test/resources/hive-log4j2-test.properties
@@ -0,0 +1,72 @@
+# 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.
+
+status = INFO
+name = HiveLog4j2Test
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.hive.log.level = WARN
+property.hive.root.logger = DRFA
+property.hive.log.dir = ${sys:test.tmp.dir}/${sys:user.name}-TestHiveLogging
+property.hive.log.file = hiveLog4j2Test.log
+
+# list of all appenders
+appenders = console, DRFA
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# daily rolling file appender
+appender.DRFA.type = RollingFile
+appender.DRFA.name = DRFA
+appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
+appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}
+appender.DRFA.layout.type = PatternLayout
+appender.DRFA.layout.pattern = %d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+appender.DRFA.policies.type = Policies
+appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
+appender.DRFA.policies.time.interval = 1
+appender.DRFA.policies.time.modulate = true
+appender.DRFA.strategy.type = DefaultRolloverStrategy
+appender.DRFA.strategy.max = 30
+
+# list of all loggers
+loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+logger.DataNucleus.name = DataNucleus
+logger.DataNucleus.level = ERROR
+
+logger.Datastore.name = Datastore
+logger.Datastore.level = ERROR
+
+logger.JPOX.name = JPOX
+logger.JPOX.level = ERROR
+
+# root logger
+rootLogger.level = ${sys:hive.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/common/src/test/resources/hive-log4j2-test.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/hive-log4j2-test.xml b/common/src/test/resources/hive-log4j2-test.xml
deleted file mode 100644
index 0297e88..0000000
--- a/common/src/test/resources/hive-log4j2-test.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="HiveLog4j2Test"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="hive.log.level">WARN</Property>
-    <Property name="hive.root.logger">DRFA</Property>
-    <Property name="hive.log.dir">${sys:test.tmp.dir}/${sys:user.name}-TestHiveLogging</Property>
-    <Property name="hive.log.file">hiveLog4j2Test.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n"/>
-    </Console>
-
-    <!-- Daily Rolling File Appender -->
-    <!-- Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session -->
-    <RollingFile name="DRFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <!-- Rollover at mignight (interval = 1 means daily) -->
-        <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-      </Policies>
-      <!-- 30-day backup -->
-      <!-- <DefaultRolloverStrategy max="30"/> -->
-    </RollingFile>
-
-    <!-- HiveEventCounter appender is loaded from Configuration packages attribute.Sends counts of logging messages at different severity levels to Hadoop Metrics. -->
-    <HiveEventCounter name="EventCounter"/>
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:hive.log.level}">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-      <AppenderRef ref="EventCounter" />
-    </Root>
-
-    <!-- Silence useless ZK logs -->
-    <Logger name="org.apache.zookeeper.server.NIOServerCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxnSocketNIO" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-
-    <Logger name="DataNucleus" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore.Schema" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Plugin" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Metadata" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Query" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.General" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/data/conf/hive-log4j2.properties
----------------------------------------------------------------------
diff --git a/data/conf/hive-log4j2.properties b/data/conf/hive-log4j2.properties
new file mode 100644
index 0000000..6bace1f
--- /dev/null
+++ b/data/conf/hive-log4j2.properties
@@ -0,0 +1,123 @@
+# 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.
+
+status = INFO
+name = HiveLog4j2Test
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.hive.log.level = DEBUG
+property.hive.root.logger = DRFA
+property.hive.log.dir = ${sys:test.tmp.dir}/log
+property.hive.log.file = hive.log
+
+# list of all appenders
+appenders = console, DRFA
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# daily rolling file appender
+appender.DRFA.type = RollingFile
+appender.DRFA.name = DRFA
+appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
+appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}
+appender.DRFA.layout.type = PatternLayout
+appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t%x]: %c{2} (%F:%M(%L)) - %m%n
+appender.DRFA.policies.type = Policies
+appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
+appender.DRFA.policies.time.interval = 1
+appender.DRFA.policies.time.modulate = true
+appender.DRFA.strategy.type = DefaultRolloverStrategy
+appender.DRFA.strategy.max = 30
+
+# list of all loggers
+loggers = HadoopIPC, HadoopSecurity, Hdfs, HdfsServer, HadoopMetrics2, Mortbay, Yarn, YarnServer, Tez, HadoopConf, Zookeeper, ServerCnxn, NIOServerCnxn, ClientCnxn, ClientCnxnSocket, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX, Operator, Serde2Lazy, ObjectStore
+
+logger.HadoopIPC.name = org.apache.hadoop.ipc
+logger.HadoopIPC.level = WARN
+
+logger.HadoopSecurity.name = org.apache.hadoop.security
+logger.HadoopSecurity.level = INFO
+
+logger.Hdfs.name = org.apache.hadoop.hdfs
+logger.Hdfs.level = INFO
+
+logger.HdfsServer.name = org.apache.hadoop.hdfs.server
+logger.HdfsServer.level = WARN
+
+logger.HadoopMetrics2.name = org.apache.hadoop.metrics2
+logger.HadoopMetrics2.level = INFO
+
+logger.Mortbay.name = org.mortbay
+logger.Mortbay.level = INFO
+
+logger.Yarn.name = org.apache.hadoop.yarn
+logger.Yarn.level = INFO
+
+logger.YarnServer.name = org.apache.hadoop.yarn.server
+logger.YarnServer.level = WARN
+
+logger.Tez.name = org.apache.tez
+logger.Tez.level = INFO
+
+logger.HadoopConf.name = org.apache.hadoop.conf.Configuration
+logger.HadoopConf.level = ERROR
+
+logger.Zookeeper.name = org.apache.zookeeper
+logger.Zookeeper.level = INFO
+
+logger.ServerCnxn.name = org.apache.zookeeper.server.ServerCnxn
+logger.ServerCnxn.level = WARN
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxn.name = org.apache.zookeeper.ClientCnxn
+logger.ClientCnxn.level = WARN
+
+logger.ClientCnxnSocket.name = org.apache.zookeeper.ClientCnxnSocket
+logger.ClientCnxnSocket.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+logger.DataNucleus.name = DataNucleus
+logger.DataNucleus.level = ERROR
+
+logger.Datastore.name = Datastore
+logger.Datastore.level = ERROR
+
+logger.JPOX.name = JPOX
+logger.JPOX.level = ERROR
+
+logger.Operator.name = org.apache.hadoop.hive.ql.exec.Operator
+logger.Operator.level = INFO
+
+logger.Serde2Lazy.name = org.apache.hadoop.hive.serde2.lazy
+logger.Serde2Lazy.level = INFO
+
+logger.ObjectStore.name = org.apache.hadoop.hive.metastore.ObjectStore
+logger.ObjectStore.level = INFO
+
+# root logger
+rootLogger.level = ${sys:hive.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/data/conf/hive-log4j2.xml
----------------------------------------------------------------------
diff --git a/data/conf/hive-log4j2.xml b/data/conf/hive-log4j2.xml
deleted file mode 100644
index 860d756..0000000
--- a/data/conf/hive-log4j2.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="HiveLog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="hive.log.level">DEBUG</Property>
-    <Property name="hive.root.logger">DRFA</Property>
-    <Property name="hive.log.dir">${sys:test.tmp.dir}/log</Property>
-    <Property name="hive.log.file">hive.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n"/>
-    </Console>
-
-    <!-- Regular File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- <File name="FA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-    </File> -->
-
-    <!-- Daily Rolling File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session -->
-    <RollingFile name="DRFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <!-- Rollover at mignight (interval = 1 means daily) -->
-        <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-      </Policies>
-      <!-- 30-day backup -->
-      <!-- <DefaultRolloverStrategy max="30"/> -->
-    </RollingFile>
-
-    <!-- Size based Rolling File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- <RollingFile name="RFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%i">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <SizeBasedTriggeringPolicy size="256 MB" />
-      </Policies>
-      <DefaultRolloverStrategy max="10"/>
-    </RollingFile> -->
-
-    <!-- HiveEventCounter appender is loaded from Configuration packages attribute.Sends counts of logging messages at different severity levels to Hadoop Metrics. -->
-    <HiveEventCounter name="EventCounter"/>
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:hive.log.level}">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-      <AppenderRef ref="EventCounter" />
-    </Root>
-
-    <Logger name="org.apache.hadoop.ipc" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.security" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.hdfs" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.hdfs.server" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.metrics2" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.mortbay" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.yarn" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.yarn.server" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.tez" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.conf.Configuration" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.server.ServerCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.server.NIOServerCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxnSocket" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxnSocketNIO" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.hive.ql.exec.Operator" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.hive.serde2.lazy" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.hive.metastore.ObjectStore" level="INFO">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="DataNucleus" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore.Schema" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Plugin" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Metadata" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Query" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.General" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/data/conf/llap/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/llap/hive-site.xml b/data/conf/llap/hive-site.xml
index 4bf034a..9440611 100644
--- a/data/conf/llap/hive-site.xml
+++ b/data/conf/llap/hive-site.xml
@@ -260,12 +260,12 @@
 
 <property>
   <name>hive.tez.java.opts</name>
-  <value> -Dlog4j.configurationFile=tez-container-log4j2.xml -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
+  <value> -Dlog4j.configurationFile=tez-container-log4j2.properties -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
 </property>
 
 <property>
   <name>tez.am.launch.cmd-opts</name>
-  <value> -Dlog4j.configurationFile=tez-container-log4j2.xml -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
+  <value> -Dlog4j.configurationFile=tez-container-log4j2.properties -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
 </property>
 
 <property>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/data/conf/spark/log4j2.properties
----------------------------------------------------------------------
diff --git a/data/conf/spark/log4j2.properties b/data/conf/spark/log4j2.properties
new file mode 100644
index 0000000..81f067d
--- /dev/null
+++ b/data/conf/spark/log4j2.properties
@@ -0,0 +1,69 @@
+# 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.
+
+status = INFO
+name = SparkLog4j2Test
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.spark.log.level = DEBUG
+property.spark.root.logger = DRFA
+property.spark.log.dir = target/tmp/log
+property.spark.log.file = spark.log
+
+# list of all appenders
+appenders = console, DRFA
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# daily rolling file appender
+appender.DRFA.type = RollingFile
+appender.DRFA.name = DRFA
+appender.DRFA.fileName = ${sys:spark.log.dir}/${sys:spark.log.file}
+appender.DRFA.filePattern = ${sys:spark.log.dir}/${sys:spark.log.file}.%d{yyyy-MM-dd}
+appender.DRFA.layout.type = PatternLayout
+appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n
+appender.DRFA.policies.type = Policies
+appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
+appender.DRFA.policies.time.interval = 1
+appender.DRFA.policies.time.modulate = true
+appender.DRFA.strategy.type = DefaultRolloverStrategy
+appender.DRFA.strategy.max = 30
+
+# list of all loggers
+loggers = SparkIMain, SparkILoop, Jetty, AbstractLifeCycle
+
+logger.SparkIMain.name = org.apache.spark.repl.SparkIMain$exprTyper
+logger.SparkIMain.level = INFO
+
+logger.SparkILoop.name = org.apache.spark.repl.SparkILoop$SparkILoopInterpreter
+logger.SparkILoop.level = INFO
+
+logger.Jetty.name = org.eclipse.jetty
+logger.Jetty.level = WARN
+
+logger.AbstractLifeCycle.name = org.eclipse.jetty.util.component.AbstractLifeCycle
+logger.AbstractLifeCycle.level = ERROR
+
+# root logger
+rootLogger.level = ${sys:spark.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:spark.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/data/conf/spark/log4j2.xml
----------------------------------------------------------------------
diff --git a/data/conf/spark/log4j2.xml b/data/conf/spark/log4j2.xml
deleted file mode 100644
index 395a2bf..0000000
--- a/data/conf/spark/log4j2.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="SparkLog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="spark.log.level">DEBUG</Property>
-    <Property name="spark.root.logger">DRFA</Property>
-    <Property name="spark.log.dir">target/tmp/log</Property>
-    <Property name="spark.log.file">spark.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n"/>
-    </Console>
-
-    <!-- Regular File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- <File name="FA" fileName="${sys:spark.log.dir}/${sys:spark.log.file}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-    </File> -->
-
-    <!-- Daily Rolling File Appender -->
-    <!-- Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session -->
-    <RollingFile name="DRFA" fileName="${sys:spark.log.dir}/${sys:spark.log.file}"
-     filePattern="${sys:spark.log.dir}/${sys:spark.log.file}.%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <!-- Rollover at mignight (interval = 1 means daily) -->
-        <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-      </Policies>
-      <!-- 30-day backup -->
-      <!-- <DefaultRolloverStrategy max="30"/> -->
-    </RollingFile>
-
-  </Appenders>
-
-  <Loggers>
-    <Root level="DEBUG">
-      <AppenderRef ref="${sys:spark.root.logger}" level="${sys:spark.log.level}"/>
-    </Root>
-
-    <Logger name="org.apache.spark.repl.SparkIMain$exprTyper" level="INFO">
-      <AppenderRef ref="${sys:spark.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.spark.repl.SparkILoop$SparkILoopInterpreter" level="INFO">
-      <AppenderRef ref="${sys:spark.root.logger}"/>
-    </Logger>
-    <Logger name="org.eclipse.jetty" level="WARN">
-      <AppenderRef ref="${sys:spark.root.logger}"/>
-    </Logger>
-    <Logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR">
-      <AppenderRef ref="${sys:spark.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/data/conf/tez/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/tez/hive-site.xml b/data/conf/tez/hive-site.xml
index ef48d82..a056ced 100644
--- a/data/conf/tez/hive-site.xml
+++ b/data/conf/tez/hive-site.xml
@@ -259,12 +259,12 @@
 
 <property>
   <name>hive.tez.java.opts</name>
-  <value> -Dlog4j.configurationFile=tez-container-log4j2.xml -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
+  <value> -Dlog4j.configurationFile=tez-container-log4j2.properties -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
 </property>
 
 <property>
   <name>tez.am.launch.cmd-opts</name>
-  <value> -Dlog4j.configurationFile=tez-container-log4j2.xml -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
+  <value> -Dlog4j.configurationFile=tez-container-log4j2.properties -Dtez.container.log.level=INFO -Dtez.container.root.logger=CLA </value>
 </property>
 
 <property>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/docs/xdocs/language_manual/cli.xml
----------------------------------------------------------------------
diff --git a/docs/xdocs/language_manual/cli.xml b/docs/xdocs/language_manual/cli.xml
index eb91e44..aaa8e81 100644
--- a/docs/xdocs/language_manual/cli.xml
+++ b/docs/xdocs/language_manual/cli.xml
@@ -163,7 +163,7 @@ Sample Usage:
 
 <section name="Logging" href="logging">
 <p>
-Hive uses log4j for logging. These logs are not emitted to the standard output by default but are instead captured to a log file specified by Hive's log4j properties file. By default Hive will use <i>hive-log4j2.xml</i> in the <i>conf/</i> directory of the hive installation which writes out logs to <i>/tmp/$USER/hive.log</i> and uses the <i>WARN</i> level.
+Hive uses log4j for logging. These logs are not emitted to the standard output by default but are instead captured to a log file specified by Hive's log4j properties file. By default Hive will use <i>hive-log4j2.properties</i> in the <i>conf/</i> directory of the hive installation which writes out logs to <i>/tmp/$USER/hive.log</i> and uses the <i>WARN</i> level.
 </p>
 <p>
 It is often desirable to emit the logs to the standard output and/or change the logging level for debugging purposes. These can be done from the command line as follows: </p>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/bin/hcat_server.sh
----------------------------------------------------------------------
diff --git a/hcatalog/bin/hcat_server.sh b/hcatalog/bin/hcat_server.sh
index d1aecb8..7a7a45e 100644
--- a/hcatalog/bin/hcat_server.sh
+++ b/hcatalog/bin/hcat_server.sh
@@ -84,7 +84,7 @@ function start_hcat() {
   export AUX_CLASSPATH=${AUX_CLASSPATH}
 
   export HADOOP_HOME=$HADOOP_HOME
-  #export HADOOP_OPTS="-Dlog4j.configurationFile=file://${HCAT_PREFIX}/conf/log4j2.xml"
+  #export HADOOP_OPTS="-Dlog4j.configurationFile=file://${HCAT_PREFIX}/conf/log4j2.properties"
   export HADOOP_OPTS="${HADOOP_OPTS} -server -XX:+UseConcMarkSweepGC -XX:ErrorFile=${HCAT_LOG_DIR}/hcat_err_pid%p.log -Xloggc:${HCAT_LOG_DIR}/hcat_gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps"
   export HADOOP_HEAPSIZE=${HADOOP_HEAPSIZE:-2048} # 8G is better if you have it
   export METASTORE_PORT=${METASTORE_PORT:-9083}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/bin/templeton.cmd
----------------------------------------------------------------------
diff --git a/hcatalog/bin/templeton.cmd b/hcatalog/bin/templeton.cmd
index 759f654..1b1ae6f 100644
--- a/hcatalog/bin/templeton.cmd
+++ b/hcatalog/bin/templeton.cmd
@@ -59,7 +59,7 @@ setlocal enabledelayedexpansion
 
   if not defined TEMPLETON_LOG4J (
     @rem must be prefixed with file: otherwise config is not picked up
-    set TEMPLETON_LOG4J=file:%WEBHCAT_CONF_DIR%\webhcat-log4j2.xml
+    set TEMPLETON_LOG4J=file:%WEBHCAT_CONF_DIR%\webhcat-log4j2.properties
   )
   set TEMPLETON_OPTS=-Dtempleton.log.dir=%TEMPLETON_LOG_DIR% -Dlog4j.configurationFile=%TEMPLETON_LOG4J% %HADOOP_OPTS%
   set arguments=%JAVA_HEAP_MAX% %TEMPLETON_OPTS% -classpath %CLASSPATH% org.apache.hive.hcatalog.templeton.Main

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/scripts/hcat_server_start.sh
----------------------------------------------------------------------
diff --git a/hcatalog/scripts/hcat_server_start.sh b/hcatalog/scripts/hcat_server_start.sh
index 872d1b5..27504de 100755
--- a/hcatalog/scripts/hcat_server_start.sh
+++ b/hcatalog/scripts/hcat_server_start.sh
@@ -70,7 +70,7 @@ export AUX_CLASSPATH=${AUX_CLASSPATH}
 
 
 export HADOOP_HOME=$HADOOP_HOME
-#export HADOOP_OPTS="-Dlog4j.configurationFile=file://${ROOT}/conf/log4j2.xml"
+#export HADOOP_OPTS="-Dlog4j.configurationFile=file://${ROOT}/conf/log4j2.properties"
 export HADOOP_OPTS="${HADOOP_OPTS} -server -XX:+UseConcMarkSweepGC -XX:ErrorFile=${ROOT}/var/log/hcat_err_pid%p.log -Xloggc:${ROOT}/var/log/hcat_gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps"
 export HADOOP_HEAPSIZE=2048 # 8G is better if you have it
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml
----------------------------------------------------------------------
diff --git a/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml b/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml
index 6385e409..296b631 100644
--- a/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml
+++ b/hcatalog/src/docs/src/documentation/content/xdocs/configuration.xml
@@ -66,7 +66,7 @@ ${env.PIG_HOME}/bin/pig
      uncertainty.</p>
 
   <p><strong>Note:</strong> The location of the log files created by Templeton and some other properties
-     of the logging system are set in the webhcat-log4j2.xml file.</p>
+     of the logging system are set in the webhcat-log4j2.properties file.</p>
 
   <section>
   <title>Variables</title>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/src/docs/src/documentation/content/xdocs/install.xml
----------------------------------------------------------------------
diff --git a/hcatalog/src/docs/src/documentation/content/xdocs/install.xml b/hcatalog/src/docs/src/documentation/content/xdocs/install.xml
index e2953a9..4ae0401 100644
--- a/hcatalog/src/docs/src/documentation/content/xdocs/install.xml
+++ b/hcatalog/src/docs/src/documentation/content/xdocs/install.xml
@@ -241,7 +241,7 @@
 
     <p>Server activity logs are located in
     <em>root</em><code>/var/log/hcat_server</code>.  Logging configuration is located at
-    <em>root</em><code>/conf/log4j2.xml</code>.  Server logging uses
+    <em>root</em><code>/conf/log4j2.properties</code>.  Server logging uses
     <code>DailyRollingFileAppender</code> by default. It will generate a new
     file per day and does not expire old log files automatically.</p>
 

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties
new file mode 100644
index 0000000..c618297
--- /dev/null
+++ b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties
@@ -0,0 +1,72 @@
+# 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.
+
+status = INFO
+name = HCatE2ELog4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.hive.log.level = DEBUG
+property.hive.root.logger = DRFA
+property.hive.log.dir = ${sys:java.io.tmpdir}/${sys:user.name}
+property.hive.log.file = hive.log
+
+# list of all appenders
+appenders = console, DRFA
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# daily rolling file appender
+appender.DRFA.type = RollingFile
+appender.DRFA.name = DRFA
+appender.DRFA.fileName = ${sys:hive.log.dir}/${sys:hive.log.file}
+appender.DRFA.filePattern = ${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}
+appender.DRFA.layout.type = PatternLayout
+appender.DRFA.layout.pattern = %d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n
+appender.DRFA.policies.type = Policies
+appender.DRFA.policies.time.type = TimeBasedTriggeringPolicy
+appender.DRFA.policies.time.interval = 1
+appender.DRFA.policies.time.modulate = true
+appender.DRFA.strategy.type = DefaultRolloverStrategy
+appender.DRFA.strategy.max = 30
+
+# list of all loggers
+loggers = NIOServerCnxn, ClientCnxnSocketNIO, DataNucleus, Datastore, JPOX
+
+logger.NIOServerCnxn.name = org.apache.zookeeper.server.NIOServerCnxn
+logger.NIOServerCnxn.level = WARN
+
+logger.ClientCnxnSocketNIO.name = org.apache.zookeeper.ClientCnxnSocketNIO
+logger.ClientCnxnSocketNIO.level = WARN
+
+logger.DataNucleus.name = DataNucleus
+logger.DataNucleus.level = ERROR
+
+logger.Datastore.name = Datastore
+logger.Datastore.level = ERROR
+
+logger.JPOX.name = JPOX
+logger.JPOX.level = ERROR
+
+# root logger
+rootLogger.level = ${sys:hive.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:hive.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml b/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml
deleted file mode 100644
index 87e18e2..0000000
--- a/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="HCatE2ELog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="hive.log.level">DEBUG</Property>
-    <Property name="hive.root.logger">DRFA</Property>
-    <Property name="hive.log.dir">${sys:java.io.tmpdir}/${sys:user.name}</Property>
-    <Property name="hive.log.file">hive.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n"/>
-    </Console>
-
-    <!-- Regular File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- <File name="FA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-    </File> -->
-
-    <!-- Daily Rolling File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session -->
-    <RollingFile name="DRFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <!-- Rollover at mignight (interval = 1 means daily) -->
-        <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-      </Policies>
-      <!-- 30-day backup -->
-      <!-- <DefaultRolloverStrategy max="30"/> -->
-    </RollingFile>
-
-    <!-- Size based Rolling File Appender -->
-    <!-- NOTE: if enabling multiple file appender make sure to use different file names -->
-    <!-- <RollingFile name="RFA" fileName="${sys:hive.log.dir}/${sys:hive.log.file}"
-     filePattern="${sys:hive.log.dir}/${sys:hive.log.file}.%i">
-      <PatternLayout pattern="%d{ISO8601} %-5p [%t]: %c{2} (%F:%M(%L)) - %m%n" />
-      <Policies>
-        <SizeBasedTriggeringPolicy size="256 MB" />
-      </Policies>
-      <DefaultRolloverStrategy max="10"/>
-    </RollingFile> -->
-
-    <!-- HiveEventCounter appender is loaded from Configuration packages attribute.Sends counts of logging messages at different severity levels to Hadoop Metrics. -->
-    <HiveEventCounter name="EventCounter"/>
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:hive.log.level}">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-      <AppenderRef ref="EventCounter" />
-    </Root>
-
-    <Logger name="org.apache.zookeeper.server.NIOServerCnxn" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper.ClientCnxnSocketNIO" level="WARN">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="DataNucleus" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="Datastore.Schema" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Datastore" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Plugin" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Metadata" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Query" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.General" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-    <Logger name="JPOX.Enhancer" level="ERROR">
-      <AppenderRef ref="${sys:hive.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/src/test/e2e/templeton/deployers/start_hive_services.sh
----------------------------------------------------------------------
diff --git a/hcatalog/src/test/e2e/templeton/deployers/start_hive_services.sh b/hcatalog/src/test/e2e/templeton/deployers/start_hive_services.sh
index e59177c..66c0cb5 100755
--- a/hcatalog/src/test/e2e/templeton/deployers/start_hive_services.sh
+++ b/hcatalog/src/test/e2e/templeton/deployers/start_hive_services.sh
@@ -31,7 +31,7 @@ cp ${PROJ_HOME}/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-site.
 #cp ${PROJ_HOME}/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-site.mssql.xml ${HIVE_HOME}/conf/hive-site.xml
 
 cp ${PROJ_HOME}/hcatalog/src/test/e2e/templeton/deployers/config/webhcat/webhcat-site.xml ${HIVE_HOME}/hcatalog/etc/webhcat/webhcat-site.xml
-cp ${PROJ_HOME}/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.xml ${HIVE_HOME}/conf/hive-log4j2.xml
+cp ${PROJ_HOME}/hcatalog/src/test/e2e/templeton/deployers/config/hive/hive-log4j2.properties ${HIVE_HOME}/conf/hive-log4j2.properties
 
 if [ -f ${MYSQL_CLIENT_JAR} ]; then
   cp ${MYSQL_CLIENT_JAR} ${HIVE_HOME}/lib

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh b/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh
index c80fdd5..ec7c492 100644
--- a/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh
+++ b/hcatalog/webhcat/svr/src/main/bin/webhcat_server.sh
@@ -215,7 +215,7 @@ else
 fi
 
 if [[ -z "$WEBHCAT_LOG4J" ]]; then
-  WEBHCAT_LOG4J="file://$base_dir/etc/webhcat/webhcat-log4j2.xml";
+  WEBHCAT_LOG4J="file://$base_dir/etc/webhcat/webhcat-log4j2.properties";
 fi
 
 export HADOOP_USER_CLASSPATH_FIRST=true

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.properties
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.properties b/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.properties
new file mode 100644
index 0000000..3ea2c7b
--- /dev/null
+++ b/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.properties
@@ -0,0 +1,75 @@
+# 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.
+
+status = INFO
+name = WebhcatLog4j2
+packages = org.apache.hadoop.hive.ql.log
+
+# list of properties
+property.webhcat.log.level = INFO
+property.webhcat.root.logger = standard
+property.webhcat.log.dir = .
+property.webhcat.log.file = webhcat.log
+
+# list of all appenders
+appenders = console, standard
+
+# console appender
+appender.console.type = Console
+appender.console.name = console
+appender.console.target = SYSTEM_ERR
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n
+
+# daily rolling file appender
+appender.standard.type = RollingFile
+appender.standard.name = standard
+appender.standard.fileName = ${sys:webhcat.log.dir}/${sys:webhcat.log.file}
+appender.standard.filePattern = ${sys:webhcat.log.dir}/${sys:webhcat.log.file}.%d{yyyy-MM-dd}
+appender.standard.layout.type = PatternLayout
+appender.standard.layout.pattern = %-5p | %d{DATE} | %c | %m%n
+appender.standard.policies.type = Policies
+appender.standard.policies.time.type = TimeBasedTriggeringPolicy
+appender.standard.policies.time.interval = 1
+appender.standard.policies.time.modulate = true
+appender.standard.strategy.type = DefaultRolloverStrategy
+appender.standard.strategy.max = 30
+
+# list of all loggers
+loggers = Jersey, WebComponent, Hadoop, HadoopConf, Zookeeper, Jetty
+
+logger.Jersey.name = com.sun.jersey
+logger.Jersey.level = DEBUG
+
+logger.WebComponent.name = com.sun.jersey.spi.container.servlet.WebComponent
+logger.WebComponent.level = ERROR
+
+logger.Hadoop.name = org.apache.hadoop
+logger.Hadoop.level = INFO
+
+logger.HadoopConf.name = org.apache.hadoop.conf
+logger.HadoopConf.level = WARN
+
+logger.Zookeeper.name = org.apache.zookeeper
+logger.Zookeeper.level = WARN
+
+logger.Jetty.name = org.eclipse.jetty
+logger.Jetty.level = INFO
+
+# root logger
+rootLogger.level = ${sys:webhcat.log.level}
+rootLogger.appenderRefs = root
+rootLogger.appenderRef.root.ref = ${sys:webhcat.root.logger}

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml
----------------------------------------------------------------------
diff --git a/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml b/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml
deleted file mode 100644
index ef8e73d..0000000
--- a/hcatalog/webhcat/svr/src/main/config/webhcat-log4j2.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   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.
--->
-
-<Configuration status="info" strict="true" name="WebhcatLog4j2"
- packages="org.apache.hadoop.hive.ql.log">
-
-  <Properties>
-    <Property name="webhcat.log.level">INFO</Property>
-    <Property name="webhcat.root.logger">standard</Property>
-    <Property name="webhcat.log.dir">.</Property>
-    <Property name="webhcat.log.file">webhcat.log</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="console" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} [%t]: %p %c{2}: %m%n"/>
-    </Console>
-
-    <!-- Daily Rolling File Appender -->
-    <!-- Use %pid in the filePattern to append <process-id>@<host-name> to the filename if you want separate log files for different CLI session -->
-    <RollingFile name="standard" fileName="${sys:webhcat.log.dir}/${sys:webhcat.log.file}"
-     filePattern="${sys:webhcat.log.dir}/${sys:webhcat.log.file}.%d{yyyy-MM-dd}">
-      <PatternLayout pattern="%-5p | %d{DATE} | %c | %m%n" />
-      <Policies>
-        <!-- Rollover at mignight (interval = 1 means daily) -->
-        <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
-      </Policies>
-      <!-- 30-day backup -->
-      <!-- <DefaultRolloverStrategy max="30"/> -->
-    </RollingFile>
-
-  </Appenders>
-
-  <Loggers>
-    <Root level="${sys:webhcat.log.level}">
-      <AppenderRef ref="${sys:webhcat.root.logger}"/>
-    </Root>
-
-    <Logger name="com.sun.jersey" level="DEBUG">
-      <AppenderRef ref="${sys:webhcat.root.logger}"/>
-    </Logger>
-    <Logger name="com.sun.jersey.spi.container.servlet.WebComponent" level="ERROR">
-      <AppenderRef ref="${sys:webhcat.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop" level="INFO">
-      <AppenderRef ref="${sys:webhcat.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.hadoop.conf" level="WARN">
-      <AppenderRef ref="${sys:webhcat.root.logger}"/>
-    </Logger>
-    <Logger name="org.apache.zookeeper" level="WARN">
-      <AppenderRef ref="${sys:webhcat.root.logger}"/>
-    </Logger>
-    <Logger name="org.eclipse.jetty" level="INFO">
-      <AppenderRef ref="${sys:webhcat.root.logger}"/>
-    </Logger>
-  </Loggers>
-
-</Configuration>

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/hplsql/src/main/java/org/apache/hive/hplsql/Exec.java
----------------------------------------------------------------------
diff --git a/hplsql/src/main/java/org/apache/hive/hplsql/Exec.java b/hplsql/src/main/java/org/apache/hive/hplsql/Exec.java
index 3a80eca..84193da 100644
--- a/hplsql/src/main/java/org/apache/hive/hplsql/Exec.java
+++ b/hplsql/src/main/java/org/apache/hive/hplsql/Exec.java
@@ -766,7 +766,7 @@ public class Exec extends HplsqlBaseVisitor<Integer> {
       return 1;
     }
     // specify the default log4j2 properties file.
-    System.setProperty("log4j.configurationFile", "hive-log4j2.xml");
+    System.setProperty("log4j.configurationFile", "hive-log4j2.properties");
     conf = new Conf();
     conf.init();    
     conn = new Conn(this);

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 0686f1f..8a334dd 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -89,7 +89,7 @@
                       }
                       mkdir -p $DOWNLOAD_DIR
                       download "http://d3jw87u4immizc.cloudfront.net/spark-tarball/spark-${spark.version}-bin-hadoop2-without-hive.tgz" "spark"
-                      cp -f $HIVE_ROOT/data/conf/spark/log4j2.xml $BASE_DIR/spark/conf/
+                      cp -f $HIVE_ROOT/data/conf/spark/log4j2.properties $BASE_DIR/spark/conf/
                       sed '/package /d' ${basedir}/${hive.path.to.root}/contrib/src/java/org/apache/hadoop/hive/contrib/udf/example/UDFExampleAdd.java > /tmp/UDFExampleAdd.java
                       javac -cp  ${settings.localRepository}/org/apache/hive/hive-exec/${project.version}/hive-exec-${project.version}.jar /tmp/UDFExampleAdd.java -d /tmp
                       jar -cf /tmp/udfexampleadd-1.0.jar -C /tmp UDFExampleAdd.class

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/bin/llap-daemon-env.sh
----------------------------------------------------------------------
diff --git a/llap-server/bin/llap-daemon-env.sh b/llap-server/bin/llap-daemon-env.sh
index a2298ad..02c4315 100755
--- a/llap-server/bin/llap-daemon-env.sh
+++ b/llap-server/bin/llap-daemon-env.sh
@@ -32,7 +32,10 @@
 #export LLAP_DAEMON_USER_CLASSPATH=
 
 # Logger setup for LLAP daemon
-#export LLAP_DAEMON_LOGGER=INFO,RFA
+#export LLAP_DAEMON_LOGGER=RFA
+
+# Log level for LLAP daemon
+#export LLAP_DAEMON_LOG_LEVEL=INFO
 
 # Directory to which logs will be generated
 #export LLAP_DAEMON_LOG_DIR=

http://git-wip-us.apache.org/repos/asf/hive/blob/e2d9ada8/llap-server/bin/llapDaemon.sh
----------------------------------------------------------------------
diff --git a/llap-server/bin/llapDaemon.sh b/llap-server/bin/llapDaemon.sh
index 010e1e6..6f57998 100755
--- a/llap-server/bin/llapDaemon.sh
+++ b/llap-server/bin/llapDaemon.sh
@@ -30,7 +30,7 @@
 
 #set -x
 
-usage="Usage: llap-daemon.sh  (start|stop) "
+usage="Usage: llapDaemon.sh  (start|stop) "
 
 # if no args specified, show usage
 if [ $# -le 0 ]; then
@@ -86,10 +86,6 @@ fi
 # some variables
 LLAP_DAEMON_LOG_BASE=llap-daemon-$USER-$HOSTNAME
 export LLAP_DAEMON_LOG_FILE=$LLAP_DAEMON_LOG_BASE.log
-if [ ! -n "${LLAP_DAEMON_LOGGER}" ]; then
-  echo "LLAP_DAEMON_LOGGER not defined... using defaults"
-  LLAP_DAEMON_LOGGER=${LOG_LEVEL_DEFAULT}
-fi
 logLog=$LLAP_DAEMON_LOG_DIR/$LLAP_DAEMON_LOG_BASE.log
 logOut=$LLAP_DAEMON_LOG_DIR/$LLAP_DAEMON_LOG_BASE.out
 pid=$LLAP_DAEMON_PID_DIR/llap-daemon.pid