tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1055193 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/mbeans-descriptors.xml webapps/docs/changelog.xml
Date Tue, 04 Jan 2011 21:50:30 GMT
Author: markt
Date: Tue Jan  4 21:50:30 2011
New Revision: 1055193

URL: http://svn.apache.org/viewvc?rev=1055193&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
Expose available property of StandardWrapper via JMX

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1055193&r1=1055192&r2=1055193&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan  4 21:50:30 2011
@@ -309,12 +309,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: slaurent, kkolinko, kfujino
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43960
-  Expose available property of StandardWrapper via JMX
-  http://people.apache.org/~markt/patches/2010-12-13-bug43960-tc6.patch
-  +1: markt, kkolinko, kfujino
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50460
   Avoid leak caused by using a cached exception instance
   http://svn.apache.org/viewvc?rev=1044987&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1055193&r1=1055192&r2=1055193&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Tue Jan  4 21:50:30
2011
@@ -721,6 +721,10 @@
          group="Wrapper"
          type="org.apache.catalina.core.StandardWrapper">
                
+    <attribute name="available"
+               description="The date and time at which this servlet will become available
(in milliseconds since the epoch), or zero if the servlet is available. If this value equals
Long.MAX_VALUE, the unavailability of this servlet is considered permanent."
+               type="long"/>  
+
     <attribute name="engineName"
                description="Fully qualified class name of the managed object"
                type="java.lang.String"

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1055193&r1=1055192&r2=1055193&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan  4 21:50:30 2011
@@ -45,6 +45,10 @@
   <subsection name="General">
     <changelog>
       <fix>
+        <bug>43960</bug>: Expose available property of StandardWrapper via JMX.
+        (markt)
+      </fix>
+      <fix>
         <bug>49674</bug>: Update to Commons Daemon 1.0.4. (mturk)
       </fix>
       <update>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message