cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardWrapper.java mbeans-descriptors.xml

2004-10-26 Thread luehe 
luehe   2004/10/26 14:55:43

  Modified:catalina/src/share/org/apache/catalina/core
StandardWrapper.java mbeans-descriptors.xml
  Log:
  Removed ServiceTime property that I had added previously.
  JSR 77 defines ServiceTime to be of type TimeStatistic, which is a
  combination of requestCount, processingTime, minTime, and maxTime, all
  of which are already exposed.
  
  Revision  ChangesPath
  1.53  +1 -14 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- StandardWrapper.java  21 Oct 2004 19:03:46 -  1.52
  +++ StandardWrapper.java  26 Oct 2004 21:55:43 -  1.53
  @@ -1360,19 +1360,6 @@
   swValve.setProcessingTime(processingTime);
   }
   
  -/**
  - * Returns the execution time of the servlet's service method.
  - *
  - * This method is identical in functionality to getProcessingTime(),
  - * except that it exposes the execution time of the servlet's service
  - * method under the JSR 77 compliant property name.
  - *
  - * @return Execution time of the servlet's service method
  - */
  -public long getServiceTime() {
  -return swValve.getProcessingTime();
  -}
  -
   public long getMaxTime() {
   return swValve.getMaxTime();
   }
  
  
  
  1.39  +1 -6  
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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mbeans-descriptors.xml21 Oct 2004 19:03:46 -  1.38
  +++ mbeans-descriptors.xml26 Oct 2004 21:55:43 -  1.39
  @@ -581,12 +581,7 @@
  type=boolean/
   
   attribute name=processingTime
  -   description=Execution time of the servlet's service method
  -   type=long
  -   writeable=false /
  -
  -attribute name=serviceTime
  -   description=Execution time of the servlet's service method
  +   description=Total execution time of the servlet's service method
  type=long
  writeable=false /
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardWrapper.java mbeans-descriptors.xml

2004-10-21 Thread luehe 
luehe   2004/10/21 12:03:46

  Modified:catalina/src/share/org/apache/catalina/core
StandardWrapper.java mbeans-descriptors.xml
  Log:
  Expose execution time of the servlet's service method under JSR 77 compliant name 
(ServiceTime)
  
  Revision  ChangesPath
  1.52  +14 -1 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- StandardWrapper.java  7 Oct 2004 18:09:10 -   1.51
  +++ StandardWrapper.java  21 Oct 2004 19:03:46 -  1.52
  @@ -1360,6 +1360,19 @@
   swValve.setProcessingTime(processingTime);
   }
   
  +/**
  + * Returns the execution time of the servlet's service method.
  + *
  + * This method is identical in functionality to getProcessingTime(),
  + * except that it exposes the execution time of the servlet's service
  + * method under the JSR 77 compliant property name.
  + *
  + * @return Execution time of the servlet's service method
  + */
  +public long getServiceTime() {
  +return swValve.getProcessingTime();
  +}
  +
   public long getMaxTime() {
   return swValve.getMaxTime();
   }
  
  
  
  1.38  +6 -1  
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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- mbeans-descriptors.xml5 Oct 2004 17:12:50 -   1.37
  +++ mbeans-descriptors.xml21 Oct 2004 19:03:46 -  1.38
  @@ -581,7 +581,12 @@
  type=boolean/
   
   attribute name=processingTime
  -   description=Cumulative processing time
  +   description=Execution time of the servlet's service method
  +   type=long
  +   writeable=false /
  +
  +attribute name=serviceTime
  +   description=Execution time of the servlet's service method
  type=long
  writeable=false /
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]