costin 2003/01/20 11:20:32
Modified: jk/java/org/apache/jk/common ChannelSocket.java
HandlerDispatch.java JkMX.java MsgAjp.java
jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
Remove unused imports, add/fix comments.
JkMX will only load the jmx console, since components now know and support
JMX. This also removes the dependency on DynamicMbean - modeler now supports
all the features of DynamicMBean, it should be deprecated.
Revision Changes Path
1.32 +0 -6
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
Index: ChannelSocket.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChannelSocket.java 16 Jan 2003 22:13:37 -0000 1.31
+++ ChannelSocket.java 20 Jan 2003 19:20:32 -0000 1.32
@@ -60,17 +60,11 @@
package org.apache.jk.common;
import java.io.*;
-
import java.net.*;
-import java.util.*;
-
-import org.apache.tomcat.util.buf.*;
-import org.apache.tomcat.util.http.*;
import org.apache.tomcat.util.threads.*;
import org.apache.jk.core.*;
-import org.apache.jk.server.JkMain;
import org.apache.commons.modeler.Registry;
1.4 +1 -7
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerDispatch.java
Index: HandlerDispatch.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerDispatch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HandlerDispatch.java 17 Apr 2002 22:38:42 -0000 1.3
+++ HandlerDispatch.java 20 Jan 2003 19:20:32 -0000 1.4
@@ -60,15 +60,9 @@
package org.apache.jk.common;
import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.security.*;
-import java.security.cert.*;
-
import org.apache.jk.core.*;
-import org.apache.tomcat.util.http.*;
-import org.apache.tomcat.util.buf.*;
+
/**
1.8 +27 -16 jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java
Index: JkMX.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkMX.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JkMX.java 30 Oct 2002 22:22:46 -0000 1.7
+++ JkMX.java 20 Jan 2003 19:20:32 -0000 1.8
@@ -58,22 +58,20 @@
*/
package org.apache.jk.common;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.apache.jk.core.*;
-import org.apache.jk.server.JkMain;
+import org.apache.jk.core.JkHandler;
-import javax.management.*;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.Attribute;
+import javax.management.MBeanServerFactory;
+import java.io.IOException;
-import org.apache.tomcat.util.mx.*;
-
-/** MX-enable jk.
+/**
+ * Load the HTTP or RMI adapters for MX4J and JMXRI.
+ *
+ * Add "mx.port=PORT" in jk2.properties to enable it.
*
- * Add "mx.port=PORT" in jk2.properties to enable it.
- * If port==-1 the JMX will be enabled but no HTTP adapter will be loaded.
- * Port > 0 will load the mx4j adapter, if possible.
*/
public class JkMX extends JkHandler
{
@@ -216,7 +214,7 @@
public void init() throws IOException {
try {
- mserver = DynamicMBeanProxy.getMBeanServer();
+ mserver = getMBeanServer();
if( port > 0 ) {
loadAdapter();
@@ -231,27 +229,40 @@
log.info("Can't enable log4j mx");
}
- DynamicMBeanProxy.createMBean( JkMain.getJkMain(), "jk2", "name=JkMain"
);
+ /*
+ DynamicMBeanProxy.createMBean( JkMain.getJkMain(), "jk2", "name=JkMain"
);
for( int i=0; i< wEnv.getHandlerCount(); i++ ) {
JkHandler h=wEnv.getHandler( i );
DynamicMBeanProxy.createMBean( h, "jk2", "name=" + h.getName() );
}
-
+ */
} catch( Throwable t ) {
log.error( "Init error", t );
}
}
public void addHandlerCallback( JkHandler w ) {
- if( w!=this ) {
+ /*if( w!=this ) {
DynamicMBeanProxy.createMBean( w, "jk2", "name=" + w.getName() );
}
+ */
+ }
+
+ MBeanServer getMBeanServer() {
+ MBeanServer server;
+ if( MBeanServerFactory.findMBeanServer(null).size() > 0 ) {
+ server=(MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
+ } else {
+ server=MBeanServerFactory.createMBeanServer();
+ }
+ return (server);
}
private static org.apache.commons.logging.Log log=
org.apache.commons.logging.LogFactory.getLog( JkMX.class );
+
}
1.13 +1 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/MsgAjp.java
Index: MsgAjp.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/MsgAjp.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MsgAjp.java 2 Jul 2002 16:55:03 -0000 1.12
+++ MsgAjp.java 20 Jan 2003 19:20:32 -0000 1.13
@@ -220,6 +220,7 @@
log.error("Buffer overflow: buffer.len=" + buf.length + " pos=" +
pos + " data=" + numBytes );
dump("Overflow/coBytes");
+ log.error( "Overflow ", new Throwable());
return;
}
System.arraycopy( b, off, buf, pos, numBytes);
1.34 +4 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- JkCoyoteHandler.java 16 Jan 2003 22:17:37 -0000 1.33
+++ JkCoyoteHandler.java 20 Jan 2003 19:20:32 -0000 1.34
@@ -108,7 +108,10 @@
public final int JK_STATUS_NEW=0;
public final int JK_STATUS_HEAD=1;
public final int JK_STATUS_CLOSED=2;
-
+
+ /** Set a property. Name is a "component.property". JMX should
+ * be used instead.
+ */
public void setProperty( String name, String value ) {
if( log.isTraceEnabled())
log.trace("setProperty " + name + " " + value );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
