cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2004-12-01 Thread pero 
pero2004/12/01 03:17:34

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  Remove DefaultContext artifacts
  
  Revision  ChangesPath
  1.34  +9 -193
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/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   6 Oct 2004 16:10:57 -   1.33
  +++ MBeanUtils.java   1 Dec 2004 11:17:34 -   1.34
  @@ -77,8 +77,6 @@
 Ajp13Connector },
   { org.apache.coyote.tomcat4.Ajp13Connector,
 CoyoteConnector },
  -{ org.apache.catalina.core.StandardDefaultContext,
  -  DefaultContext },
   { org.apache.catalina.users.JDBCGroup,
 Group },
   { org.apache.catalina.users.JDBCRole,
  @@ -287,42 +285,7 @@
   return (mbean);
   
   }
  -
  -
  -/**
  - * Create, register, and return an MBean for this
  - * codeDefaultContext/code object.
  - *
  - * @param context The DefaultContext to be managed
  - *
  - * @exception Exception if an MBean cannot be created or registered
  - */
  -// FIXME
  -/*
  -static ModelMBean createMBean(DefaultContext context)
  -throws Exception {
  -
  -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);
  -}
  -String domain = managed.getDomain();
  -if (domain == null)
  -domain = mserver.getDefaultDomain();
  -ModelMBean mbean = managed.createMBean(context);
  -ObjectName oname = createObjectName(domain, context);
  -if( mserver.isRegistered( oname ))  {
  -mserver.unregisterMBean(oname);
  -}
  -mserver.registerMBean(mbean, oname);
  -return (mbean);
  -
  -}
  -*/
  -
  -
  + 
   /**
* Create, register, and return an MBean for this
* codeEngine/code object.
  @@ -859,22 +822,7 @@
   ,resourcetype=Context,path= + path + 
   ,host= + host.getName() +
   ,name= + environment.getName());
  -}/* else if (container instanceof DefaultContext) {
  -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=HostDefaultContext,host= + 
host.getName() +
  -,name= + environment.getName());
  -} else if (container instanceof Engine) {
  -Engine engine = (Engine) container;
  -Service service = engine.getService();
  -name = new ObjectName(domain + :type=Environment + 
  -,resourcetype=ServiceDefaultContext,name= + 
environment.getName());
  -}
  -}*/
  -
  +}
   return (name);
   
   }
  @@ -913,23 +861,7 @@
   ,host= + host.getName() +
   ,class= + resource.getType() +
   ,name= + quotedResourceName);
  -}/* else if (container instanceof DefaultContext) {
  -container = ((DefaultContext)container).getParent();
  -if (container instanceof Host) {
  -Host host = (Host) container;
  -Service service = ((Engine)host.getParent()).getService();
  -name = new ObjectName(domain + :type=Resource + 
  -,resourcetype=HostDefaultContext,host= + 
host.getName() +
  -,class= + resource.getType() +
  -,name= + quotedResourceName);
  -} else if (container instanceof Engine) {
  -Engine engine = (Engine) container;
  -Service service = engine.getService();
  -name = new ObjectName(domain + :type=Resource + 
  -,resourcetype=ServiceDefaultContext,class= + 
resource.getType() +
  -,name= + quotedResourceName);
  -}
  -}*/
  +}
   
   return (name);
   
  @@ -969,59 +901,14 @@
   ,resourcetype=Context,path= + path + 
   ,host= + host.getName() +

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2004-07-29 Thread markt 
markt   2004/07/29 12:19:43

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  Fix bug 28178. Quote user and group names to handle situation with
  certs where names may conain '='.
  As far as I can tell, this doesn't break the admin app for users but I will
  need to do some more testing once the 5.5 changes are completed.
  
  Revision  ChangesPath
  1.29  +5 -5  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/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   13 Jul 2004 09:38:21 -  1.28
  +++ MBeanUtils.java   29 Jul 2004 19:19:43 -  1.29
  @@ -1068,8 +1068,8 @@
   
   ObjectName name = null;
   name = new ObjectName(domain + :type=Group,groupname= +
  -  group.getGroupname() + ,database= +
  -  group.getUserDatabase().getId());
  +  ObjectName.quote(group.getGroupname()) +
  +  ,database= + group.getUserDatabase().getId());
   return (name);
   
   }
  @@ -1396,8 +1396,8 @@
   
   ObjectName name = null;
   name = new ObjectName(domain + :type=User,username= +
  -  user.getUsername() + ,database= +
  -  user.getUserDatabase().getId());
  +  ObjectName.quote(user.getUsername())
  +  + ,database= + user.getUserDatabase().getId());
   return (name);
   
   }
  
  
  

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

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2004-07-29 Thread Bill Barker 

- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Thursday, July 29, 2004 12:19 PM
Subject: cvs commit:
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java


 markt   2004/07/29 12:19:43

   Modified:catalina/src/share/org/apache/catalina/mbeans
 MBeanUtils.java
   Log:
   Fix bug 28178. Quote user and group names to handle situation with
   certs where names may conain '='.
   As far as I can tell, this doesn't break the admin app for users but I
will
   need to do some more testing once the 5.5 changes are completed.

   Revision  ChangesPath
   1.29  +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanU
tils.java

   Index: MBeanUtils.java
   ===
   RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbe
ans/MBeanUtils.java,v
   retrieving revision 1.28
   retrieving revision 1.29
   diff -u -r1.28 -r1.29
   --- MBeanUtils.java 13 Jul 2004 09:38:21 - 1.28
   +++ MBeanUtils.java 29 Jul 2004 19:19:43 - 1.29
   @@ -1068,8 +1068,8 @@

ObjectName name = null;
name = new ObjectName(domain + :type=Group,groupname= +
   -  group.getGroupname() + ,database= +
   -  group.getUserDatabase().getId());
   +  ObjectName.quote(group.getGroupname()) +
   +  ,database= +
group.getUserDatabase().getId());
return (name);

}
   @@ -1396,8 +1396,8 @@

ObjectName name = null;
name = new ObjectName(domain + :type=User,username= +
   -  user.getUsername() + ,database= +
   -  user.getUserDatabase().getId());
   +  ObjectName.quote(user.getUsername())
   +  + ,database= +
user.getUserDatabase().getId());
return (name);

}


The rest of the code is using MBeanUtils.encodeStr() for this.  For
consistancy, you might want to use change that to do ON.quote, or use
encodeStr here.






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



This message is intended only for the use of the person(s) listed above as the 
intended recipient(s), and may contain information that is PRIVILEGED and 
CONFIDENTIAL.  If you are not an intended recipient, you may not read, copy, or 
distribute this message or any attachment. If you received this communication in 
error, please notify us immediately by e-mail and then delete all copies of this 
message and any attachments.

In addition you should be aware that ordinary (unencrypted) e-mail sent through the 
Internet is not secure. Do not send confidential or sensitive information, such as 
social security numbers, account numbers, personal identification numbers and 
passwords, to us via ordinary (unencrypted) e-mail.

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

RE: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2004-07-29 Thread Mark Thomas 
Ah. Hadn't spotted that. I'll have a look. Thanks for the heads up.

Mark 

 -Original Message-
 From: Bill Barker [mailto:[EMAIL PROTECTED] 
 Sent: Thursday, July 29, 2004 9:08 PM
 To: Tomcat Developers List
 Subject: Re: cvs commit: 
 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina
 /mbeans MBeanUtils.java
 
 
 - Original Message -
 From: [EMAIL PROTECTED]
 To: [EMAIL PROTECTED]
 Sent: Thursday, July 29, 2004 12:19 PM
 Subject: cvs commit:
 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans
 MBeanUtils.java
 
 
  markt   2004/07/29 12:19:43
 
Modified:catalina/src/share/org/apache/catalina/mbeans
  MBeanUtils.java
Log:
Fix bug 28178. Quote user and group names to handle situation with
certs where names may conain '='.
As far as I can tell, this doesn't break the admin app 
 for users but I
 will
need to do some more testing once the 5.5 changes are completed.
 
Revision  ChangesPath
1.29  +5 -5
 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina
 /mbeans/MBeanU
 tils.java
 
Index: MBeanUtils.java

 ===
RCS file:
 /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apach
 e/catalina/mbe
 ans/MBeanUtils.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- MBeanUtils.java 13 Jul 2004 09:38:21 - 1.28
+++ MBeanUtils.java 29 Jul 2004 19:19:43 - 1.29
@@ -1068,8 +1068,8 @@
 
 ObjectName name = null;
 name = new ObjectName(domain + :type=Group,groupname= +
-  group.getGroupname() + 
 ,database= +
-  group.getUserDatabase().getId());
+  
 ObjectName.quote(group.getGroupname()) +
+  ,database= +
 group.getUserDatabase().getId());
 return (name);
 
 }
@@ -1396,8 +1396,8 @@
 
 ObjectName name = null;
 name = new ObjectName(domain + :type=User,username= +
-  user.getUsername() + ,database= +
-  user.getUserDatabase().getId());
+  
 ObjectName.quote(user.getUsername())
+  + ,database= +
 user.getUserDatabase().getId());
 return (name);
 
 }
 
 
 The rest of the code is using MBeanUtils.encodeStr() for this.  For
 consistancy, you might want to use change that to do ON.quote, or use
 encodeStr here.
 
 
 
 
 
 
  
 -
  To unsubscribe, e-mail: [EMAIL PROTECTED]
  For additional commands, e-mail: [EMAIL PROTECTED]
 
 
 



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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2004-06-27 Thread remm 
remm2004/06/27 16:56:23

  Modified:.build.xml
   catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java StandardServer.java
StandardWrapperValve.java
   catalina build.xml
   modules/cluster/src/share/org/apache/catalina/cluster/tcp
SimpleTcpCluster.java
   webapps/admin build.xml
   catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
   webapps/balancer/WEB-INF/classes/org/apache/webapp/balancer
RulesParser.java
   util/java/org/apache/tomcat/util/http/mapper Mapper.java
   webapps/balancer build.xml
   catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  - Remove all direct dependencies on beanutils.
  
  Revision  ChangesPath
  1.190 +0 -2  jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.189
  retrieving revision 1.190
  diff -u -r1.189 -r1.190
  --- build.xml 23 Jun 2004 08:25:04 -  1.189
  +++ build.xml 27 Jun 2004 23:56:22 -  1.190
  @@ -439,8 +439,6 @@
   
 target name=build depends=init
 description=Builds all components
  -copy file=${commons-digester.jar} todir=${tomcat.build}/server/lib/
  -copy file=${commons-collections.jar} todir=${tomcat.build}/common/lib/
   
   antcall target=build-tomcatutil/
   antcall target=build-tomcatcoyote/
  
  
  
  1.39  +3 -9  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
  
  Index: ApplicationDispatcher.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- ApplicationDispatcher.java25 Jun 2004 23:56:25 -  1.38
  +++ ApplicationDispatcher.java27 Jun 2004 23:56:22 -  1.39
  @@ -46,9 +46,9 @@
   import org.apache.catalina.connector.ResponseFacade;
   import org.apache.catalina.util.InstanceSupport;
   import org.apache.catalina.util.StringManager;
  -import org.apache.commons.beanutils.PropertyUtils;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.apache.tomcat.util.IntrospectionUtils;
   
   
   /**
  @@ -715,18 +715,12 @@
   // Extra aggressive rootCause finding
   do {
   try {
  -rootCauseCheck = (Throwable)PropertyUtils.getProperty
  +rootCauseCheck = (Throwable)IntrospectionUtils.getProperty
   (rootCause, rootCause);
   if (rootCauseCheck!=null)
   rootCause = rootCauseCheck;
   
   } catch (ClassCastException ex) {
  -rootCauseCheck = null;
  -} catch (IllegalAccessException ex) {
  -rootCauseCheck = null;
  -} catch (NoSuchMethodException ex) {
  -rootCauseCheck = null;
  -} catch (java.lang.reflect.InvocationTargetException ex) {
   rootCauseCheck = null;
   }
   } while (rootCauseCheck != null);
  
  
  
  1.33  +6 -5  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- StandardServer.java   23 Jun 2004 16:59:41 -  1.32
  +++ StandardServer.java   27 Jun 2004 23:56:22 -  1.33
  @@ -19,6 +19,7 @@
   
   
   import java.beans.IndexedPropertyDescriptor;
  +import java.beans.Introspector;
   import java.beans.PropertyChangeListener;
   import java.beans.PropertyChangeSupport;
   import java.beans.PropertyDescriptor;
  @@ -73,11 +74,11 @@
   import org.apache.catalina.session.StandardManager;
   import org.apache.catalina.util.LifecycleSupport;
   import org.apache.catalina.util.StringManager;
  -import org.apache.commons.beanutils.PropertyUtils;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.commons.modeler.Registry;
   import org.apache.coyote.ProtocolHandler;
  +import org.apache.tomcat.util.IntrospectionUtils;
   
   
   
  @@ -1007,7 +1008,7 @@
   
   // Acquire the list of properties for this bean

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2003-03-18 Thread costin 
costin  2003/03/18 23:28:31

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  One more split of the large descriptors file.
  
  Revision  ChangesPath
  1.13  +5 -4  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MBeanUtils.java   17 Mar 2003 07:39:13 -  1.12
  +++ MBeanUtils.java   19 Mar 2003 07:28:31 -  1.13
  @@ -1630,6 +1630,7 @@
   ClassLoader cl=ServerLifecycleListener.class.getClassLoader();
   
   registry.loadDescriptors(org.apache.catalina.mbeans,  cl);
  +registry.loadDescriptors(org.apache.catalina.authenticator, cl);
   registry.loadDescriptors(org.apache.catalina.core, cl);
   registry.loadDescriptors(org.apache.catalina.valves,  cl);
   registry.loadDescriptors(org.apache.coyote.tomcat5, cl);
  
  
  

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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2003-03-16 Thread costin 
costin  2003/03/16 23:39:13

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  Update the names - no service.
  
  Use the cleaner Registry API, load the descriptors for each package.
  This will be optional - but for now it's needed since a lot of code in this package
  is using the last part of the name.
  
  Revision  ChangesPath
  1.12  +42 -92
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MBeanUtils.java   8 Mar 2003 06:59:46 -   1.11
  +++ MBeanUtils.java   17 Mar 2003 07:39:13 -  1.12
  @@ -886,7 +886,6 @@
   if (service != null)
   serviceName = service.getName();
   name = new ObjectName(domain + :type=Connector +
  -  ,service= + serviceName +
 ,port= + port +
 ,address= + address);
   return (name);
  @@ -923,8 +922,7 @@
   path = /;
   name = new ObjectName(domain + :type=Context,path= +
 path + ,host= +
  -  host.getName() + ,service= +
  -  service.getName());
  +  host.getName());
   return (name);
   
   }
  @@ -959,7 +957,6 @@
   name = new ObjectName(domain + :type=Environment + 
   ,resourcetype=Context,path= + path + 
   ,host= + host.getName() +
  -,service= + service.getName() +
   ,name= + environment.getName());
   } else if (container instanceof DefaultContext) {
   container = ((DefaultContext)container).getParent();
  @@ -968,14 +965,12 @@
   Service service = ((Engine)host.getParent()).getService();
   name = new ObjectName(domain + :type=Environment + 
   ,resourcetype=HostDefaultContext,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=ServiceDefaultContext,service= + 
  -service.getName() + ,name= + environment.getName());
  +,resourcetype=ServiceDefaultContext,name= + 
environment.getName());
   }
   }
   
  @@ -1015,8 +1010,7 @@
   name = new ObjectName(domain + :type=Resource +
   ,resourcetype=Context,path= + path + 
   ,host= + host.getName() +
  -,service= + service.getName() +
  -,class= + resource.getType() + 
  +,class= + resource.getType() +
   ,name= + encodedResourceName);
   } else if (container instanceof DefaultContext) {
   container = ((DefaultContext)container).getParent();
  @@ -1025,15 +1019,13 @@
   Service service = ((Engine)host.getParent()).getService();
   name = new ObjectName(domain + :type=Resource + 
   ,resourcetype=HostDefaultContext,host= + host.getName() +
  -,service= + service.getName() +
  -,class= + resource.getType() + 
  +,class= + resource.getType() +
   ,name= + encodedResourceName);
   } else if (container instanceof Engine) {
   Engine engine = (Engine) container;
   Service service = engine.getService();
   name = new ObjectName(domain + :type=Resource + 
  -,resourcetype=ServiceDefaultContext,service= + 
service.getName() +
  -,class= + resource.getType() + 
  +,resourcetype=ServiceDefaultContext,class= + 
resource.getType() +
   ,name= + encodedResourceName);
   }
   }
  @@ -1074,7 +1066,6 @@
   name = new ObjectName(domain + :type=ResourceLink +
   ,resourcetype=Context,path= + path + 
   ,host= + host.getName() +
  -,service= + service.getName() +

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2003-01-27 Thread costin 
costin  2003/01/27 21:29:22

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  Another commit - my workspace is almost in sync now.
  
  Make few methods public - so same code will be used to create the names.
  More important - replace the use of the hashcode in the Valve names with a seq.
  number.
  
  One change I'm not committing yet is use of .ser cache for mbeans-descriptors.xml.
  
  Revision  ChangesPath
  1.10  +41 -18
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/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   22 Nov 2002 22:36:51 -  1.9
  +++ MBeanUtils.java   28 Jan 2003 05:29:22 -  1.10
  @@ -68,6 +68,7 @@
   import java.lang.reflect.Method;
   import java.net.URL;
   import java.net.URLEncoder;
  +import java.util.Hashtable;
   
   import javax.management.Attribute;
   import javax.management.InstanceAlreadyExistsException;
  @@ -102,6 +103,7 @@
   import org.apache.catalina.User;
   import org.apache.catalina.UserDatabase;
   import org.apache.catalina.Valve;
  +import org.apache.catalina.valves.ValveBase;
   import org.apache.catalina.core.StandardService;
   import org.apache.catalina.deploy.ContextEnvironment;
   import org.apache.catalina.deploy.ContextResource;
  @@ -870,7 +872,7 @@
*
* @exception MalformedObjectNameException if a name cannot be created
*/
  -static ObjectName createObjectName(String domain,
  +public static ObjectName createObjectName(String domain,
 ContextEnvironment environment)
   throws MalformedObjectNameException {
   
  @@ -924,7 +926,7 @@
*
* @exception MalformedObjectNameException if a name cannot be created
*/
  -static ObjectName createObjectName(String domain,
  +public static ObjectName createObjectName(String domain,
 ContextResource resource)
   throws MalformedObjectNameException {
   
  @@ -983,7 +985,7 @@
*
* @exception MalformedObjectNameException if a name cannot be created
*/
  -static ObjectName createObjectName(String domain,
  +public static ObjectName createObjectName(String domain,
 ContextResourceLink resourceLink)
   throws MalformedObjectNameException {
   
  @@ -1522,8 +1524,13 @@
* @exception MalformedObjectNameException if a name cannot be created
*/
   static ObjectName createObjectName(String domain,
  -  Valve valve)
  +   Valve valve)
   throws MalformedObjectNameException {
  +if( valve instanceof ValveBase ) {
  +ObjectName name=((ValveBase)valve).getObjectName();
  +if( name != null )
  +return name;
  +}
   
   ObjectName name = null;
   Container container = null;
  @@ -1538,15 +1545,15 @@
   
   if (container instanceof Engine) {
   Service service = ((Engine)container).getService();
  +String local=,service= + service.getName();
   name = new ObjectName(domain + :type=Valve,sequence= +
  -  valve.hashCode() + ,service= +
  -  service.getName());
  +  getSeq(local) + local );
   } else if (container instanceof Host) {
   Service service = ((Engine)container.getParent()).getService();
  +String local=,host= +container.getName() + ,service= +
  +service.getName();
   name = new ObjectName(domain + :type=Valve,sequence= +
  -  valve.hashCode() + ,host= +
  -  container.getName() + ,service= +
  -  service.getName() );
  +  getSeq(local) + local);
   } else if (container instanceof Context) {
   String path = ((Context)container).getPath();
   if (path.length()  1) {
  @@ -1554,17 +1561,29 @@
   }
   Host host = (Host) container.getParent();
   Service service = ((Engine) host.getParent()).getService();
  +String local=,path= + path + ,host= +
  +host.getName() + ,service= + service.getName();
   name = new ObjectName(domain + :type=Valve,sequence= +
  -  valve.hashCode() + ,path= +
  -  path + ,host=

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2002-11-22 Thread amyroh 
amyroh  2002/11/22 14:36:52

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  Port Bill's change.
  
  Revision  ChangesPath
  1.9   +14 -7 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/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   14 Nov 2002 14:24:05 -  1.8
  +++ MBeanUtils.java   22 Nov 2002 22:36:51 -  1.9
  @@ -108,7 +108,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;
  @@ -1527,8 +1526,16 @@
   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();
   name = new ObjectName(domain + :type=Valve,sequence= +
  
  
  

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

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2002-11-22 Thread Bill Barker 

- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Friday, November 22, 2002 2:36 PM
Subject: cvs commit:
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java


 amyroh  2002/11/22 14:36:52

   Modified:catalina/src/share/org/apache/catalina/mbeans
 MBeanUtils.java
   Log:
   Port Bill's change.

Thanks Amy.  I'd have gotten to it, but I don't have j-t-catalina checked
out here.


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

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java

2002-11-14 Thread remm 
remm2002/11/14 06:24:06

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
  Log:
  - Add support for the RMI and IIOP based adaptors of MX4J.
  - The RMI based adaptor could in theory be used with MC4J (see at sf.net),
but it fails, because:
- MC4J only works with MX4J 1.1 (and not 1.1.1)
- MX4J 1.1.1 changed the name of the putNamingProperty (to putJNDIProperty)
It is likely the next release of MC4J will work out of the box (but not on my 
laptop,
where it bothers my ATI display driver, and causes a BSOD).
  
  Revision  ChangesPath
  1.8   +105 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/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   8 Nov 2002 11:32:37 -   1.7
  +++ MBeanUtils.java   14 Nov 2002 14:24:05 -  1.8
   -65,8 +65,11 
   
   
   import java.io.InputStream;
  +import java.lang.reflect.Method;
   import java.net.URL;
   import java.net.URLEncoder;
  +
  +import javax.management.Attribute;
   import javax.management.InstanceAlreadyExistsException;
   import javax.management.MalformedObjectNameException;
   import javax.management.MBeanException;
   -77,6 +80,7 
   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;
   -1619,6 +1623,103 
   }
   }
   return (mserver);
  +
  +}
  +
  +
  +/**
  + * Create a RMI adapter [MX4J specific].
  + */
  +public static void createRMIAdaptor(String adaptorType)
  +throws Exception {
  +
  +String namingProviderObjectName = null;
  +String namingProviderClassName = null;
  +String adaptorObjectName = null;
  +String adaptorClassName = null;
  +String adaptorMbeanClassName = null;
  +boolean delay = false;
  +String jndiName = jrmp;
  +String contextFactory = null;
  +String providerUrl = null;
  +
  +if (adaptorType.equals(jrmp)) {
  +namingProviderObjectName = Naming:type=rmiregistry;
  +namingProviderClassName = mx4j.tools.naming.NamingService;
  +adaptorObjectName = Adaptor:protocol=JRMP;
  +adaptorClassName = mx4j.adaptor.rmi.jrmp.JRMPAdaptor;
  +adaptorMbeanClassName = mx4j.adaptor.rmi.jrmp.JRMPAdaptorMBean;
  +contextFactory = 
  +com.sun.jndi.rmi.registry.RegistryContextFactory;
  +providerUrl = rmi://localhost:1099;
  +} else if (adaptorType.equals(iiop)) {
  +namingProviderObjectName = Naming:type=tnameserv;
  +namingProviderClassName = mx4j.tools.naming.CosNamingService;
  +delay = true;
  +adaptorObjectName = Adaptor:protocol=IIOP;
  +adaptorClassName = mx4j.adaptor.rmi.iiop.IIOPAdaptor;
  +adaptorMbeanClassName = mx4j.adaptor.rmi.iiop.IIOPAdaptorMBean;
  +contextFactory = com.sun.jndi.cosnaming.CNCtxFactory;
  +providerUrl = iiop://localhost:900;
  +} else {
  +throw new IllegalArgumentException(Unknown adaptor type);
  +}
  +
  +// Create and start the naming service
  +ObjectName naming = new ObjectName(namingProviderObjectName);
  +mserver.createMBean(namingProviderClassName, naming, null);
  +if (delay) {
  +mserver.setAttribute(naming, new Attribute
  + (Delay, new Integer(5000)));
  +}
  +mserver.invoke(naming, start, null, null);
  +
  +// Create the JRMP adaptor
  +ObjectName adaptor = new ObjectName(adaptorObjectName);
  +mserver.createMBean(adaptorClassName, adaptor, null);
  +
  +Class proxyClass = Class.forName(mx4j.util.StandardMBeanProxy);
  +
  +Object args[] = null;
  +Class types[] = null;
  +Method method = null;
  +
  +types = new Class[3];
  +types[0] = Class.class;
  +types[1] = MBeanServer.class;
  +types[2] = ObjectName.class;
  +args = new Object[3];
  +args[0] = Class.forName(adaptorMbeanClassName);
  +args[1] = mserver;
  +args[2] = adaptor;
  +method = proxyClass.getMethod(create, types);
  +Object bean = method.invoke(null, args);
  +
  +Class beanClass = bean.getClass();
  +
  +args = new Object[1];
  +args[0] = jndiName;
  +types =

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2002-11-08 Thread remm 
remm2002/11/08 03:32:37

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  - Fix bug creating and editing a resource link. Since name is part of the MBean
name, it cannot be changed without removing the object.
  
  Revision  ChangesPath
  1.7   +5 -8  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/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   15 Oct 2002 19:08:33 -  1.6
  +++ MBeanUtils.java   8 Nov 2002 11:32:37 -   1.7
   -990,7 +990,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();
   -1003,7 +1003,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();
   -1013,14 +1012,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-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java

2002-10-15 Thread jfarcand 

jfarcand2002/10/15 12:08:33

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java
  Log:
  Security Audit. Since all methods should/are only used by o.a.c.mbean package, 
protects them.
  
  Revision  ChangesPath
  1.6   +67 -67
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
  
  Index: MBeanUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/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   20 Sep 2002 21:22:31 -  1.5
  +++ MBeanUtils.java   15 Oct 2002 19:08:33 -  1.6
  @@ -184,7 +184,7 @@
*
* @param component The component for which to create a name
*/
  -public static String createManagedName(Object component) {
  +static String createManagedName(Object component) {
   
   // Deal with exceptions to the standard rule
   String className = component.getClass().getName();
  @@ -211,7 +211,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(Connector connector)
  +static ModelMBean createMBean(Connector connector)
   throws Exception {
   
   String mname = createManagedName(connector);
  @@ -239,7 +239,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(Context context)
  +static ModelMBean createMBean(Context context)
   throws Exception {
   
   String mname = createManagedName(context);
  @@ -267,7 +267,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(ContextEnvironment environment)
  +static ModelMBean createMBean(ContextEnvironment environment)
   throws Exception {
   
   String mname = createManagedName(environment);
  @@ -295,7 +295,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(ContextResource resource)
  +static ModelMBean createMBean(ContextResource resource)
   throws Exception {
   
   String mname = createManagedName(resource);
  @@ -323,7 +323,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(ContextResourceLink resourceLink)
  +static ModelMBean createMBean(ContextResourceLink resourceLink)
   throws Exception {
   
   String mname = createManagedName(resourceLink);
  @@ -351,7 +351,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(DefaultContext context)
  +static ModelMBean createMBean(DefaultContext context)
   throws Exception {
   
   String mname = createManagedName(context);
  @@ -379,7 +379,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(Engine engine)
  +static ModelMBean createMBean(Engine engine)
   throws Exception {
   
   String mname = createManagedName(engine);
  @@ -407,7 +407,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(Group group)
  +static ModelMBean createMBean(Group group)
   throws Exception {
   
   String mname = createManagedName(group);
  @@ -435,7 +435,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(Host host)
  +static ModelMBean createMBean(Host host)
   throws Exception {
   
   String mname = createManagedName(host);
  @@ -463,7 +463,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(Loader loader)
  +static ModelMBean createMBean(Loader loader)
   throws Exception {
   
   String mname = createManagedName(loader);
  @@ -490,7 +490,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(Logger logger)
  +static ModelMBean createMBean(Logger logger)
   throws Exception {
   
   String mname = createManagedName(logger);
  @@ -518,7 +518,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public static ModelMBean createMBean(Manager manager)
  +static ModelMBean createMBean(Manager manager)
   throws