Index: conf/log4j.xml.template
===================================================================
--- conf/log4j.xml.template	(revision 0)
+++ conf/log4j.xml.template	(revision 0)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+  <!-- console appender -->
+  <appender name="console" class="org.apache.log4j.ConsoleAppender">
+    <param name="threshold" value="all"/>
+    <param name="Target" value="System.err"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n"/>
+    </layout>
+  </appender>
+
+  <!-- EventCounter appender -->
+  <appender name="EventCounter" class="org.apache.hadoop.metrics.jvm.EventCounter">
+    <param name="threshold" value="all"/>
+  </appender>
+
+  <!-- DRFA appender (not used currently) -->
+  <appender name="DRFA" class="org.apache.log4j.DailyRollingFileAppender">
+    <param name="threshold" value="all"/>
+    <param name="File" value="./hadoop.log"/>
+    <param name="DatePattern" value=".yyyy-MM-dd"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversationPattern" value="%d{ISO8601} %p %c: %m%n"/>
+    </layout>
+  </appender>
+
+  <!-- TLA appender (not used currently) -->
+  <appender name="TLA" class="org.apache.hadoop.mapred.TaskLogAppender">
+    <param name="threshold" value="all"/>
+    <param name="taskID" value="null"/>
+    <param name="totalLogFileSize" value="100"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversationPattern" value="%d{ISO8601} %p %c: %m%n"/>
+    </layout>
+  </appender>
+
+  <!-- custom loggers -->
+  <logger name="org.jets3t.service.impl.rest.httpclient.RestS3Service">
+    <level value="error"/>
+  </logger>
+  <logger name="org.apache.hadoop.fs.FSNamesystem.audit">
+    <level value="warn"/>
+  </logger>
+
+  <!-- root logging configuration -->
+  <root>
+    <priority value="info"/>
+
+    <appender-ref ref="console"/>
+    <appender-ref ref="EventCounter"/>
+  </root>
+</log4j:configuration>
Index: conf/log4j.properties
===================================================================
--- conf/log4j.properties	(revision 722708)
+++ conf/log4j.properties	(working copy)
@@ -1,94 +0,0 @@
-# Define some default values that can be overridden by system properties
-hadoop.root.logger=INFO,console
-hadoop.log.dir=.
-hadoop.log.file=hadoop.log
-
-# Define the root logger to the system property "hadoop.root.logger".
-log4j.rootLogger=${hadoop.root.logger}, EventCounter
-
-# Logging Threshold
-log4j.threshhold=ALL
-
-#
-# Daily Rolling File Appender
-#
-
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${hadoop.log.dir}/${hadoop.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 %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} %p %c{2}: %m%n
-
-#
-# TaskLog Appender
-#
-
-#Default values
-hadoop.tasklog.taskid=null
-hadoop.tasklog.noKeepSplits=4
-hadoop.tasklog.totalLogFileSize=100
-hadoop.tasklog.purgeLogSplits=true
-hadoop.tasklog.logsRetainHours=12
-
-log4j.appender.TLA=org.apache.hadoop.mapred.TaskLogAppender
-log4j.appender.TLA.taskId=${hadoop.tasklog.taskid}
-log4j.appender.TLA.totalLogFileSize=${hadoop.tasklog.totalLogFileSize}
-
-log4j.appender.TLA.layout=org.apache.log4j.PatternLayout
-log4j.appender.TLA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-
-#
-# Rolling File Appender
-#
-
-#log4j.appender.RFA=org.apache.log4j.RollingFileAppender
-#log4j.appender.RFA.File=${hadoop.log.dir}/${hadoop.log.file}
-
-# Logfile size and and 30-day backups
-#log4j.appender.RFA.MaxFileSize=1MB
-#log4j.appender.RFA.MaxBackupIndex=30
-
-#log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
-#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} - %m%n
-#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
-
-#
-# FSNamesystem Audit logging
-# All audit events are logged at INFO level
-#
-log4j.logger.org.apache.hadoop.fs.FSNamesystem.audit=WARN
-
-# Custom Logging levels
-
-#log4j.logger.org.apache.hadoop.mapred.JobTracker=DEBUG
-#log4j.logger.org.apache.hadoop.mapred.TaskTracker=DEBUG
-#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG
-
-# Jets3t library
-log4j.logger.org.jets3t.service.impl.rest.httpclient.RestS3Service=ERROR
-
-#
-# Event Counter Appender
-# Sends counts of logging messages at different severity levels to Hadoop Metrics.
-#
-log4j.appender.EventCounter=org.apache.hadoop.metrics.jvm.EventCounter