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

2004-01-25 Thread billbarker 
billbarker2004/01/25 15:07:16

  Modified:catalina/src/share/org/apache/catalina/mbeans
ConnectorMBean.java mbeans-descriptors.xml
  Log:
  MBean support for the change in type for clientAuth.
  
  Revision  ChangesPath
  1.5   +11 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
  
  Index: ConnectorMBean.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConnectorMBean.java   2 May 2002 02:03:15 -   1.4
  +++ ConnectorMBean.java   25 Jan 2004 23:07:16 -  1.5
  @@ -114,7 +114,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public boolean getClientAuth()
  +public String getClientAuth()
   throws Exception {
   
   Object clientAuthObj = null;
  @@ -131,9 +131,9 @@
   }
  
   }
  -if (clientAuthObj instanceof Boolean) {
  -return ((Boolean)clientAuthObj).booleanValue();
  -} else return false;
  +if (clientAuthObj instanceof String) {
  +return (String)clientAuthObj;
  +} else return "false";
   
   }
   
  @@ -143,7 +143,7 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public void setClientAuth(boolean clientAuth)
  +public void setClientAuth(String clientAuth)
   throws Exception {
   
   Class coyoteConnectorCls = 
Class.forName("org.apache.coyote.tomcat4.CoyoteConnector");
  @@ -155,10 +155,10 @@
   if (coyoteServerSocketFactoryCls.isInstance(factory)) {
   // set clientAuth
   Class partypes2 [] = new Class[1];
  -partypes2[0] = Boolean.TYPE;
  +partypes2[0] = String.class;
   Method meth2 = 
coyoteServerSocketFactoryCls.getMethod("setClientAuth", partypes2);
   Object arglist2[] = new Object[1];
  -arglist2[0] = new Boolean(clientAuth);
  +arglist2[0] = clientAuth;
   meth2.invoke(factory, arglist2);
   } 
   } 
  
  
  
  1.82  +2 -2  
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.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- mbeans-descriptors.xml22 Jan 2004 02:34:56 -  1.81
  +++ mbeans-descriptors.xml25 Jan 2004 23:07:16 -  1.82
  @@ -258,7 +258,7 @@
   
   
  + type="java.lang.String"/>

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

2002-04-30 Thread amyroh 

amyroh  02/04/30 11:24:08

  Modified:catalina/src/share/org/apache/catalina/mbeans
ConnectorMBean.java mbeans-descriptors.xml
  Log:
  Add protocolHandlerClassName so the admin can tell AJP connector.
  Minor package error fix.
  
  Revision  ChangesPath
  1.2   +4 -4  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
  
  Index: ConnectorMBean.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConnectorMBean.java   30 Apr 2002 17:47:26 -  1.1
  +++ ConnectorMBean.java   30 Apr 2002 18:24:08 -  1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java,v
 1.1 2002/04/30 17:47:26 amyroh Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/04/30 17:47:26 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java,v
 1.2 2002/04/30 18:24:08 amyroh Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/04/30 18:24:08 $
*
* 
*
  @@ -61,7 +61,7 @@
*
*/
   
  -package catalina.src.share.org.apache.catalina.mbeans;
  +package org.apache.catalina.mbeans;
   
   import java.lang.reflect.Method;
   import javax.management.MBeanException;
  @@ -76,7 +76,7 @@
* org.apache.coyote.tomcat4.CoyoteConnector component.
*
* @author Amy Roh
  - * @version $Revision: 1.1 $ $Date: 2002/04/30 17:47:26 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/30 18:24:08 $
*/
   
   public class ConnectorMBean extends BaseModelMBean {
  
  
  
  1.52  +5 -0  
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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- mbeans-descriptors.xml30 Apr 2002 17:47:26 -  1.51
  +++ mbeans-descriptors.xml30 Apr 2002 18:24:08 -  1.52
  @@ -6,7 +6,7 @@
   
   
   
  @@ -192,6 +192,11 @@
   
  +
  +
   
   mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: