billbarker 2004/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 Changes Path
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 -0000 1.4
+++ ConnectorMBean.java 25 Jan 2004 23:07:16 -0000 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.xml 22 Jan 2004 02:34:56 -0000 1.81
+++ mbeans-descriptors.xml 25 Jan 2004 23:07:16 -0000 1.82
@@ -258,7 +258,7 @@
<attribute name="clientAuth"
description="Should we require client authentication?"
- type="boolean"/>
+ type="java.lang.String"/>
<attribute name="connectionTimeout"
description="Timeout value on the incoming connection"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
