From: markt Date: Sun, 22 Oct 2006 23:05:45 +0000 (+0000) Subject: Port fix for 37070 to TC6 along with the changes to remove references to the DefaultC... X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=665175c282bdbc87387728d8281ca476f842a1ba;p=tomcat7.0 Port fix for 37070 to TC6 along with the changes to remove references to the DefaultContext. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@466891 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/webapps/docs/funcspecs/mbean-names.xml b/webapps/docs/funcspecs/mbean-names.xml index ac47b0945..f702dab85 100644 --- a/webapps/docs/funcspecs/mbean-names.xml +++ b/webapps/docs/funcspecs/mbean-names.xml @@ -10,7 +10,7 @@ Craig McClanahan Amy Roh Tomcat MBean Names - $Id: mbean-names.xml 303281 2004-09-27 16:00:31Z yoavs $ + $Id: mbean-names.xml 466611 2006-10-22 00:44:42Z markt $ @@ -139,79 +139,6 @@ corresponding values:

- Server / Service / Engine / DefaultContext - 0..1 - (none) - type=${DEFAULT-CONTEXT}, service=${service.name} - - - - - Server / Service / Engine / Host 1..n name @@ -284,93 +211,30 @@ corresponding values:

- Server / Service / Engine / Host / Context / WrapperLifecycle + Server / Service / Engine / Host / Context / Wrapper 0..n (none) - type=${WRAPPER-LIFECYCLE}, sequence=${###}, path=${context.path}, - host=${host.name}, service=${service.name} + j2eeType=Servlet,name=${name}, + WebModule=//${host.name}/${context.name}, + J2EEApplication=${context.J2EEApplication}, + J2EEServer=${context.J2EEServer} - Server / Service / Engine / Host / Context / WrapperListener + Server / Service / Engine / Host / Context / WrapperLifecycle 0..n (none) - type=${WRAPPER-LISTENER}, sequence=${###}, path=${context.path}, + type=${WRAPPER-LIFECYCLE}, sequence=${###}, path=${context.path}, host=${host.name}, service=${service.name} - Server / Service / Engine / Host / DefaultContext - 0..1 - (none) - type=DefaultContext, host=${host.name}, - service=${service.name} - - - Server / Service / Engine / Host / Listener @@ -506,13 +370,6 @@ web application for Tomcat):

- DefaultContext - DEFAULT-CONTEXT - org.apache.catalina.DefaultContext - org.apache.catalina.core.StandardDefaultContext - - - DigestAuthenticator VALVE org.apache.catalina.Valve @@ -758,6 +615,13 @@ web application for Tomcat):

+ StandardWrapper + WRAPPER + org.apache.catalina.Wrapper + org.apache.catalina.core.StandardWrapper + + + StandardWrapperValve VALVE org.apache.catalina.Valve @@ -823,7 +687,7 @@ to the specified MBean names or groups as follows:

Servlet ${WRAPPER} - FIXME - Not yet identified as an MBean +