cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml
billbarker2004/07/13 23:19:32 Modified:catalina/src/share/org/apache/catalina/connector mbeans-descriptors.xml catalina/src/share/org/apache/catalina/core mbeans-descriptors.xml catalina/src/share/org/apache/catalina/loader mbeans-descriptors.xml catalina/src/share/org/apache/catalina/realm mbeans-descriptors.xml catalina/src/share/org/apache/catalina/session mbeans-descriptors.xml catalina/src/share/org/apache/catalina/startup mbeans-descriptors.xml catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml Log: Removing the 'debug' property from the mbeans. Revision ChangesPath 1.2 +0 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/mbeans-descriptors.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mbeans-descriptors.xml23 Jun 2004 08:24:58 - 1.1 +++ mbeans-descriptors.xml14 Jul 2004 06:19:31 - 1.2 @@ -57,10 +57,6 @@ description=Timeout value on the incoming connection during request processing type=int/ -attribute name=debug - description=The debugging detail level for this component - type=int/ - attributename=disableUploadTimeout description=Should Tomcat ignore setting a timeout for uploads? type=boolean/ 1.30 +0 -40 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mbeans-descriptors.xml7 Jun 2004 15:30:06 - 1.29 +++ mbeans-descriptors.xml14 Jul 2004 06:19:31 - 1.30 @@ -109,10 +109,6 @@ type=java.lang.String writeable=false/ -attribute name=debug - description=The debugging detail level for this component - type=int/ - /mbean mbean name=StandardContext @@ -161,10 +157,6 @@ description=Should we allow the ServletContext.getContext() method to access the context of other web applications in this server? type=boolean/ -attribute name=debug - description=The debugging detail level for this component - type=int/ - attribute name=defaultWebXml description=Location of the default web.xml resource or file type=java.lang.String/ @@ -430,10 +422,6 @@ type=java.lang.String writeable=false/ -attribute name=debug - description=The debugging detail level for this component - type=int/ - /mbean mbean name=StandardEngine @@ -442,10 +430,6 @@ domain=Catalina group=Engine -attribute name=debug - description=The debugging detail level for this component - type=int/ - attribute name=defaultHost description=Name of the default Host for this Engine type=java.lang.String/ @@ -502,10 +486,6 @@ type=java.lang.String writeable=false/ -attribute name=debug - description=The debugging detail level for this component - type=int/ - /mbean mbean name=StandardHost @@ -522,10 +502,6 @@ description=The auto deploy flag for this Host type=boolean/ -attribute name=debug - description=The debugging detail level for this component - type=int/ - attribute name=deployOnStartup description=The deploy on startup flag for this Host type=boolean/ @@ -625,10 +601,6 @@ type=java.lang.String writeable=false/ -attribute name=debug - description=The debugging detail level for this component - type=int/ - /mbean mbean name=StandardServer @@ -637,10 +609,6 @@ group=Server
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml
billbarker2003/06/10 20:10:01 Modified:catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml Log: Since there is no longer a CertificatesValve, there is no reason to have an MBean for it. Revision ChangesPath 1.4 +0 -21 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mbeans-descriptors.xml4 Jun 2003 16:58:21 - 1.3 +++ mbeans-descriptors.xml11 Jun 2003 03:10:01 - 1.4 @@ -55,27 +55,6 @@ type=java.lang.String/ /mbean - mbean name=CertificatesValve - description=Valve that exposes SSL certificate information - domain=Catalina - group=Valve - type=org.apache.catalina.valves.CertificatesValve - -attribute name=className - description=Fully qualified class name of the managed object - type=java.lang.String - writeable=false/ - -attribute name=containerName - description=Object name of the container - type=javax.management.ObjectName/ - -attribute name=debug - description=The debugging detail level for this component - type=int/ - - /mbean - mbean name=ErrorReportValve description=Implementation of a Valve that outputs HTML error pages domain=Catalina - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml ExtendedAccessLogValve.java AccessLogValve.java
funkman 2003/06/04 09:58:21
Modified:catalina/src/share/org/apache/catalina/valves
mbeans-descriptors.xml ExtendedAccessLogValve.java
AccessLogValve.java
Log:
Fix bz - 20380 AccessLogValve incorrectly calculates timezone
Enc bz - 16374 Date in file name configurable
Enc bz - 16400 Allow logging to be conditional
Revision ChangesPath
1.3 +13 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/mbeans-descriptors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mbeans-descriptors.xml1 Jun 2003 20:57:00 - 1.2
+++ mbeans-descriptors.xml4 Jun 2003 16:58:21 - 1.3
@@ -38,13 +38,21 @@
type=boolean/
attribute name=rotatable
- description=Rotate log
+ description=Flag to indicate automatic log rotation.
is=true
type=boolean/
attribute name=suffix
description=The suffix that is added to log file filenames
type=java.lang.String/
+
+attribute name=condition
+ description=The value to look for conditional logging.
+ type=java.lang.String/
+
+attribute name=fileDateFormat
+ description=The format for the date date based log rotation.
+ type=java.lang.String/
/mbean
mbean name=CertificatesValve
@@ -158,6 +166,10 @@
attribute name=suffix
description=The suffix that is added to log file filenames
+ type=java.lang.String/
+
+attribute name=fileDateFormat
+ description=The format for the date date based log rotation.
type=java.lang.String/
operation name=rotate
1.3 +28 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
Index: ExtendedAccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtendedAccessLogValve.java 3 Jun 2003 23:37:05 - 1.2
+++ ExtendedAccessLogValve.java 4 Jun 2003 16:58:21 - 1.3
@@ -359,6 +359,10 @@
private boolean checkExists = false;
+/**
+ * Date format to place in log file name. Use at your own risk!
+ */
+private String fileDateFormat = null;
// - Properties
@@ -535,6 +539,23 @@
}
+
+/**
+ * Return the date format date based log rotation.
+ */
+public String getFileDateFormat() {
+return fileDateFormat;
+}
+
+
+/**
+ * Set the date format date based log rotation.
+ */
+public void setFileDateFormat(String fileDateFormat) {
+this.fileDateFormat = fileDateFormat;
+}
+
+
// - Public Methods
@@ -1072,7 +1093,9 @@
timeFormatter = new SimpleDateFormat(HH:mm:ss);
timeFormatter.setTimeZone(tz);
currentDate = new Date(System.currentTimeMillis());
-fileDateFormatter = new SimpleDateFormat(-MM-dd);
+if (fileDateFormat==null || fileDateFormat.length()==0)
+fileDateFormat = -MM-dd;
+fileDateFormatter = new SimpleDateFormat(fileDateFormat);
dateStamp = fileDateFormatter.format(currentDate);
timeTakenFormatter = new DecimalFormat(0.000);
1.4 +117 -21
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
Index: AccessLogValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AccessLogValve.java 11 Jan 2003 05:12:48 - 1.3
+++ AccessLogValve.java 4 Jun 2003 16:58:21 - 1.4
@@ -67,6 +67,7 @@
import java.io.PrintWriter;
import java.net.InetAddress;
import java.text.SimpleDateFormat;
+import java.text.DecimalFormat;
import java.util.Date;
import java.util.TimeZone;
import javax.servlet.ServletException;
@@ -113,18 +114,19 @@
* an empty string
* lib%r/b - First line of the request
* lib%s/b - HTTP status code
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml
costin 2003/03/16 22:45:33 Added: catalina/src/share/org/apache/catalina/core mbeans-descriptors.xml catalina/src/share/org/apache/catalina/valves mbeans-descriptors.xml Log: Moved from mbeans. Modeler can pick them up automatically ( using the package name of the component ). I did a bit of reindentation - my emacs is not very friendly to the original style and I don't know how to set it to indent on the = :-) Revision ChangesPath 1.1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml Index: mbeans-descriptors.xml === ?xml version=1.0? mbeans-descriptors mbean name=DefaultContext description=Used to store the default configuration a Host will use when creating a Context domain=Catalina group=Default-Context type=org.apache.catalina.core.StandardDefaultContext attribute name=cookies description=Should we attempt to use cookies for session id communication? type=boolean/ attribute name=crossContext description=Should we allow the ServletContext.getContext() method to access the context of other web applications in this server? type=boolean/ attribute name=reloadable description=The reloadable flag for this web application type=boolean/ attribute name=swallowOutput description=Flag to set to cause the system.out and system.err to be redirected to the logger when executing a servlet type=boolean/ attribute name=useNaming description=Create JNDI naming context? is=true type=boolean/ attribute name=resourceNames description=Object names for the resources is=true type=[Ljava.lang.String;/ operation name=addEnvironment description=Add an environment entry for this web application impact=ACTION returnType=void parameter name=envName description=New environment entry name type=java.lang.String/ /operation operation name=addResource description=Add a resource reference for this web application impact=ACTION returnType=void parameter name=resourceName description=New resource reference name type=java.lang.String/ /operation operation name=removeEnvironment description=Remove any environment entry with the specified name impact=ACTION returnType=void parameter name=envName description=Name of the environment entry to remove type=java.lang.String/ /operation operation name=removeResource description=Remove any resource reference with the specified name impact=ACTION returnType=void parameter name=resourceName description=Name of the resource reference to remove type=java.lang.String/ /operation /mbean mbean name=NamingContextListener description=Helper class used to initialize and populate the JNDI context associated with each context and server domain=Catalina group=Listener type=org.apache.catalina.core.NamingContextListener attribute name=className description=Fully qualified class name of the managed object type=java.lang.String writeable=false/ attribute name=debug description=The debugging detail level for this component type=int/ /mbean mbean name=StandardContext description=Standard Context Component domain=Catalina group=Context type=org.apache.catalina.core.StandardContext attribute name=cookies description=Should we attempt to use cookies for session id communication? type=boolean/ attribute name=crossContext description=Should we allow the ServletContext.getContext() method to access the context of other web applications in this server? type=boolean/ attribute name=defaultWebXml description=Location of the default web.xml resource or file type=java.lang.String/ attribute name=privileged description=Access to tomcat internals
