User: janb
Date: 02/02/19 21:33:46
Modified: jetty/src/main/org/mortbay/util/jmx CodeMBean.java
LifeCycleMBean.java LogMBean.java LogSinkMBean.java
Main.java ModelMBeanImpl.java
OutputStreamLogSinkMBean.java TestModelMBean.java
ThreadPoolMBean.java ThreadedServerMBean.java
Log:
Updating to latest Jetty with tag JBOSS_20020220222111
Revision Changes Path
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/util/jmx/CodeMBean.java
Index: CodeMBean.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/CodeMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CodeMBean.java 10 Feb 2002 17:57:46 -0000 1.1
+++ CodeMBean.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: CodeMBean.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: CodeMBean.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/util/jmx/LifeCycleMBean.java
Index: LifeCycleMBean.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/LifeCycleMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LifeCycleMBean.java 10 Feb 2002 17:57:46 -0000 1.1
+++ LifeCycleMBean.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: LifeCycleMBean.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: LifeCycleMBean.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -17,7 +17,7 @@
/* ------------------------------------------------------------ */
/**
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class LifeCycleMBean extends ModelMBeanImpl
1.2 +22 -1 contrib/jetty/src/main/org/mortbay/util/jmx/LogMBean.java
Index: LogMBean.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/LogMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogMBean.java 10 Feb 2002 17:57:46 -0000 1.1
+++ LogMBean.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: LogMBean.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: LogMBean.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -80,6 +80,27 @@
super.postRegister(ok);
if (ok.booleanValue())
rescanSinks();
+ }
+
+ /* ------------------------------------------------------------ */
+ public void preDeregister()
+ {
+ super.preDeregister();
+
+ Iterator iter=_sinks.keySet().iterator();
+ while(iter.hasNext())
+ {
+ try
+ {
+ LogSink sink=(LogSink)iter.next();
+ LogSinkMBean bean=(LogSinkMBean)_sinks.remove(sink);
+ getMBeanServer().unregisterMBean(bean.getObjectName());
+ }
+ catch(Exception e)
+ {
+ Code.warning(e);
+ }
+ }
}
/* ------------------------------------------------------------ */
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/util/jmx/LogSinkMBean.java
Index: LogSinkMBean.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/LogSinkMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogSinkMBean.java 10 Feb 2002 17:57:46 -0000 1.1
+++ LogSinkMBean.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: LogSinkMBean.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: LogSinkMBean.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -25,7 +25,7 @@
/* ------------------------------------------------------------ */
/**
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class LogSinkMBean extends LifeCycleMBean
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/util/jmx/Main.java
Index: Main.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 10 Feb 2002 17:57:46 -0000 1.1
+++ Main.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: Main.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: Main.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -23,7 +23,7 @@
/* ------------------------------------------------------------ */
/**
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class Main
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/util/jmx/ModelMBeanImpl.java
Index: ModelMBeanImpl.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/ModelMBeanImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelMBeanImpl.java 10 Feb 2002 17:57:46 -0000 1.1
+++ ModelMBeanImpl.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ModelMBeanImpl.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: ModelMBeanImpl.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -85,7 +85,7 @@
* defined.
* </UL>
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class ModelMBeanImpl
1.2 +0 -0
contrib/jetty/src/main/org/mortbay/util/jmx/OutputStreamLogSinkMBean.java
Index: OutputStreamLogSinkMBean.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/OutputStreamLogSinkMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OutputStreamLogSinkMBean.java 10 Feb 2002 17:57:46 -0000 1.1
+++ OutputStreamLogSinkMBean.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: OutputStreamLogSinkMBean.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: OutputStreamLogSinkMBean.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -22,7 +22,7 @@
/* ------------------------------------------------------------ */
/**
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class OutputStreamLogSinkMBean extends LogSinkMBean
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/util/jmx/TestModelMBean.java
Index: TestModelMBean.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/TestModelMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestModelMBean.java 10 Feb 2002 17:57:46 -0000 1.1
+++ TestModelMBean.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: TestModelMBean.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: TestModelMBean.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -17,7 +17,7 @@
/* ------------------------------------------------------------ */
/** Test ModelMBeanImpl
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class TestModelMBean extends ModelMBeanImpl
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/util/jmx/ThreadPoolMBean.java
Index: ThreadPoolMBean.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/ThreadPoolMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadPoolMBean.java 10 Feb 2002 17:57:46 -0000 1.1
+++ ThreadPoolMBean.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ThreadPoolMBean.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: ThreadPoolMBean.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -18,7 +18,7 @@
/* ------------------------------------------------------------ */
/**
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class ThreadPoolMBean extends LifeCycleMBean
1.2 +0 -0
contrib/jetty/src/main/org/mortbay/util/jmx/ThreadedServerMBean.java
Index: ThreadedServerMBean.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/util/jmx/ThreadedServerMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ThreadedServerMBean.java 10 Feb 2002 17:57:46 -0000 1.1
+++ ThreadedServerMBean.java 20 Feb 2002 05:33:46 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ThreadedServerMBean.java,v 1.1 2002/02/10 17:57:46 olegnitz Exp $
+// $Id: ThreadedServerMBean.java,v 1.2 2002/02/20 05:33:46 janb Exp $
// ========================================================================
package org.mortbay.util.jmx;
@@ -18,7 +18,7 @@
/* ------------------------------------------------------------ */
/**
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class ThreadedServerMBean extends ThreadPoolMBean
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development