From c6501008c89703c645b3f1e4839b33e9c73e559d Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 11 Jul 2011 18:10:11 +0000
Subject: [PATCH] Expose recently added "encoding" and "locale" options of
 AccessLogValve through JMX.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1145268 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/valves/mbeans-descriptors.xml  | 34 ++++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml
index ce2c56f8f..f5112ad30 100644
--- a/java/org/apache/catalina/valves/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml
@@ -46,26 +46,34 @@
     <attribute name="condition"
                description="The value to look for conditional logging."
                type="java.lang.String"/>
-               
+
     <attribute name="directory"
                description="The directory in which log files are created"
                type="java.lang.String"/>
-               
+
     <attribute name="enabled"
                description="Enable Access Logging"
                is="false"
                type="boolean"/>
 
+    <attribute name="encoding"
+               description="Character set used to write the log file"
+               type="java.lang.String"/>
+
     <attribute name="fileDateFormat"
-               description="The format for the date date based log rotation."
+               description="The format for the date for date based log rotation"
                type="java.lang.String"/>
-               
+
     <attribute name="info"
                description="Information about this implementation"
                type="java.lang.String"
                writeable="false"/>
 
-    <attribute   name="pattern"
+    <attribute name="locale"
+               description="The locale used to format timestamps in the access log lines"
+               type="java.lang.String"/>
+
+    <attribute name="pattern"
                description="The pattern used to format our access log lines"
                type="java.lang.String"/>
 
@@ -198,25 +206,33 @@
     <attribute name="condition"
                description="The value to look for conditional logging."
                type="java.lang.String"/>
-               
+
     <attribute name="directory"
                description="The directory in which log files are created"
                type="java.lang.String"/>
-               
-     <attribute name="enabled"
+
+    <attribute name="enabled"
                description="Enable Access Logging"
                is="false"
                type="boolean"/>
 
+    <attribute name="encoding"
+               description="Character set used to write the log file"
+               type="java.lang.String"/>
+
     <attribute name="fileDateFormat"
                description="The format for the date date based log rotation."
                type="java.lang.String"/>
-               
+
     <attribute name="info"
                description="Information about this implementation"
                type="java.lang.String"
                writeable="false"/>
 
+    <attribute name="locale"
+               description="The locale used to format timestamps in the access log lines"
+               type="java.lang.String"/>
+
     <attribute   name="pattern"
                description="The pattern used to format our access log lines"
                type="java.lang.String"/>
-- 
2.11.0