User: jules_gosnell
Date: 01/05/08 16:18:40
Modified: jetty/src/main/org/jboss/jetty JettyService.java
Log:
fix Jetty MBean domainName (now they deregister properly)
pick up MBeanServer reference at correct point, rather than hacking it
Revision Changes Path
1.10 +56 -49 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JettyService.java 2001/05/02 21:13:16 1.9
+++ JettyService.java 2001/05/08 23:18:40 1.10
@@ -33,7 +33,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Julian Gosnell</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
class JettyMBean extends HttpServerMBean
@@ -44,11 +44,15 @@
super(jetty);
}
- protected String
- newObjectName(String prefix, MBeanServer server)
+ protected String newObjectName(MBeanServer server)
{
- return uniqueObjectName(server, prefix);
+ return super.newObjectName(server);
}
+// protected String
+// newObjectName(String prefix, MBeanServer server)
+// {
+// return uniqueObjectName(server, prefix);
+// }
}
public class JettyService extends ServiceMBeanSupport
@@ -84,6 +88,19 @@
JBossLogSink _logSink = new JBossLogSink();
JettyMBean _mbean = null;
Jetty _jetty = null;
+ MBeanServer _server =null;
+
+ public ObjectName
+ preRegister(MBeanServer server, ObjectName name)
+ throws java.lang.Exception
+ {
+ name = getObjectName(server, name);
+ _server = server;
+
+ try {ensureService();} catch (Exception e) {e.printStackTrace();}
+
+ return name;
+ }
protected void
ensureService()
@@ -130,39 +147,29 @@
Log.unsetLog();
}
- try
- {
- _mbean = new JettyMBean(_jetty);
- MBeanServer server =
(MBeanServer)javax.management.MBeanServerFactory.findMBeanServer(null).get(0);
- // MBeanServer server=MBeanServerFactory.newMBeanServer("Jetty");
- server.registerMBean(_mbean, new
ObjectName(_mbean.newObjectName(OBJECT_NAME,server)));
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- catch (Error e)
- {
- e.printStackTrace();
- }
- }
-
- //----------------------------------------------------------------------------
-
- public
- JettyService()
- {
try
{
- ensureService();
+ _mbean = new JettyMBean(_jetty);
+ _server.registerMBean(_mbean, new ObjectName(_mbean.newObjectName(_server)));
}
catch (Exception e)
{
e.printStackTrace();
}
+ catch (Error e)
+ {
+ e.printStackTrace();
+ }
}
//----------------------------------------------------------------------------
+
+ public
+ JettyService()
+ {
+ }
+
+ //----------------------------------------------------------------------------
// 'name' interface
//----------------------------------------------------------------------------
@@ -257,13 +264,13 @@
setConfiguration(String configUrl)
{
com.mortbay.Util.Log.event("setConfiguration() is deprecated - use
addConfiguration()");
- _jetty.addConfiguration(configUrl);
+ addConfiguration(configUrl);
}
public void
addConfiguration(String configUrl)
{
- com.mortbay.Util.Log.event("addConfiguration() - going for it...");
+ com.mortbay.Util.Log.event("adding Configuration "+configUrl);
_jetty.addConfiguration(configUrl);
}
@@ -297,25 +304,25 @@
return null;
}
-// // bind Jetty3Extra MBean into our own lifecycle...
+ // // bind Jetty3Extra MBean into our own lifecycle...
-// public void
-// start()
-// throws Exception
-// {
-// super.start();
-// // _mbean.;
-// }
-
-// public void
-// stop()
-// {
-// super.stop();
-// }
-
-// public void
-// destroy()
-// {
-// super.destroy();
-// }
+ // public void
+ // start()
+ // throws Exception
+ // {
+ // super.start();
+ // // _mbean.;
+ // }
+
+ // public void
+ // stop()
+ // {
+ // super.stop();
+ // }
+
+ // public void
+ // destroy()
+ // {
+ // super.destroy();
+ // }
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
