cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java MemoryUserDatabaseMBean.java NamingResourcesMBean.java RoleMBean.java ServerLifecycleListener.java StandardContextMBean.java StandardEngineMBean.java StandardHostMBean.java StandardServerMBean.java StandardServiceMBean.java UserMBean.java
markt 2004/08/26 14:36:09 Modified:catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java MemoryUserDatabaseMBean.java NamingResourcesMBean.java RoleMBean.java ServerLifecycleListener.java StandardContextMBean.java StandardEngineMBean.java StandardHostMBean.java StandardServerMBean.java StandardServiceMBean.java UserMBean.java Log: Update TC4 branch to Apache License 2.0. Revision ChangesPath 1.50 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java Index: MBeanUtils.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- MBeanUtils.java 18 Feb 2003 23:40:27 - 1.49 +++ MBeanUtils.java 26 Aug 2004 21:36:08 - 1.50 @@ -1,64 +1,17 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * - * - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in - *the documentation and/or other materials provided with the - *distribution. - * - * 3. The end-user documentation included with the redistribution, if - *any, must include the following acknowlegement: - * This product includes software developed by the - *Apache Software Foundation (http://www.apache.org/). - *Alternately, this acknowlegement may appear in the software itself, - *if and wherever such third-party acknowlegements normally appear. - * - * 4. The names The Jakarta Project, Tomcat, and Apache Software - *Foundation must not be used to endorse or promote products derived - *from this software without prior written permission. For written - *permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called Apache - *nor may Apache appear in their names without prior written - *permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * http://www.apache.org/. - * - * [Additional notices, if required by prior licensing conditions] - * + * Copyright 1999,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.catalina.mbeans; 1.5 +14 -61 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java Index: MemoryUserDatabaseMBean.java === RCS file:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
costin 2003/02/18 15:37:01 Modified:catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java Log: Typo. Revision ChangesPath 1.48 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java Index: MBeanUtils.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- MBeanUtils.java 12 Feb 2003 22:06:33 - 1.47 +++ MBeanUtils.java 18 Feb 2003 23:37:00 - 1.48 @@ -977,7 +977,7 @@ String webMod=// + ((hostName==null)? DEFAULT :hostName ) + path; name = new ObjectName(domain + :j2eeType=Servlet,name= + sname + ,WebModule= + -webMod + ,J2EEAppilication=none,J2EEServer=none); +webMod + ,j2eeApplication=none,J2EEServer=none); return (name); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
costin 2003/02/18 15:40:28 Modified:catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java Log: Typo - again... Revision ChangesPath 1.49 +6 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java Index: MBeanUtils.java === RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- MBeanUtils.java 18 Feb 2003 23:37:00 - 1.48 +++ MBeanUtils.java 18 Feb 2003 23:40:27 - 1.49 @@ -945,7 +945,7 @@ String localName= // + ((host.getName()==null)? DEFAULT : host.getName()) + path; name = new ObjectName(domain + :j2eeType=WebModule,name= + - localName + ,j2eeApplication=none,j2eeServer=none); + localName + ,J2EEApplication=none,J2EEServer=none); return (name); } @@ -977,7 +977,7 @@ String webMod=// + ((hostName==null)? DEFAULT :hostName ) + path; name = new ObjectName(domain + :j2eeType=Servlet,name= + sname + ,WebModule= + -webMod + ,j2eeApplication=none,J2EEServer=none); +webMod + ,J2EEApplication=none,J2EEServer=none); return (name); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
costin 2003/02/12 14:06:33
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Add registration for servlet wrappers and support for jsr77-like names - all the
code is optional and conditional on a flag. If the flag is not set - nothing
will happen ( or change )
Revision ChangesPath
1.47 +114 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- MBeanUtils.java 22 Nov 2002 04:44:10 - 1.46
+++ MBeanUtils.java 12 Feb 2003 22:06:33 - 1.47
@@ -77,8 +77,8 @@
import javax.management.OperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBean;
+
import org.apache.catalina.Connector;
-import org.apache.catalina.Contained;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
@@ -98,6 +98,8 @@
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
import org.apache.catalina.Valve;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.Contained;
import org.apache.catalina.connector.http.HttpConnector;
import org.apache.catalina.core.StandardService;
import org.apache.catalina.deploy.ContextEnvironment;
@@ -166,6 +168,7 @@
*/
private static MBeanServer mserver = createServer();
+static boolean jsr77Names=false;
// - Static Methods
@@ -258,11 +261,33 @@
ModelMBean mbean = managed.createMBean(context);
ObjectName oname = createObjectName(domain, context);
mserver.registerMBean(mbean, oname);
+if( jsr77Names ) {
+oname = createObjectName77(domain, context);
+mserver.registerMBean(mbean, oname);
+}
+return (mbean);
+}
+
+public static ModelMBean createMBean(Wrapper wrapper)
+throws Exception {
+
+String mname = createManagedName(wrapper);
+ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
+}
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(wrapper);
+ObjectName oname = createObjectName(domain, wrapper);
+mserver.registerMBean(mbean, oname);
return (mbean);
}
-
+
/**
* Create, register, and return an MBean for this
* codeContextEnvironment/code object.
@@ -563,6 +588,9 @@
domain = mserver.getDefaultDomain();
ModelMBean mbean = managed.createMBean(factory);
ObjectName oname = createObjectName(domain, factory);
+if( mserver.isRegistered(oname)) {
+mserver.unregisterMBean(oname);
+}
mserver.registerMBean(mbean, oname);
return (mbean);
@@ -904,7 +932,57 @@
}
-
+public static ObjectName createObjectName77(String domain,
+Context context)
+throws MalformedObjectNameException {
+
+ObjectName name = null;
+Host host = (Host)context.getParent();
+Service service = ((Engine)host.getParent()).getService();
+String path = context.getPath();
+if (path.length() 1)
+path = /;
+String localName= // +
+((host.getName()==null)? DEFAULT : host.getName()) + path;
+name = new ObjectName(domain + :j2eeType=WebModule,name= +
+ localName + ,j2eeApplication=none,j2eeServer=none);
+return (name);
+}
+
+/**
+ * Create an codeObjectName/code for this
+ * codeContext/code object.
+ *
+ * @param domain Domain in which this name is to be created
+ * @param context The Context to be named
+ *
+ * @exception MalformedObjectNameException if a name cannot be created
+ */
+public static ObjectName createObjectName(String domain,
+ Wrapper wrapper)
+throws MalformedObjectNameException {
+
+ObjectName name = null;
+Context context=(Context)wrapper.getParent();
+Host host = (Host)context.getParent();
+Service service
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
billbarker2002/11/21 20:44:10
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Relaxing the restrictions on creating Valve MBeans.
There is no functional change for Catalina Valves. For custom Valves, they only
need to implement 'Contained', not extend ValveBase. At the very least, throwing a
checked-exception is much better then throwing the non-checked ClassCastException.
Revision ChangesPath
1.46 +13 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- MBeanUtils.java 8 Nov 2002 11:49:29 - 1.45
+++ MBeanUtils.java 22 Nov 2002 04:44:10 - 1.46
@@ -105,7 +105,6 @@
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.ResourceParams;
-import org.apache.catalina.valves.ValveBase;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
@@ -1571,7 +1570,15 @@
throws MalformedObjectNameException {
ObjectName name = null;
-Container container = ((ValveBase)valve).getContainer();
+Container container = null;
+if( valve instanceof Contained ) {
+container = ((Contained)valve).getContainer();
+}
+if( container == null ) {
+throw new MalformedObjectNameException(
+ Cannot create mbean for non-contained valve +
+ valve);
+}
if (container instanceof Engine) {
Service service = ((Engine)container).getService();
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
remm2002/11/08 03:49:29
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
- Port fix.
- Fix resource link edition and creation.
Revision ChangesPath
1.45 +5 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- MBeanUtils.java 19 Sep 2002 22:55:48 - 1.44
+++ MBeanUtils.java 8 Nov 2002 11:49:29 - 1.45
-1038,7 +1038,7
resourceLink.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + :type=ResourceLink +
-,resourcetype=Global,class= + resourceLink.getType() +
+,resourcetype=Global +
,name= + encodedResourceLinkName);
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
-1051,7 +1051,6
,resourcetype=Context,path= + path +
,host= + host.getName() +
,service= + service.getName() +
-,class= + resourceLink.getType() +
,name= + encodedResourceLinkName);
} else if (container instanceof DefaultContext) {
container = ((DefaultContext)container).getParent();
-1061,14 +1060,12
name = new ObjectName(domain + :type=ResourceLink +
,resourcetype=HostDefaultContext,host= + host.getName() +
,service= + service.getName() +
-,class= + resourceLink.getType() +
,name= + encodedResourceLinkName);
} else if (container instanceof Engine) {
Engine engine = (Engine) container;
Service service = engine.getService();
name = new ObjectName(domain + :type=ResourceLink +
,resourcetype=ServiceDefaultContext,service= +
service.getName() +
-,class= + resourceLink.getType() +
,name= + encodedResourceLinkName);
}
}
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java
amyroh 2002/06/14 06:29:49
Modified:catalina/src/conf tomcat-users.xml
catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Add global and context JNDI support.
Resource Link and delete resources still need fix.
Revision ChangesPath
1.4 +1 -1 jakarta-tomcat-4.0/catalina/src/conf/tomcat-users.xml
Index: tomcat-users.xml
===
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/tomcat-users.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat-users.xml 23 Dec 2000 20:12:55 - 1.3
+++ tomcat-users.xml 14 Jun 2002 13:29:48 - 1.4
@@ -4,7 +4,7 @@
you must define such a user - the username and password are arbitrary.
--
tomcat-users
- user name=tomcat password=tomcat roles=tomcat /
+ user name=tomcat password=tomcat roles=tomcat,admin /
user name=role1 password=tomcat roles=role1 /
user name=both password=tomcat roles=tomcat,role1 /
/tomcat-users
1.42 +116 -50
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- MBeanUtils.java 13 Jun 2002 18:14:17 - 1.41
+++ MBeanUtils.java 14 Jun 2002 13:29:48 - 1.42
@@ -924,20 +924,36 @@
Object container =
environment.getNamingResources().getContainer();
if (container instanceof Server) {
-name = new ObjectName(domain + :type=Environment,name= +
- environment.getName());
+name = new ObjectName(domain + :type=Environment +
+,resourcetype=Global,name= + environment.getName());
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() 1)
path = /;
-name = new ObjectName(domain + :type=Environment,path= +
- path + ,name= +
- environment.getName());
+Host host = (Host) ((Context)container).getParent();
+Engine engine = (Engine) host.getParent();
+Service service = engine.getService();
+name = new ObjectName(domain + :type=Environment +
+,resourcetype=Context,path= + path +
+,host= + host.getName() +
+,service= + service.getName() +
+,name= + environment.getName());
} else if (container instanceof DefaultContext) {
-String defaultContextName = ((DefaultContext)container).getName();
-name = new ObjectName(domain + :type=Environment,defaultContext= +
- defaultContextName + ,name= +
- environment.getName());
+container = ((DefaultContext)container).getParent();
+if (container instanceof Host) {
+Host host = (Host) container;
+Service service = ((Engine)host.getParent()).getService();
+name = new ObjectName(domain + :type=Environment +
+,resourcetype=DefaultContext,host= + host.getName() +
+,service= + service.getName() +
+,name= + environment.getName());
+} else if (container instanceof Engine) {
+Engine engine = (Engine) container;
+Service service = engine.getService();
+name = new ObjectName(domain + :type=Environment +
+,resourcetype=DefaultContext,service= +
+service.getName() + ,name= + environment.getName());
+}
}
return (name);
@@ -963,23 +979,40 @@
Object container =
resource.getNamingResources().getContainer();
if (container instanceof Server) {
-name = new ObjectName(domain + :type=Resource,class= +
- resource.getType() + ,name= +
- encodedResourceName);
-} else if (container instanceof Context) {
+name = new ObjectName(domain + :type=Resource +
+,resourcetype=Global,class= + resource.getType() +
+,name= + encodedResourceName);
+} else if (container instanceof Context) {
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 2002/06/13 11:14:17
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Changed the MBean names for resources for easier query.
Revision ChangesPath
1.41 +27 -27
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- MBeanUtils.java 12 Jun 2002 07:39:23 - 1.40
+++ MBeanUtils.java 13 Jun 2002 18:14:17 - 1.41
@@ -930,14 +930,14 @@
String path = ((Context)container).getPath();
if (path.length() 1)
path = /;
-name = new ObjectName(domain + :type=Environment,name= +
- environment.getName() + ,path= +
- path);
+name = new ObjectName(domain + :type=Environment,path= +
+ path + ,name= +
+ environment.getName());
} else if (container instanceof DefaultContext) {
String defaultContextName = ((DefaultContext)container).getName();
-name = new ObjectName(domain + :type=Environment,name= +
- environment.getName() + ,defaultContext= +
- defaultContextName);
+name = new ObjectName(domain + :type=Environment,defaultContext= +
+ defaultContextName + ,name= +
+ environment.getName());
}
return (name);
@@ -964,22 +964,22 @@
resource.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + :type=Resource,class= +
- resource.getType()+,name= +
+ resource.getType() + ,name= +
encodedResourceName);
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() 1)
path = /;
-name = new ObjectName(domain + :type=Resource,class= +
- resource.getType()+,name= +
- encodedResourceName + ,path= +
- path);
+name = new ObjectName(domain + :type=Resource,path= +
+ path + ,class= +
+ resource.getType() + ,name= +
+ encodedResourceName);
} else if (container instanceof DefaultContext) {
String defaultContextName = ((DefaultContext)container).getName();
-name = new ObjectName(domain + :type=Resource,class= +
- resource.getType()+,name= +
- encodedResourceName + ,defaultContext= +
- defaultContextName);
+name = new ObjectName(domain + :type=Resource,defaultContext= +
+ defaultContextName + ,class= +
+ resource.getType() + ,name= +
+ encodedResourceName);
}
return (name);
@@ -1006,22 +1006,22 @@
resourceLink.getNamingResources().getContainer();
if (container instanceof Server) {
name = new ObjectName(domain + :type=ResourceLink,class= +
- resourceLink.getType()+,name= +
+ resourceLink.getType() + ,name= +
encodedResourceLinkName);
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() 1)
path = /;
-name = new ObjectName(domain + :type=ResourceLink,class= +
- resourceLink.getType()+,name= +
- encodedResourceLinkName + ,path= +
- path);
+name = new ObjectName(domain + :type=ResourceLink,path= +
+ path + ,class= +
+ resourceLink.getType() + ,name= +
+ encodedResourceLinkName);
} else if (container instanceof DefaultContext) {
String defaultContextName = ((DefaultContext)container).getName();
-name = new ObjectName(domain + :type=ResourceLink,class= +
+name = new ObjectName(domain +
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java NamingResourcesMBean.java ServerLifecycleListener.java mbeans-descriptors.xml
amyroh 2002/06/12 00:39:24
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java NamingResourcesMBean.java
ServerLifecycleListener.java mbeans-descriptors.xml
Log:
Add JNDI resources support for Context.
Revision ChangesPath
1.40 +84 -14
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- MBeanUtils.java 9 Jun 2002 00:23:27 - 1.39
+++ MBeanUtils.java 12 Jun 2002 07:39:23 - 1.40
@@ -921,8 +921,25 @@
throws MalformedObjectNameException {
ObjectName name = null;
-name = new ObjectName(domain + :type=Environment,name= +
+Object container =
+environment.getNamingResources().getContainer();
+if (container instanceof Server) {
+name = new ObjectName(domain + :type=Environment,name= +
environment.getName());
+} else if (container instanceof Context) {
+String path = ((Context)container).getPath();
+if (path.length() 1)
+path = /;
+name = new ObjectName(domain + :type=Environment,name= +
+ environment.getName() + ,path= +
+ path);
+} else if (container instanceof DefaultContext) {
+String defaultContextName = ((DefaultContext)container).getName();
+name = new ObjectName(domain + :type=Environment,name= +
+ environment.getName() + ,defaultContext= +
+ defaultContextName);
+}
+
return (name);
}
@@ -943,9 +960,28 @@
ObjectName name = null;
String encodedResourceName = encodeStr(resource.getName());
-name = new ObjectName(domain + :type=Resource,class= +
+Object container =
+resource.getNamingResources().getContainer();
+if (container instanceof Server) {
+name = new ObjectName(domain + :type=Resource,class= +
resource.getType()+,name= +
encodedResourceName);
+} else if (container instanceof Context) {
+String path = ((Context)container).getPath();
+if (path.length() 1)
+path = /;
+name = new ObjectName(domain + :type=Resource,class= +
+ resource.getType()+,name= +
+ encodedResourceName + ,path= +
+ path);
+} else if (container instanceof DefaultContext) {
+String defaultContextName = ((DefaultContext)container).getName();
+name = new ObjectName(domain + :type=Resource,class= +
+ resource.getType()+,name= +
+ encodedResourceName + ,defaultContext= +
+ defaultContextName);
+}
+
return (name);
}
@@ -966,9 +1002,28 @@
ObjectName name = null;
String encodedResourceLinkName = encodeStr(resourceLink.getName());
-name = new ObjectName(domain + :type=ResourceLink,class= +
+Object container =
+resourceLink.getNamingResources().getContainer();
+if (container instanceof Server) {
+name = new ObjectName(domain + :type=ResourceLink,class= +
resourceLink.getType()+,name= +
encodedResourceLinkName);
+} else if (container instanceof Context) {
+String path = ((Context)container).getPath();
+if (path.length() 1)
+path = /;
+name = new ObjectName(domain + :type=ResourceLink,class= +
+ resourceLink.getType()+,name= +
+ encodedResourceLinkName + ,path= +
+ path);
+} else if (container instanceof DefaultContext) {
+String defaultContextName = ((DefaultContext)container).getName();
+name = new ObjectName(domain + :type=ResourceLink,class= +
+ resourceLink.getType()+,name= +
+ encodedResourceLinkName + ,defaultContext= +
+ defaultContextName);
+}
+
return (name);
}
@@ -1210,16 +1265,31 @@
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java
remm2002/06/08 17:23:27
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
- Add the possibility to specify external resources where the MBeans definitions
are. This can be used to declare custom components and keep the admin
webapp happy.
Revision ChangesPath
1.39 +26 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- MBeanUtils.java 6 Jun 2002 22:36:47 - 1.38
+++ MBeanUtils.java 9 Jun 2002 00:23:27 - 1.39
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.38 2002/06/06 22:36:47 amyroh Exp $
- * $Revision: 1.38 $
- * $Date: 2002/06/06 22:36:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.39 2002/06/09 00:23:27 remm Exp $
+ * $Revision: 1.39 $
+ * $Date: 2002/06/09 00:23:27 $
*
*
*
@@ -116,7 +116,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.38 $ $Date: 2002/06/06 22:36:47 $
+ * @version $Revision: 1.39 $ $Date: 2002/06/09 00:23:27 $
*/
public class MBeanUtils {
@@ -1461,6 +1461,28 @@
}
}
return (registry);
+
+}
+
+
+/**
+ * Load an MBean descriptor resource.
+ */
+public synchronized static void loadMBeanDescriptors(String resource) {
+
+try {
+URL url = ServerLifecycleListener.class.getResource(resource);
+if (url != null) {
+InputStream stream = url.openStream();
+Registry.loadRegistry(stream);
+stream.close();
+} else {
+// XXX: i18n
+System.out.println(MBean descriptors not found: + resource);
+}
+} catch (Throwable t) {
+t.printStackTrace(System.out);
+}
}
1.26 +48 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ServerLifecycleListener.java 3 May 2002 23:45:40 - 1.25
+++ ServerLifecycleListener.java 9 Jun 2002 00:23:27 - 1.26
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.25 2002/05/03 23:45:40 amyroh Exp $
- * $Revision: 1.25 $
- * $Date: 2002/05/03 23:45:40 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.26 2002/06/09 00:23:27 remm Exp $
+ * $Revision: 1.26 $
+ * $Date: 2002/06/09 00:23:27 $
*
*
*
@@ -66,10 +66,12 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.io.File;
import java.io.InputStream;
import java.net.URL;
import java.util.Collection;
import java.util.Iterator;
+import java.util.StringTokenizer;
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -111,7 +113,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.25 $ $Date: 2002/05/03 23:45:40 $
+ * @version $Revision: 1.26 $ $Date: 2002/06/09 00:23:27 $
*/
public class ServerLifecycleListener
@@ -135,6 +137,20 @@
}
+/**
+ * Semicolon separated list of paths containing MBean desciptor resources.
+ */
+protected String descriptors = null;
+
+public String getDescriptors() {
+return (this.descriptors);
+}
+
+public void setDescriptors(String descriptors) {
+this.descriptors = descriptors;
+}
+
+
// -- ContainerListener Methods
@@ -180,9 +196,16 @@
Lifecycle lifecycle = event.getLifecycle();
if (Lifecycle.START_EVENT.equals(event.getType())) {
+
if (lifecycle instanceof Server) {
+
+// Loading additional
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java StandardContextMBean.java mbeans-descriptors.xml
amyroh 2002/06/06 15:36:47
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java StandardContextMBean.java
mbeans-descriptors.xml
Log:
Add MBean support for JNDI resource and resource link under Context.
Revision ChangesPath
1.38 +82 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- MBeanUtils.java 13 May 2002 18:25:47 - 1.37
+++ MBeanUtils.java 6 Jun 2002 22:36:47 - 1.38
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.37 2002/05/13 18:25:47 amyroh Exp $
- * $Revision: 1.37 $
- * $Date: 2002/05/13 18:25:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.38 2002/06/06 22:36:47 amyroh Exp $
+ * $Revision: 1.38 $
+ * $Date: 2002/06/06 22:36:47 $
*
*
*
@@ -102,6 +102,7 @@
import org.apache.catalina.core.StandardService;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
+import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.ResourceParams;
import org.apache.catalina.valves.ValveBase;
@@ -115,7 +116,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.37 $ $Date: 2002/05/13 18:25:47 $
+ * @version $Revision: 1.38 $ $Date: 2002/06/06 22:36:47 $
*/
public class MBeanUtils {
@@ -317,6 +318,34 @@
return (mbean);
}
+
+
+/**
+ * Create, register, and return an MBean for this
+ * codeContextResourceLink/code object.
+ *
+ * @param resourceLink The ContextResourceLink to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(ContextResourceLink resourceLink)
+throws Exception {
+
+String mname = createManagedName(resourceLink);
+ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
+}
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(resourceLink);
+ObjectName oname = createObjectName(domain, resourceLink);
+mserver.registerMBean(mbean, oname);
+return (mbean);
+
+}
/**
@@ -901,7 +930,7 @@
/**
* Create an codeObjectName/code for this
- * codeService/code object.
+ * codeContextResource/code object.
*
* @param domain Domain in which this name is to be created
* @param resource The ContextResource to be named
@@ -920,6 +949,29 @@
return (name);
}
+
+
+ /**
+ * Create an codeObjectName/code for this
+ * codeContextResourceLink/code object.
+ *
+ * @param domain Domain in which this name is to be created
+ * @param resourceLink The ContextResourceLink to be named
+ *
+ * @exception MalformedObjectNameException if a name cannot be created
+ */
+public static ObjectName createObjectName(String domain,
+ ContextResourceLink resourceLink)
+throws MalformedObjectNameException {
+
+ObjectName name = null;
+String encodedResourceLinkName = encodeStr(resourceLink.getName());
+name = new ObjectName(domain + :type=ResourceLink,class= +
+ resourceLink.getType()+,name= +
+ encodedResourceLinkName);
+return (name);
+
+}
/**
@@ -1535,6 +1587,31 @@
mserver.unregisterMBean(oname);
}
+
+
+/**
+ * Deregister the MBean for this
+ * codeContextResourceLink/code object.
+ *
+ * @param resourceLink The ContextResourceLink to be managed
+ *
+ * @exception Exception if an MBean cannot be deregistered
+ */
+public static void destroyMBean(ContextResourceLink resourceLink)
+throws Exception {
+
+String mname = createManagedName(resourceLink);
+
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java NamingResourcesMBean.java
amyroh 02/05/13 11:25:47
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java NamingResourcesMBean.java
Log:
Decode encoded resource name before trying to find the right resource.
Revision ChangesPath
1.37 +17 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- MBeanUtils.java 9 May 2002 20:00:38 - 1.36
+++ MBeanUtils.java 13 May 2002 18:25:47 - 1.37
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.36 2002/05/09 20:00:38 amyroh Exp $
- * $Revision: 1.36 $
- * $Date: 2002/05/09 20:00:38 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.37 2002/05/13 18:25:47 amyroh Exp $
+ * $Revision: 1.37 $
+ * $Date: 2002/05/13 18:25:47 $
*
*
*
@@ -115,7 +115,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.36 $ $Date: 2002/05/09 20:00:38 $
+ * @version $Revision: 1.37 $ $Date: 2002/05/13 18:25:47 $
*/
public class MBeanUtils {
@@ -169,6 +169,18 @@
// - Static Methods
+/**
+ * Translates a string into x-www-form-urlencoded format
+ *
+ * @param t string to be encoded
+ * @return encoded string
+ */
+private static final String encodeStr(String t) {
+
+return URLEncoder.encode(t);
+
+}
+
/**
* Create and return the name of the codeManagedBean/code that
@@ -901,7 +913,7 @@
throws MalformedObjectNameException {
ObjectName name = null;
-String encodedResourceName = URLEncoder.encode(resource.getName());
+String encodedResourceName = encodeStr(resource.getName());
name = new ObjectName(domain + :type=Resource,class= +
resource.getType()+,name= +
encodedResourceName);
1.6 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NamingResourcesMBean.java 6 May 2002 19:55:06 - 1.5
+++ NamingResourcesMBean.java 13 May 2002 18:25:47 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
1.5 2002/05/06 19:55:06 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/06 19:55:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
1.6 2002/05/13 18:25:47 amyroh Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/13 18:25:47 $
*
*
*
@@ -63,7 +63,7 @@
package org.apache.catalina.mbeans;
-
+import java.net.URLDecoder;
import java.util.ArrayList;
import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
@@ -83,7 +83,7 @@
* codeorg.apache.catalina.deploy.NamingResources/code component./p
*
* @author Amy Roh
- * @version $Revision: 1.5 $ $Date: 2002/05/06 19:55:06 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/13 18:25:47 $
*/
public class NamingResourcesMBean extends BaseModelMBean {
@@ -265,6 +265,7 @@
*/
public void removeResource(String resourceName) {
+resourceName = URLDecoder.decode(resourceName);
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
return;
@@ -275,7 +276,6 @@
(Invalid resource name ' + resourceName + ');
}
nresources.removeResource(resourceName);
-
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 02/05/09 13:00:38
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Fix to encode url before creating mbean object name.
Revision ChangesPath
1.36 +8 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- MBeanUtils.java 3 May 2002 23:44:15 - 1.35
+++ MBeanUtils.java 9 May 2002 20:00:38 - 1.36
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.35 2002/05/03 23:44:15 amyroh Exp $
- * $Revision: 1.35 $
- * $Date: 2002/05/03 23:44:15 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.36 2002/05/09 20:00:38 amyroh Exp $
+ * $Revision: 1.36 $
+ * $Date: 2002/05/09 20:00:38 $
*
*
*
@@ -66,6 +66,7 @@
import java.io.InputStream;
import java.net.URL;
+import java.net.URLEncoder;
import javax.management.InstanceAlreadyExistsException;
import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
@@ -114,7 +115,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.35 $ $Date: 2002/05/03 23:44:15 $
+ * @version $Revision: 1.36 $ $Date: 2002/05/09 20:00:38 $
*/
public class MBeanUtils {
@@ -900,9 +901,10 @@
throws MalformedObjectNameException {
ObjectName name = null;
+String encodedResourceName = URLEncoder.encode(resource.getName());
name = new ObjectName(domain + :type=Resource,class= +
- resource.getType()+,name= +
- resource.getName());
+ resource.getType()+,name= +
+ encodedResourceName);
return (name);
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 02/05/03 16:44:16
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Add create, destroy, and createObjectName for NamingResources,
ContextEnvironment, and ContextResource MBeans.
Revision ChangesPath
1.35 +231 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- MBeanUtils.java 18 Apr 2002 00:13:07 - 1.34
+++ MBeanUtils.java 3 May 2002 23:44:15 - 1.35
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.34 2002/04/18 00:13:07 amyroh Exp $
- * $Revision: 1.34 $
- * $Date: 2002/04/18 00:13:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.35 2002/05/03 23:44:15 amyroh Exp $
+ * $Revision: 1.35 $
+ * $Date: 2002/05/03 23:44:15 $
*
*
*
@@ -99,6 +99,10 @@
import org.apache.catalina.Valve;
import org.apache.catalina.connector.http.HttpConnector;
import org.apache.catalina.core.StandardService;
+import org.apache.catalina.deploy.ContextEnvironment;
+import org.apache.catalina.deploy.ContextResource;
+import org.apache.catalina.deploy.NamingResources;
+import org.apache.catalina.deploy.ResourceParams;
import org.apache.catalina.valves.ValveBase;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.modeler.ManagedBean;
@@ -110,7 +114,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.34 $ $Date: 2002/04/18 00:13:07 $
+ * @version $Revision: 1.35 $ $Date: 2002/05/03 23:44:15 $
*/
public class MBeanUtils {
@@ -245,9 +249,65 @@
}
+
+/**
+ * Create, register, and return an MBean for this
+ * codeContextEnvironment/code object.
+ *
+ * @param environment The ContextEnvironment to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(ContextEnvironment environment)
+throws Exception {
+
+String mname = createManagedName(environment);
+ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
+}
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(environment);
+ObjectName oname = createObjectName(domain, environment);
+mserver.registerMBean(mbean, oname);
+return (mbean);
+
+}
+
/**
* Create, register, and return an MBean for this
+ * codeContextResource/code object.
+ *
+ * @param resource The ContextResource to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(ContextResource resource)
+throws Exception {
+
+String mname = createManagedName(resource);
+ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
+}
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(resource);
+ObjectName oname = createObjectName(domain, resource);
+mserver.registerMBean(mbean, oname);
+return (mbean);
+
+}
+
+
+/**
+ * Create, register, and return an MBean for this
* codeDefaultContext/code object.
*
* @param context The DefaultContext to be managed
@@ -471,6 +531,34 @@
/**
* Create, register, and return an MBean for this
+ * codeNamingResources/code object.
+ *
+ * @param resource The NamingResources to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(NamingResources resource)
+throws Exception {
+
+String mname = createManagedName(resource);
+ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java
amyroh 02/04/17 17:13:07
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Add container parameter to destroyMBean(valve, container) to find the right
valve mbean after removeValve() is called. Need its previously owning
container info to unregister the correct mbean for a valve.
Revision ChangesPath
1.34 +12 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- MBeanUtils.java 16 Apr 2002 20:27:37 - 1.33
+++ MBeanUtils.java 18 Apr 2002 00:13:07 - 1.34
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.33 2002/04/16 20:27:37 amyroh Exp $
- * $Revision: 1.33 $
- * $Date: 2002/04/16 20:27:37 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.34 2002/04/18 00:13:07 amyroh Exp $
+ * $Revision: 1.34 $
+ * $Date: 2002/04/18 00:13:07 $
*
*
*
@@ -77,6 +77,7 @@
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBean;
import org.apache.catalina.Connector;
+import org.apache.catalina.Contained;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
@@ -109,7 +110,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.33 $ $Date: 2002/04/16 20:27:37 $
+ * @version $Revision: 1.34 $ $Date: 2002/04/18 00:13:07 $
*/
public class MBeanUtils {
@@ -1653,9 +1654,10 @@
*
* @exception Exception if an MBean cannot be deregistered
*/
-public static void destroyMBean(Valve valve)
+public static void destroyMBean(Valve valve, Container container)
throws Exception {
+((Contained)valve).setContainer(container);
String mname = createManagedName(valve);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
@@ -1665,6 +1667,11 @@
if (domain == null)
domain = mserver.getDefaultDomain();
ObjectName oname = createObjectName(domain, valve);
+try {
+((Contained)valve).setContainer(null);
+} catch (Throwable t) {
+;
+}
mserver.unregisterMBean(oname);
}
1.23 +8 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ServerLifecycleListener.java 16 Apr 2002 20:27:37 - 1.22
+++ ServerLifecycleListener.java 18 Apr 2002 00:13:07 - 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.22 2002/04/16 20:27:37 amyroh Exp $
- * $Revision: 1.22 $
- * $Date: 2002/04/16 20:27:37 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.23 2002/04/18 00:13:07 amyroh Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/04/18 00:13:07 $
*
*
*
@@ -107,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.22 $ $Date: 2002/04/16 20:27:37 $
+ * @version $Revision: 1.23 $ $Date: 2002/04/18 00:13:07 $
*/
public class ServerLifecycleListener
@@ -626,7 +626,7 @@
for (int l = 0; l cValves.length; l++) {
if (debug = 4)
log(Destroying MBean for Valve + cValves[l]);
-MBeanUtils.destroyMBean(cValves[l]);
+MBeanUtils.destroyMBean(cValves[l], context);
}
}
@@ -673,7 +673,7 @@
for (int k = 0; k eValves.length; k++) {
if (debug = 3)
log(Destroying MBean for Valve + eValves[k]);
-MBeanUtils.destroyMBean(eValves[k]);
+MBeanUtils.destroyMBean(eValves[k], engine);
}
}
@@ -726,7 +726,7 @@
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java
amyroh 02/04/16 13:27:37
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Service parameter is required to find the right connector mbean to remove for
destroyMBean(connector). Temporarily connects the connector to its owning
service to get the right mbean name and disconnects.
Revision ChangesPath
1.33 +7 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- MBeanUtils.java 9 Apr 2002 23:54:35 - 1.32
+++ MBeanUtils.java 16 Apr 2002 20:27:37 - 1.33
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.32 2002/04/09 23:54:35 amyroh Exp $
- * $Revision: 1.32 $
- * $Date: 2002/04/09 23:54:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.33 2002/04/16 20:27:37 amyroh Exp $
+ * $Revision: 1.33 $
+ * $Date: 2002/04/16 20:27:37 $
*
*
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.32 $ $Date: 2002/04/09 23:54:35 $
+ * @version $Revision: 1.33 $ $Date: 2002/04/16 20:27:37 $
*/
public class MBeanUtils {
@@ -1277,9 +1277,10 @@
*
* @exception Exception if an MBean cannot be deregistered
*/
-public static void destroyMBean(Connector connector)
+public static void destroyMBean(Connector connector, Service service)
throws Exception {
+connector.setService(service);
String mname = createManagedName(connector);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
@@ -1289,6 +1290,7 @@
if (domain == null)
domain = mserver.getDefaultDomain();
ObjectName oname = createObjectName(domain, connector);
+connector.setService(null);
mserver.unregisterMBean(oname);
}
1.22 +8 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ServerLifecycleListener.java 6 Mar 2002 06:49:11 - 1.21
+++ ServerLifecycleListener.java 16 Apr 2002 20:27:37 - 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.21 2002/03/06 06:49:11 craigmcc Exp $
- * $Revision: 1.21 $
- * $Date: 2002/03/06 06:49:11 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.22 2002/04/16 20:27:37 amyroh Exp $
+ * $Revision: 1.22 $
+ * $Date: 2002/04/16 20:27:37 $
*
*
*
@@ -107,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.21 $ $Date: 2002/03/06 06:49:11 $
+ * @version $Revision: 1.22 $ $Date: 2002/04/16 20:27:37 $
*/
public class ServerLifecycleListener
@@ -563,12 +563,12 @@
*
* @exception Exception if an exception is thrown during MBean creation
*/
-protected void destroyMBeans(Connector connector) throws Exception {
+protected void destroyMBeans(Connector connector, Service service) throws
Exception {
// deregister the MBean for the Connector itself
if (debug = 5)
log(Destroying MBean for Connector + connector);
-MBeanUtils.destroyMBean(connector);
+MBeanUtils.destroyMBean(connector, service);
}
@@ -764,7 +764,7 @@
// Deregister the MBeans for the corresponding Connectors
Connector connectors[] = service.findConnectors();
for (int j = 0; j connectors.length; j++) {
-destroyMBeans(connectors[j]);
+destroyMBeans(connectors[j], service);
}
// Deregister the MBeans for the associated Engine
@@ -1091,7 +1091,7 @@
}
if (connector.equals(propertyName)) {
if (oldValue != null) {
-destroyMBeans((Connector) oldValue);
+
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 02/04/03 14:22:57
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Change the MBean nomenclature for Valve.
Revision ChangesPath
1.31 +13 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- MBeanUtils.java 22 Mar 2002 19:27:26 - 1.30
+++ MBeanUtils.java 3 Apr 2002 22:22:57 - 1.31
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.30 2002/03/22 19:27:26 amyroh Exp $
- * $Revision: 1.30 $
- * $Date: 2002/03/22 19:27:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.31 2002/04/03 22:22:57 amyroh Exp $
+ * $Revision: 1.31 $
+ * $Date: 2002/04/03 22:22:57 $
*
*
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.30 $ $Date: 2002/03/22 19:27:26 $
+ * @version $Revision: 1.31 $ $Date: 2002/04/03 22:22:57 $
*/
public class MBeanUtils {
@@ -1183,15 +1183,15 @@
if (container instanceof Engine) {
Service service = ((Engine)container).getService();
-name = new ObjectName(domain + :type=Valve,service= +
- service.getName() + ,sequence= +
- valve.hashCode());
+name = new ObjectName(domain + :type=Valve,sequence= +
+ valve.hashCode() + ,service= +
+ service.getName());
} else if (container instanceof Host) {
Service service = ((Engine)container.getParent()).getService();
-name = new ObjectName(domain + :type=Valve,host= +
+name = new ObjectName(domain + :type=Valve,sequence= +
+ valve.hashCode() + ,host= +
container.getName() + ,service= +
- service.getName() + ,sequence= +
- valve.hashCode());
+ service.getName() );
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() 1) {
@@ -1199,11 +1199,11 @@
}
Host host = (Host) container.getParent();
Service service = ((Engine) host.getParent()).getService();
-name = new ObjectName(domain + :type=Valve,path= +
+name = new ObjectName(domain + :type=Valve,sequence= +
+ valve.hashCode() + ,path= +
path + ,host= +
host.getName() + ,service= +
- service.getName() + ,sequence= +
- valve.hashCode());
+ service.getName());
}
return (name);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java mbeans-descriptors.xml
craigmcc02/03/08 11:01:32
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java mbeans-descriptors.xml
Log:
Add mbean definition for CoyoteConnector, refine properties for Ajp13Connector.
Revision ChangesPath
1.29 +23 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- MBeanUtils.java 8 Mar 2002 00:12:29 - 1.28
+++ MBeanUtils.java 8 Mar 2002 19:01:32 - 1.29
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.28 2002/03/08 00:12:29 craigmcc Exp $
- * $Revision: 1.28 $
- * $Date: 2002/03/08 00:12:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.29 2002/03/08 19:01:32 craigmcc Exp $
+ * $Revision: 1.29 $
+ * $Date: 2002/03/08 19:01:32 $
*
*
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.28 $ $Date: 2002/03/08 00:12:29 $
+ * @version $Revision: 1.29 $ $Date: 2002/03/08 19:01:32 $
*/
public class MBeanUtils {
@@ -126,6 +126,8 @@
private static String exceptions[][] = {
{ org.apache.ajp.tomcat4.Ajp13Connector,
Ajp13Connector },
+{ org.apache.coyote.tomcat4.Ajp13Connector,
+ CoyoteConnector },
{ org.apache.catalina.core.StandardDefaultContext,
DefaultContext },
{ org.apache.catalina.connector.http10.HttpConnector,
@@ -693,6 +695,23 @@
,address= + httpConnector.getAddress());
return (name);
} else if (org.apache.ajp.tomcat4.Ajp13Connector.equals
+ (connector.getClass().getName())) {
+try {
+String address = (String)
+PropertyUtils.getSimpleProperty(connector, address);
+Integer port = (Integer)
+PropertyUtils.getSimpleProperty(connector, port);
+name = new ObjectName(domain + :type=Connector +
+ ,service= +
+ connector.getService().getName() +
+ ,port= + port +
+ ,address= + address);
+return (name);
+} catch (Exception e) {
+throw new MalformedObjectNameException
+(Cannot create object name for + connector);
+}
+} else if (org.apache.coyote.tomcat4.CoyoteConnector.equals
(connector.getClass().getName())) {
try {
String address = (String)
1.36 +109 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mbeans-descriptors.xml8 Mar 2002 06:58:17 - 1.35
+++ mbeans-descriptors.xml8 Mar 2002 19:01:32 - 1.36
@@ -6,7 +6,7 @@
!--
Descriptions of JMX MBeans for Catalina
- $Id: mbeans-descriptors.xml,v 1.35 2002/03/08 06:58:17 amyroh Exp $
+ $Id: mbeans-descriptors.xml,v 1.36 2002/03/08 19:01:32 craigmcc Exp $
--
mbeans-descriptors
@@ -80,14 +80,27 @@
description=Timeout value on the incoming connection
type=int/
+attribute name=curProcessors
+ description=Current number of active processors
+ type=int
+writeable=false/
+
attribute name=debug
description=The debugging detail level for this component
type=int/
+attribute name=secret
+ description=Authentication secret (I guess ... not in Javadocs)
+ type=java.lang.String/
+
attribute name=enableLookups
description=The 'enable DNS lookups' flag for this Connector
type=boolean/
+attribute name=redirectPort
+ description=The redirect port for non-SSL to SSL redirects
+ type=int/
+
attribute name=maxProcessors
description=The maximum number of processors allowed
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java mbeans-descriptors.xml
amyroh 02/02/13 23:47:14
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java mbeans-descriptors.xml
Log:
Add additional Catalina components MBeans.
if (managed == null) {
-//Exception e = new Exception(ManagedBean is not found
with +mname);
-//throw new MBeanException(e);
-return null;
+Exception e = new Exception(ManagedBean is not found
with
+mname);
+throw new MBeanException(e);
As I said before, I think it's a very bad idea to do this, and would
restrict the audience of the admin webapp to the beginner users of
Tomcat
(since you get the choice between using the webapp *or* taking advantage
of
the modularity of Catalina).
At the moment, the other alternative (just skip the components you don't
know how to create an MBean for) is even worse:
* Tomcat starts up, the custom components are created,
but no MBeans for the custom components
* Admin app shows only the known components, thus mystifying the user
* User makes a change, via the admin app, to a standard component
* (When supported) Admin app rewrites server.xml to save the change
* The unrecognized custom entry disappears from server.xml :-(.
There will certainly need to be a way to deal with extensibility (i.e.
user defined Valves, Realms, and so on). But we need to start from the
assumption that the admin app must faithfully reproduce *all* of the
contents of the server.xml file when it supports persistence. Silently
ignoring things you don't know about doesn't help achieve that goal.
I agree that it makes the task more complex, but I think that choice makes
the admin webapp a fancy feature, rather than a truly useful feature.
For example, if you write somthing as simple as a custom realm (or extend
one of the base ones) and add it to your server.xml, the admin webapp won't
work anymore (and you'll get some nasty stack trace printed out on your
command line when you start Catalina).
IMO, the pluggability feature should be developped first, rather than later.
Remy
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java mbeans-descriptors.xml
amyroh 02/02/13 23:47:14
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java mbeans-descriptors.xml
Log:
Add additional Catalina components MBeans.
Revision ChangesPath
1.25 +39 -56
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- MBeanUtils.java 12 Feb 2002 19:05:25 - 1.24
+++ MBeanUtils.java 14 Feb 2002 07:47:14 - 1.25
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.24 2002/02/12 19:05:25 craigmcc Exp $
- * $Revision: 1.24 $
- * $Date: 2002/02/12 19:05:25 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.25 2002/02/14 07:47:14 amyroh Exp $
+ * $Revision: 1.25 $
+ * $Date: 2002/02/14 07:47:14 $
*
*
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.24 $ $Date: 2002/02/12 19:05:25 $
+ * @version $Revision: 1.25 $ $Date: 2002/02/14 07:47:14 $
*/
public class MBeanUtils {
@@ -203,9 +203,8 @@
String mname = createManagedName(connector);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-//Exception e = new Exception(ManagedBean is not found with +mname);
-//throw new MBeanException(e);
-return null;
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -232,9 +231,8 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-//Exception e = new Exception(ManagedBean is not found with +mname);
-//throw new MBeanException(e);
-return null;
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -261,9 +259,8 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-//Exception e = new Exception(ManagedBean is not found with +mname);
-//throw new MBeanException(e);
-return null;
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -290,9 +287,8 @@
String mname = createManagedName(engine);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-//Exception e = new Exception(ManagedBean is not found with +mname);
-//throw new MBeanException(e);
-return null;
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -319,9 +315,8 @@
String mname = createManagedName(group);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-//Exception e = new Exception(ManagedBean is not found with +mname);
-//throw new MBeanException(e);
-return null;
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -348,9 +343,8 @@
String mname = createManagedName(host);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-//Exception e = new Exception(ManagedBean is not found with +mname);
-//throw new MBeanException(e);
-return null;
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -377,9 +371,8 @@
String mname = createManagedName(loader);
ManagedBean managed = registry.findManagedBean(mname);
if (managed ==
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java mbeans-descriptors.xml
amyroh 02/02/13 23:47:14
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java mbeans-descriptors.xml
Log:
Add additional Catalina components MBeans.
if (managed == null) {
-//Exception e = new Exception(ManagedBean is not found
with +mname);
-//throw new MBeanException(e);
-return null;
+Exception e = new Exception(ManagedBean is not found with
+mname);
+throw new MBeanException(e);
As I said before, I think it's a very bad idea to do this, and would
restrict the audience of the admin webapp to the beginner users of Tomcat
(since you get the choice between using the webapp *or* taking advantage of
the modularity of Catalina).
Remy
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
craigmcc02/02/12 10:54:03
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Update MBean Name creation for Ajp13Connector so that the corresponding
MBean can be created.
Revision ChangesPath
1.23 +30 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- MBeanUtils.java 7 Feb 2002 23:59:50 - 1.22
+++ MBeanUtils.java 12 Feb 2002 18:54:02 - 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.22 2002/02/07 23:59:50 amyroh Exp $
- * $Revision: 1.22 $
- * $Date: 2002/02/07 23:59:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.23 2002/02/12 18:54:02 craigmcc Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/02/12 18:54:02 $
*
*
*
@@ -99,6 +99,7 @@
import org.apache.catalina.connector.http.HttpConnector;
import org.apache.catalina.core.StandardService;
import org.apache.catalina.valves.ValveBase;
+import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
@@ -108,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.22 $ $Date: 2002/02/07 23:59:50 $
+ * @version $Revision: 1.23 $ $Date: 2002/02/12 18:54:02 $
*/
public class MBeanUtils {
@@ -123,6 +124,8 @@
* is a class name, and the second element is the managed bean name.
*/
private static String exceptions[][] = {
+{ org.apache.ajp.tomcat4.Ajp13Connector,
+ Ajp13Connector },
{ org.apache.catalina.core.StandardDefaultContext,
DefaultContext },
{ org.apache.catalina.connector.http10.HttpConnector,
@@ -172,14 +175,19 @@
// Deal with exceptions to the standard rule
String className = component.getClass().getName();
for (int i = 0; i exceptions.length; i++) {
-if (className.equals(exceptions[i][0]))
+if (className.equals(exceptions[i][0])) {
+System.out.println(EXC + className + -- +
+ exceptions[i][1]);
return (exceptions[i][1]);
+}
}
// Perform the standard transformation
int period = className.lastIndexOf('.');
if (period = 0)
className = className.substring(period + 1);
+System.out.println(STD + component.getClass().getName() + -- +
+ className);
return (className);
}
@@ -707,6 +715,23 @@
,port= + httpConnector.getPort() +
,address= + httpConnector.getAddress());
return (name);
+} else if (org.apache.ajp.tomcat4.Ajp13Connector.equals
+ (connector.getClass().getName())) {
+try {
+String address = (String)
+PropertyUtils.getSimpleProperty(connector, address);
+Integer port = (Integer)
+PropertyUtils.getSimpleProperty(connector, port);
+name = new ObjectName(domain + :type=Connector +
+ ,service= +
+ connector.getService().getName() +
+ ,port= + port +
+ ,address= + address);
+return (name);
+} catch (Exception e) {
+throw new MalformedObjectNameException
+(Cannot create object name for + connector);
+}
} else {
throw new MalformedObjectNameException
(Cannot create object name for + connector);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
craigmcc02/02/12 11:05:25
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Remove debugging statements.
Revision ChangesPath
1.24 +4 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MBeanUtils.java 12 Feb 2002 18:54:02 - 1.23
+++ MBeanUtils.java 12 Feb 2002 19:05:25 - 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.23 2002/02/12 18:54:02 craigmcc Exp $
- * $Revision: 1.23 $
- * $Date: 2002/02/12 18:54:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.24 2002/02/12 19:05:25 craigmcc Exp $
+ * $Revision: 1.24 $
+ * $Date: 2002/02/12 19:05:25 $
*
*
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.23 $ $Date: 2002/02/12 18:54:02 $
+ * @version $Revision: 1.24 $ $Date: 2002/02/12 19:05:25 $
*/
public class MBeanUtils {
@@ -176,8 +176,6 @@
String className = component.getClass().getName();
for (int i = 0; i exceptions.length; i++) {
if (className.equals(exceptions[i][0])) {
-System.out.println(EXC + className + -- +
- exceptions[i][1]);
return (exceptions[i][1]);
}
}
@@ -186,8 +184,6 @@
int period = className.lastIndexOf('.');
if (period = 0)
className = className.substring(period + 1);
-System.out.println(STD + component.getClass().getName() + -- +
- className);
return (className);
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 02/02/07 12:25:29
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Add DefaultContext mbean name exception and better log.
Revision ChangesPath
1.20 +24 -24
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MBeanUtils.java 7 Feb 2002 19:18:40 - 1.19
+++ MBeanUtils.java 7 Feb 2002 20:25:29 - 1.20
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.19 2002/02/07 19:18:40 amyroh Exp $
- * $Revision: 1.19 $
- * $Date: 2002/02/07 19:18:40 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.20 2002/02/07 20:25:29 amyroh Exp $
+ * $Revision: 1.20 $
+ * $Date: 2002/02/07 20:25:29 $
*
*
*
@@ -108,7 +108,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.19 $ $Date: 2002/02/07 19:18:40 $
+ * @version $Revision: 1.20 $ $Date: 2002/02/07 20:25:29 $
*/
public class MBeanUtils {
@@ -123,6 +123,8 @@
* is a class name, and the second element is the managed bean name.
*/
private static String exceptions[][] = {
+{ org.apache.catalina.core.StandardDefaultContext,
+ DefaultContext },
{ org.apache.catalina.connector.http10.HttpConnector,
Http10Connector },
{ org.apache.catalina.connector.http.HttpConnector,
@@ -197,9 +199,7 @@
String mname = createManagedName(connector);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-// FIX ME
-// shoud we log ManagedBean not found with ManagedName + mname?
-return null;
+throw new Exception(ManagedBean is not found with +mname);
}
String domain = managed.getDomain();
if (domain == null)
@@ -226,7 +226,7 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+throw new Exception(ManagedBean is not found with +mname);
}
String domain = managed.getDomain();
if (domain == null)
@@ -253,7 +253,7 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+throw new Exception(ManagedBean is not found with +mname);
}
String domain = managed.getDomain();
if (domain == null)
@@ -280,7 +280,7 @@
String mname = createManagedName(engine);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+throw new Exception(ManagedBean is not found with +mname);
}
String domain = managed.getDomain();
if (domain == null)
@@ -307,7 +307,7 @@
String mname = createManagedName(group);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+throw new Exception(ManagedBean is not found with +mname);
}
String domain = managed.getDomain();
if (domain == null)
@@ -334,7 +334,7 @@
String mname = createManagedName(host);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+throw new Exception(ManagedBean is not found with +mname);
}
String domain = managed.getDomain();
if (domain == null)
@@ -361,7 +361,7 @@
String mname = createManagedName(loader);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+throw new Exception(ManagedBean is not found with +mname);
}
String domain = managed.getDomain();
if (domain == null)
@@ -387,7 +387,7 @@
String mname = createManagedName(logger);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+throw new Exception(ManagedBean is not found with +mname);
}
String domain = managed.getDomain();
if (domain == null)
@@ -414,7 +414,7
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 02/02/07 13:59:00
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Change to throw MBeanException so that ServerLifecycleListener can catch.
Revision ChangesPath
1.21 +38 -21
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MBeanUtils.java 7 Feb 2002 20:25:29 - 1.20
+++ MBeanUtils.java 7 Feb 2002 21:59:00 - 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.20 2002/02/07 20:25:29 amyroh Exp $
- * $Revision: 1.20 $
- * $Date: 2002/02/07 20:25:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.21 2002/02/07 21:59:00 amyroh Exp $
+ * $Revision: 1.21 $
+ * $Date: 2002/02/07 21:59:00 $
*
*
*
@@ -108,7 +108,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.20 $ $Date: 2002/02/07 20:25:29 $
+ * @version $Revision: 1.21 $ $Date: 2002/02/07 21:59:00 $
*/
public class MBeanUtils {
@@ -199,7 +199,8 @@
String mname = createManagedName(connector);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-throw new Exception(ManagedBean is not found with +mname);
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -226,7 +227,8 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-throw new Exception(ManagedBean is not found with +mname);
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -253,7 +255,8 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-throw new Exception(ManagedBean is not found with +mname);
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -280,7 +283,8 @@
String mname = createManagedName(engine);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-throw new Exception(ManagedBean is not found with +mname);
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -307,7 +311,8 @@
String mname = createManagedName(group);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-throw new Exception(ManagedBean is not found with +mname);
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -334,7 +339,8 @@
String mname = createManagedName(host);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-throw new Exception(ManagedBean is not found with +mname);
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -361,7 +367,8 @@
String mname = createManagedName(loader);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-throw new Exception(ManagedBean is not found with +mname);
+Exception e = new Exception(ManagedBean is not found with +mname);
+throw new MBeanException(e);
}
String domain = managed.getDomain();
if (domain == null)
@@ -387,7 +394,8 @@
String mname = createManagedName(logger);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-throw
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 02/02/07 15:59:50
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Hold off on throwing MBeanException for now since not all Catalina component mbeans
are implemented yet
Revision ChangesPath
1.22 +55 -38
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MBeanUtils.java 7 Feb 2002 21:59:00 - 1.21
+++ MBeanUtils.java 7 Feb 2002 23:59:50 - 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.21 2002/02/07 21:59:00 amyroh Exp $
- * $Revision: 1.21 $
- * $Date: 2002/02/07 21:59:00 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.22 2002/02/07 23:59:50 amyroh Exp $
+ * $Revision: 1.22 $
+ * $Date: 2002/02/07 23:59:50 $
*
*
*
@@ -108,7 +108,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.21 $ $Date: 2002/02/07 21:59:00 $
+ * @version $Revision: 1.22 $ $Date: 2002/02/07 23:59:50 $
*/
public class MBeanUtils {
@@ -199,8 +199,9 @@
String mname = createManagedName(connector);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-Exception e = new Exception(ManagedBean is not found with +mname);
-throw new MBeanException(e);
+//Exception e = new Exception(ManagedBean is not found with +mname);
+//throw new MBeanException(e);
+return null;
}
String domain = managed.getDomain();
if (domain == null)
@@ -227,8 +228,9 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-Exception e = new Exception(ManagedBean is not found with +mname);
-throw new MBeanException(e);
+//Exception e = new Exception(ManagedBean is not found with +mname);
+//throw new MBeanException(e);
+return null;
}
String domain = managed.getDomain();
if (domain == null)
@@ -255,8 +257,9 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-Exception e = new Exception(ManagedBean is not found with +mname);
-throw new MBeanException(e);
+//Exception e = new Exception(ManagedBean is not found with +mname);
+//throw new MBeanException(e);
+return null;
}
String domain = managed.getDomain();
if (domain == null)
@@ -283,8 +286,9 @@
String mname = createManagedName(engine);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-Exception e = new Exception(ManagedBean is not found with +mname);
-throw new MBeanException(e);
+//Exception e = new Exception(ManagedBean is not found with +mname);
+//throw new MBeanException(e);
+return null;
}
String domain = managed.getDomain();
if (domain == null)
@@ -311,8 +315,9 @@
String mname = createManagedName(group);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-Exception e = new Exception(ManagedBean is not found with +mname);
-throw new MBeanException(e);
+//Exception e = new Exception(ManagedBean is not found with +mname);
+//throw new MBeanException(e);
+return null;
}
String domain = managed.getDomain();
if (domain == null)
@@ -339,8 +344,9 @@
String mname = createManagedName(host);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-Exception e = new Exception(ManagedBean is not found with +mname);
-throw new MBeanException(e);
+//Exception e = new Exception(ManagedBean is not found with +mname);
+//throw new MBeanException(e);
+return null;
}
String domain = managed.getDomain();
if (domain == null)
@@ -367,8 +373,9 @@
String mname = createManagedName(loader);
ManagedBean managed =
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java
amyroh 02/02/04 12:28:50
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Add to create MBeanFactory MBean so it's visible to admin application.
Revision ChangesPath
1.18 +52 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MBeanUtils.java 3 Feb 2002 00:56:57 - 1.17
+++ MBeanUtils.java 4 Feb 2002 20:28:49 - 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.17 2002/02/03 00:56:57 craigmcc Exp $
- * $Revision: 1.17 $
- * $Date: 2002/02/03 00:56:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.18 2002/02/04 20:28:49 amyroh Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/02/04 20:28:49 $
*
*
*
@@ -107,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.17 $ $Date: 2002/02/03 00:56:57 $
+ * @version $Revision: 1.18 $ $Date: 2002/02/04 20:28:49 $
*/
public class MBeanUtils {
@@ -425,6 +425,34 @@
}
+
+/**
+ * Create, register, and return an MBean for this
+ * codeMBeanFactory/code object.
+ *
+ * @param factory The MBeanFactory to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(MBeanFactory factory)
+throws Exception {
+
+String mname = createManagedName(factory);
+ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(factory);
+ObjectName oname = createObjectName(domain, factory);
+mserver.registerMBean(mbean, oname);
+return (mbean);
+
+}
+
+
/**
* Create, register, and return an MBean for this
* codeRealm/code object.
@@ -911,6 +939,26 @@
}
+/**
+ * Create an codeObjectName/code for this
+ * codeMBeanFactory/code object.
+ *
+ * @param domain Domain in which this name is to be created
+ * @param factory The MBeanFactory to be named
+ *
+ * @exception MalformedObjectNameException if a name cannot be created
+ */
+public static ObjectName createObjectName(String domain,
+ MBeanFactory factory)
+throws MalformedObjectNameException {
+
+ObjectName name = new ObjectName(domain + :type=MBeanFactory);
+
+return (name);
+
+}
+
+
/**
* Create an codeObjectName/code for this
* codeRealm/code object.
1.19 +23 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ServerLifecycleListener.java 31 Jan 2002 23:02:41 - 1.18
+++ ServerLifecycleListener.java 4 Feb 2002 20:28:49 - 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.18 2002/01/31 23:02:41 amyroh Exp $
- * $Revision: 1.18 $
- * $Date: 2002/01/31 23:02:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.19 2002/02/04 20:28:49 amyroh Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/02/04 20:28:49 $
*
*
*
@@ -105,7 +105,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.18 $ $Date: 2002/01/31 23:02:41 $
+ * @version $Revision: 1.19 $ $Date: 2002/02/04 20:28:49 $
*/
public class ServerLifecycleListener
@@ -237,6 +237,8 @@
try {
+MBeanFactory factory = new MBeanFactory();
+createMBeans(factory);
createMBeans(ServerFactory.getServer());
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 02/01/25 15:15:09
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Add sequence parameter to MBean object names for Valves
so it returns unique names for each Valve Mbean
Revision ChangesPath
1.16 +33 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MBeanUtils.java 24 Jan 2002 19:26:11 - 1.15
+++ MBeanUtils.java 25 Jan 2002 23:15:09 - 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.15 2002/01/24 19:26:11 craigmcc Exp $
- * $Revision: 1.15 $
- * $Date: 2002/01/24 19:26:11 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.16 2002/01/25 23:15:09 amyroh Exp $
+ * $Revision: 1.16 $
+ * $Date: 2002/01/25 23:15:09 $
*
*
*
@@ -106,7 +106,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.15 $ $Date: 2002/01/24 19:26:11 $
+ * @version $Revision: 1.16 $ $Date: 2002/01/25 23:15:09 $
*/
public class MBeanUtils {
@@ -144,6 +144,14 @@
private static MBeanServer mserver = createServer();
+/**
+ * The sequence number for Valve
+ */
+private static int contextValveSequence = 0;
+private static int hostValveSequence = 0;
+private static int engineValveSequence = 0;
+
+
// - Static Methods
@@ -1019,13 +1027,21 @@
if (container instanceof Engine) {
Service service = ((Engine)container).getService();
-name = new ObjectName(domain + :type=Valve,service= +
- service.getName()); //FIX ME - add sequence #
+Integer sequenceInt = new Integer(engineValveSequence);
+String sequenceStr = sequenceInt.toString();
+name = new ObjectName(domain + :type=Valve,sequence= +
+sequenceStr + ,service= +
+service.getName());
+engineValveSequence++;
} else if (container instanceof Host) {
Service service = ((Engine)container.getParent()).getService();
-name = new ObjectName(domain + :type=Valve,host= +
- container.getName() + ,service= +
- service.getName()); //FIX ME - add sequence #
+Integer sequenceInt = new Integer(hostValveSequence);
+String sequenceStr = sequenceInt.toString();
+name = new ObjectName(domain + :type=Valve,sequence= +
+sequenceStr + ,host= +
+container.getName() + ,service= +
+service.getName());
+hostValveSequence++;
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
if (path.length() 1) {
@@ -1033,9 +1049,14 @@
}
Host host = (Host) container.getParent();
Service service = ((Engine)container.getParent()).getService();
-name = new ObjectName(domain + :type=Valve,path= + path +
- ,host= + host.getName() + ,service= +
- service.getName()); //FIX ME - add sequence #
+Integer sequenceInt = new Integer(contextValveSequence);
+String sequenceStr = sequenceInt.toString();
+name = new ObjectName(domain + :type=Valve,sequence= +
+sequenceStr + ,path= +
+path + ,host= +
+host.getName() + ,service= +
+service.getName());
+contextValveSequence++;
}
return (name);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java mbeans-descriptors.xml
craigmcc02/01/24 11:26:12
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
mbeans-descriptors.xml
Log:
Update MBean creation support so that MBeans are created in all cases where
new components are added dynamically, by registering appropriate event
listeners.
TODO: Creation of MBean object names for valves is not returning unique
names, so only the last valve for a particular component is done.
TODO: Looks like we need to add events for StandardServer.addService() and
StandardServer.removeService() so that ServerLifecycleListener can listen in.
TODO: Need to flesh out removing listeners and MBeans as components are
removed (should be pretty much a mirror image of the times when things are
created or registered).
Revision ChangesPath
1.15 +35 -13
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MBeanUtils.java 23 Jan 2002 17:44:55 - 1.14
+++ MBeanUtils.java 24 Jan 2002 19:26:11 - 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.14 2002/01/23 17:44:55 remm Exp $
- * $Revision: 1.14 $
- * $Date: 2002/01/23 17:44:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.15 2002/01/24 19:26:11 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2002/01/24 19:26:11 $
*
*
*
@@ -106,7 +106,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.14 $ $Date: 2002/01/23 17:44:55 $
+ * @version $Revision: 1.15 $ $Date: 2002/01/24 19:26:11 $
*/
public class MBeanUtils {
@@ -762,14 +762,19 @@
name = new ObjectName(domain + :type=Loader,service= +
service.getName());
} else if (container instanceof Host) {
-Service service = ((Engine)container.getParent()).getService();
+Engine engine = (Engine) container.getParent();
+Service service = engine.getService();
name = new ObjectName(domain + :type=Loader,host= +
container.getName() + ,service= +
service.getName());
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
+if (path.length() 1) {
+path = /;
+}
Host host = (Host) container.getParent();
-Service service = ((Engine)container.getParent()).getService();
+Engine engine = (Engine) host.getParent();
+Service service = engine.getService();
name = new ObjectName(domain + :type=Loader,path= + path +
,host= + host.getName() + ,service= +
service.getName());
@@ -801,15 +806,19 @@
name = new ObjectName(domain + :type=Logger,service= +
service.getName());
} else if (container instanceof Host) {
-Service service = ((Engine)container.getParent()).getService();
+Engine engine = (Engine) container.getParent();
+Service service = engine.getService();
name = new ObjectName(domain + :type=Logger,host= +
container.getName() + ,service= +
service.getName());
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
+if (path.length() 1) {
+path = /;
+}
Host host = (Host) container.getParent();
-Service service =
-((Engine)container.getParent().getParent()).getService();
+Engine engine = (Engine) host.getParent();
+Service service = engine.getService();
name = new ObjectName(domain + :type=Logger,path= + path +
,host= + host.getName() + ,service= +
service.getName());
@@ -841,14 +850,19 @@
name = new ObjectName(domain + :type=Manager,service= +
service.getName());
} else if (container instanceof Host) {
-Service service = ((Engine)container.getParent()).getService();
+Engine engine = (Engine)
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
amyroh 02/01/22 10:05:25
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
Fix NPE problem to be more robust so that it allows to have custom components.
Thanks to Remy for noticing the problem.
Revision ChangesPath
1.10 +72 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MBeanUtils.java 21 Jan 2002 21:24:04 - 1.9
+++ MBeanUtils.java 22 Jan 2002 18:05:25 - 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.9 2002/01/21 21:24:04 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2002/01/21 21:24:04 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.10 2002/01/22 18:05:25 amyroh Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/01/22 18:05:25 $
*
*
*
@@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.9 $ $Date: 2002/01/21 21:24:04 $
+ * @version $Revision: 1.10 $ $Date: 2002/01/22 18:05:25 $
*/
public class MBeanUtils {
@@ -177,6 +177,11 @@
String mname = createManagedName(connector);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+// FIX ME
+// shoud we log ManagedBean not found with ManagedName + mname?
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -201,6 +206,9 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -225,6 +233,9 @@
String mname = createManagedName(engine);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -249,6 +260,9 @@
String mname = createManagedName(host);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -273,6 +287,9 @@
String mname = createManagedName(loader);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -296,6 +313,9 @@
String mname = createManagedName(logger);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -320,6 +340,9 @@
String mname = createManagedName(manager);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -343,6 +366,9 @@
String mname = createManagedName(realm);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -365,6 +391,9 @@
String mname = createManagedName(server);
ManagedBean managed = registry.findManagedBean(mname);
+if (managed == null) {
+return null;
+}
String domain = managed.getDomain();
if (domain == null)
domain = mserver.getDefaultDomain();
@@ -389,6 +418,9 @@
String mname = createManagedName(service);
ManagedBean managed = registry.findManagedBean(mname);
+if
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
remm02/01/22 10:16:58
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
- Fix small compilation problem.
Revision ChangesPath
1.11 +15 -15
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MBeanUtils.java 22 Jan 2002 18:05:25 - 1.10
+++ MBeanUtils.java 22 Jan 2002 18:16:57 - 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.10 2002/01/22 18:05:25 amyroh Exp $
- * $Revision: 1.10 $
- * $Date: 2002/01/22 18:05:25 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.11 2002/01/22 18:16:57 remm Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/01/22 18:16:57 $
*
*
*
@@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.10 $ $Date: 2002/01/22 18:05:25 $
+ * @version $Revision: 1.11 $ $Date: 2002/01/22 18:16:57 $
*/
public class MBeanUtils {
@@ -875,7 +875,7 @@
String mname = createManagedName(connector);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -900,7 +900,7 @@
String mname = createManagedName(context);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -925,7 +925,7 @@
String mname = createManagedName(engine);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -950,7 +950,7 @@
String mname = createManagedName(host);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -975,7 +975,7 @@
String mname = createManagedName(loader);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -1000,7 +1000,7 @@
String mname = createManagedName(logger);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -1025,7 +1025,7 @@
String mname = createManagedName(manager);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -1049,7 +1049,7 @@
String mname = createManagedName(realm);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -1074,7 +1074,7 @@
String mname = createManagedName(server);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -1099,7 +1099,7 @@
String mname = createManagedName(service);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
@@ -1124,7 +1124,7 @@
String mname = createManagedName(valve);
ManagedBean managed = registry.findManagedBean(mname);
if (managed == null) {
-return null;
+return;
}
String domain = managed.getDomain();
if (domain == null)
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java
remm02/01/21 13:24:04
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
Log:
- Add missing getParent().
Revision ChangesPath
1.9 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MBeanUtils.java 17 Jan 2002 20:01:02 - 1.8
+++ MBeanUtils.java 21 Jan 2002 21:24:04 - 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.8 2002/01/17 20:01:02 remm Exp $
- * $Revision: 1.8 $
- * $Date: 2002/01/17 20:01:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.9 2002/01/21 21:24:04 remm Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/01/21 21:24:04 $
*
*
*
@@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.8 $ $Date: 2002/01/17 20:01:02 $
+ * @version $Revision: 1.9 $ $Date: 2002/01/21 21:24:04 $
*/
public class MBeanUtils {
@@ -610,7 +610,8 @@
} else if (container instanceof Context) {
String path = ((Context)container).getPath();
Host host = (Host) container.getParent();
-Service service = ((Engine)container.getParent()).getService();
+Service service =
+((Engine)container.getParent().getParent()).getService();
name = new ObjectName(domain + :type=Logger,path= + path +
,host= + host.getName() + ,service= +
service.getName());
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java
remm02/01/17 12:01:02
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
- The JMX support can now be built and distributed with an alternate JMX
implmentation: OpenJMX. OpenJMX is a Sourceforge project which uses
the Apache license, so this should remove the redistribution problems
with the JMX RI. Overall, I think OpenJMX is an ideal candidate for distribution
with upcoming Tomcat releases.
- The build.properties mentions OpenJMX 1.0 b2, which is not released yet.
1.0 b1 will not work, as a few fixes were needed to work with Tomcat.
- I don't see any reason why not to enable the JMX support by default once
OpenJMX reaches 1.0 status.
- Removes use of proprietary APIs from the JMX RI.
- Rename the main JMX variable: jmxri.jar - jmx.jar (the first one implied that the
JMX RI is required).
Revision ChangesPath
1.8 +4 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MBeanUtils.java 14 Jan 2002 21:42:37 - 1.7
+++ MBeanUtils.java 17 Jan 2002 20:01:02 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.7 2002/01/14 21:42:37 amyroh Exp $
- * $Revision: 1.7 $
- * $Date: 2002/01/14 21:42:37 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.8 2002/01/17 20:01:02 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/01/17 20:01:02 $
*
*
*
@@ -76,7 +76,6 @@
import javax.management.OperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBean;
-import com.sun.management.jmx.Trace;
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -104,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.7 $ $Date: 2002/01/14 21:42:37 $
+ * @version $Revision: 1.8 $ $Date: 2002/01/17 20:01:02 $
*/
public class MBeanUtils {
1.7 +4 -101
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServerLifecycleListener.java 14 Jan 2002 21:42:37 - 1.6
+++ ServerLifecycleListener.java 17 Jan 2002 20:01:02 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.6 2002/01/14 21:42:37 amyroh Exp $
- * $Revision: 1.6 $
- * $Date: 2002/01/14 21:42:37 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.7 2002/01/17 20:01:02 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/01/17 20:01:02 $
*
*
*
@@ -71,8 +71,6 @@
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import com.sun.jdmk.comm.AuthInfo;
-import com.sun.jdmk.comm.HtmlAdaptorServer;
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
import org.apache.catalina.ContainerEvent;
@@ -100,22 +98,13 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.6 $ $Date: 2002/01/14 21:42:37 $
+ * @version $Revision: 1.7 $ $Date: 2002/01/17 20:01:02 $
*/
public class ServerLifecycleListener
implements ContainerListener, LifecycleListener {
-// - Instance Variables
-
-
-/**
- * The HtmlAdaptorServer to be executed (if any).
- */
-protected HtmlAdaptorServer adaptor = null;
-
-
// - Properties
@@ -133,51 +122,6 @@
}
-/**
- * The port number for the codeHtmlAdaptorServer/code to be created,
- * or -1 for no adaptor.
- */
-protected int port = -1;
-
-public int getPort() {
-return (this.port);
-}
-
-
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java
amyroh 02/01/14 13:42:37
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Add createMBean, createObjectName, and destroyMBean methods for Loader and Manager.
Revision ChangesPath
1.7 +173 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MBeanUtils.java 14 Nov 2001 03:51:06 - 1.6
+++ MBeanUtils.java 14 Jan 2002 21:42:37 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.6 2001/11/14 03:51:06 amyroh Exp $
- * $Revision: 1.6 $
- * $Date: 2001/11/14 03:51:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.7 2002/01/14 21:42:37 amyroh Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/01/14 21:42:37 $
*
*
*
@@ -84,7 +84,9 @@
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
+import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
@@ -102,7 +104,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.6 $ $Date: 2001/11/14 03:51:06 $
+ * @version $Revision: 1.7 $ $Date: 2002/01/14 21:42:37 $
*/
public class MBeanUtils {
@@ -261,6 +263,29 @@
/**
* Create, register, and return an MBean for this
+ * codeLoader/code object.
+ *
+ * @param loader The Loader to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(Loader loader)
+throws Exception {
+
+String mname = createManagedName(loader);
+ManagedBean managed = registry.findManagedBean(mname);
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(loader);
+ObjectName oname = createObjectName(domain, loader);
+mserver.registerMBean(mbean, oname);
+return (mbean);
+
+}
+
+/**
+ * Create, register, and return an MBean for this
* codeLogger/code object.
*
* @param logger The Logger to be managed
@@ -285,6 +310,29 @@
/**
* Create, register, and return an MBean for this
+ * codeManager/code object.
+ *
+ * @param manager The Manager to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(Manager manager)
+throws Exception {
+
+String mname = createManagedName(manager);
+ManagedBean managed = registry.findManagedBean(mname);
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(manager);
+ObjectName oname = createObjectName(domain, manager);
+mserver.registerMBean(mbean, oname);
+return (mbean);
+
+}
+
+/**
+ * Create, register, and return an MBean for this
* codeRealm/code object.
*
* @param realm The Realm to be managed
@@ -498,6 +546,45 @@
/**
* Create an codeObjectName/code for this
+ * codeLoader/code object.
+ *
+ * @param domain Domain in which this name is to be created
+ * @param loader The Loader to be named
+ *
+ * @exception MalformedObjectNameException if a name cannot be created
+ */
+public static ObjectName createObjectName(String domain,
+ Loader loader)
+throws MalformedObjectNameException {
+
+ObjectName name = null;
+Container container = loader.getContainer();
+
+if (container instanceof Engine) {
+Service service = ((Engine)container).getService();
+name = new ObjectName(domain + :type=Loader,service= +
+ service.getName());
+} else if (container instanceof Host) {
+Service service = ((Engine)container.getParent()).getService();
+name = new ObjectName(domain +
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java StandardEngineMBean.java StandardServerMBean.java StandardServiceMBean.java mbeans-descriptors.xml
amyroh 01/11/13 19:51:06
Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java StandardEngineMBean.java
StandardServerMBean.java StandardServiceMBean.java
mbeans-descriptors.xml
Log:
Add additional operations for MBeans.
Revision ChangesPath
1.6 +259 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MBeanUtils.java 2001/11/11 19:55:08 1.5
+++ MBeanUtils.java 2001/11/14 03:51:06 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.5 2001/11/11 19:55:08 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2001/11/11 19:55:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
1.6 2001/11/14 03:51:06 amyroh Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/11/14 03:51:06 $
*
*
*
@@ -78,16 +78,21 @@
import javax.management.modelmbean.ModelMBean;
import com.sun.management.jmx.Trace;
import org.apache.catalina.Connector;
+import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Logger;
+import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
+import org.apache.catalina.Valve;
import org.apache.catalina.connector.http.HttpConnector;
import org.apache.catalina.connector.warp.WarpConnector;
+import org.apache.catalina.valves.ValveBase;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
@@ -97,7 +102,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.5 $ $Date: 2001/11/11 19:55:08 $
+ * @version $Revision: 1.6 $ $Date: 2001/11/14 03:51:06 $
*/
public class MBeanUtils {
@@ -256,6 +261,52 @@
/**
* Create, register, and return an MBean for this
+ * codeLogger/code object.
+ *
+ * @param logger The Logger to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(Logger logger)
+throws Exception {
+
+String mname = createManagedName(logger);
+ManagedBean managed = registry.findManagedBean(mname);
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(logger);
+ObjectName oname = createObjectName(domain, logger);
+mserver.registerMBean(mbean, oname);
+return (mbean);
+
+}
+
+
+/**
+ * Create, register, and return an MBean for this
+ * codeRealm/code object.
+ *
+ * @param realm The Realm to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(Realm realm)
+throws Exception {
+
+String mname = createManagedName(realm);
+ManagedBean managed = registry.findManagedBean(mname);
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean = managed.createMBean(realm);
+ObjectName oname = createObjectName(domain, realm);
+mserver.registerMBean(mbean, oname);
+return (mbean);
+
+}
+/**
+ * Create, register, and return an MBean for this
* codeServer/code object.
*
* @param server The Server to be managed
@@ -303,6 +354,29 @@
/**
+ * Create, register, and return an MBean for this
+ * codeValve/code object.
+ *
+ * @param valve The Valve to be managed
+ *
+ * @exception Exception if an MBean cannot be created or registered
+ */
+public static ModelMBean createMBean(Valve valve)
+throws Exception {
+
+String mname = createManagedName(valve);
+ManagedBean managed = registry.findManagedBean(mname);
+String domain = managed.getDomain();
+if (domain == null)
+domain = mserver.getDefaultDomain();
+ModelMBean mbean =
