User: olegnitz
Date: 02/02/10 09:57:41
Modified: jetty/src/main/org/jboss/jetty JettyMBean.java
JettyService.java
Log:
Fresh version of Jetty and patches to Jetty plugin by Jan Bartel
Revision Changes Path
1.7 +9 -9 contrib/jetty/src/main/org/jboss/jetty/JettyMBean.java
Index: JettyMBean.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyMBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JettyMBean.java 3 Jan 2002 04:00:55 -0000 1.6
+++ JettyMBean.java 10 Feb 2002 17:57:41 -0000 1.7
@@ -13,21 +13,21 @@
import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.mortbay.jetty.jmx.JettyServerMBean;
+import org.mortbay.jetty.jmx.ServerMBean;
public class JettyMBean
- extends JettyServerMBean
+ extends ServerMBean
{
- public JettyMBean(Jetty jetty)
- throws MBeanException, InstanceNotFoundException
+ public static final String JBOSS_DOMAIN = "jboss.web";
+
+ static
{
- super(jetty);
+ setDefaultDomain (JBOSS_DOMAIN);
}
- protected String
- newObjectName(MBeanServer server)
+ public JettyMBean(Jetty jetty)
+ throws MBeanException, InstanceNotFoundException
{
- //return super.newObjectName(server);
- return uniqueObjectName(server, "jboss.web:");
+ super(jetty);
}
}
1.42 +20 -16 contrib/jetty/src/main/org/jboss/jetty/JettyService.java
Index: JettyService.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyService.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- JettyService.java 2 Feb 2002 01:53:30 -0000 1.41
+++ JettyService.java 10 Feb 2002 17:57:41 -0000 1.42
@@ -5,7 +5,7 @@
* See terms of license at gnu.org.
*/
-// $Id: JettyService.java,v 1.41 2002/02/02 01:53:30 mnf999 Exp $
+// $Id: JettyService.java,v 1.42 2002/02/10 17:57:41 olegnitz Exp $
//------------------------------------------------------------------------------
@@ -25,7 +25,8 @@
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
import org.jboss.web.AbstractWebContainer;
import org.jboss.web.WebApplication;
-import org.mortbay.jetty.jmx.DebugMBean;
+import org.mortbay.util.jmx.CodeMBean;
+import org.mortbay.util.jmx.LogMBean;
import org.mortbay.util.Log;
//------------------------------------------------------------------------------
@@ -33,7 +34,7 @@
* A service to launch jetty from JMX.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Julian Gosnell</a>
- * @version $Revision: 1.41 $
+ * @version $Revision: 1.42 $
*/
// NOTES
@@ -47,11 +48,12 @@
{
public static final String NAME = "Jetty";
- Logger _log = Logger.getLogger(JettyService.class);
- JettyMBean _mbean = null;
- DebugMBean _debug = null;
- Jetty _jetty = null;
- MBeanServer _server = null;
+ Logger _log = Logger.getLogger(JettyService.class);
+ JettyMBean _mbean = null;
+ CodeMBean _debug = null;
+ Jetty _jetty = null;
+ MBeanServer _server = null;
+ LogMBean _logbean = null;
public
JettyService()
@@ -132,7 +134,7 @@
protected void
ensureJetty()
{
- org.mortbay.jetty.jmx.ModelMBeanImpl.setJettyDomain("jboss.web");
+ //org.mortbay.jetty.jmx.ModelMBeanImpl.setJettyDomain("jboss.web");
// make a Jetty...
Jetty tmp = new Jetty();
@@ -157,11 +159,13 @@
{
try
{
- _log.debug("MBean peers WILL be created for Jetty Contexts");
- _mbean = new JettyMBean(_jetty);
- _debug = new DebugMBean();
- _server.registerMBean(_mbean, new ObjectName(_mbean.newObjectName(_server)));
- _server.registerMBean(_debug, new ObjectName("jboss.web:Jetty=Debug"));
+ _log.debug("MBean peers WILL be created for Jetty Contexts");
+ _mbean = new JettyMBean(_jetty);
+ _debug = new CodeMBean();
+ _logbean = new LogMBean();
+ _server.registerMBean(_mbean, null);
+ _server.registerMBean(_debug, new
ObjectName(_mbean.getDefaultDomain()+":Jetty=Debug"));
+ _server.registerMBean (_logbean, new
ObjectName(_mbean.getDefaultDomain()+":Jetty=Log"));
}
catch (Throwable e)
{
@@ -256,11 +260,11 @@
_mbean=null;
try
{
- _server.unregisterMBean(new ObjectName("jboss.web:Jetty=Debug"));
+ _server.unregisterMBean(new ObjectName("jboss.web:Jetty=Debug"));
}
catch(Exception e)
{
- _log.error("problem unregistering DebugMBean", e);
+ _log.error("problem unregistering CodeMBean", e);
}
_debug=null;
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
