User: user57 Date: 02/01/02 20:00:55 Modified: jetty/src/main/org/jboss/jetty JettyMBean.java JettyResolver.java JettyService.java JettyServiceMBean.java Log: o migrated all components to a new JMX domain name model. jboss.system is now where to core/spine components live. moved all components that were in JBOSS-SYSTEM that did not move into a jboss.* domain into jboss (where the server is now registered). The point was to limit the members of jboss.system to core bits only. o Created org.jboss.system.Server, which does the work of initialization that org.jboss.Main used to do. Main now only parses the command line, sets up basic legecy properties and creates a Server instance. o Moved functionality of Shutdown (component not cl tool) into Server ( which is bound as jboss.system:service=Server) o Moved more Runtime access from Info into Server. Exposed memory info as attributes. o Logging a WARN everywhere that uses System.getProperty("jboss.system.home") as that should go away soon/eventually. o Initialized the invokerMap in the harmi impl to avoid NPE o Made getopt.jar a member of the lib/* dir instead of adding it to the run.jar and shutdown.jars each time. o Minor cosmetic changes along the way. Revision Changes Path 1.6 +1 -1 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JettyMBean.java 2001/11/21 23:13:01 1.5 +++ JettyMBean.java 2002/01/03 04:00:55 1.6 @@ -28,6 +28,6 @@ newObjectName(MBeanServer server) { //return super.newObjectName(server); - return uniqueObjectName(server, "Jetty"+":"); + return uniqueObjectName(server, "jboss.web:"); } } 1.7 +0 -2 contrib/jetty/src/main/org/jboss/jetty/JettyResolver.java Index: JettyResolver.java =================================================================== RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyResolver.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JettyResolver.java 2001/12/09 06:05:49 1.6 +++ JettyResolver.java 2002/01/03 04:00:55 1.7 @@ -5,8 +5,6 @@ * See terms of license at gnu.org. */ -// $Id$ - package org.jboss.jetty; import java.io.IOException; 1.36 +7 -6 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.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- JettyService.java 2001/12/09 06:05:49 1.35 +++ JettyService.java 2002/01/03 04:00:55 1.36 @@ -5,22 +5,23 @@ * See terms of license at gnu.org. */ -// $Id: JettyService.java,v 1.35 2001/12/09 06:05:49 user57 Exp $ +// $Id: JettyService.java,v 1.36 2002/01/03 04:00:55 user57 Exp $ package org.jboss.jetty; - import java.io.IOException; import java.io.InputStream; import java.net.URL; import javax.management.MBeanRegistration; import javax.management.MBeanServer; import javax.management.ObjectName; + import org.jboss.logging.Logger; import org.jboss.deployment.DeploymentException; 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.Log; @@ -28,7 +29,7 @@ * A service to launch jetty from JMX. * * @author <a href="mailto:[EMAIL PROTECTED]">Julian Gosnell</a> - * @version $Revision: 1.35 $ + * @version $Revision: 1.36 $ */ // NOTES @@ -125,7 +126,7 @@ protected void ensureJetty() { - org.mortbay.jetty.jmx.ModelMBeanImpl.setJettyDomain("Jetty"); + org.mortbay.jetty.jmx.ModelMBeanImpl.setJettyDomain("jboss.web"); // make a Jetty... Jetty tmp = new Jetty(); @@ -151,7 +152,7 @@ _mbean = new JettyMBean(_jetty); _debug = new DebugMBean(); _server.registerMBean(_mbean, new ObjectName(_mbean.newObjectName(_server))); - _server.registerMBean(_debug, new ObjectName("Jetty:Jetty=Debug")); + _server.registerMBean(_debug, new ObjectName("jboss.web:Jetty=Debug")); } catch (Throwable e) { @@ -243,7 +244,7 @@ _mbean=null; try { - _server.unregisterMBean(new ObjectName("Jetty:Jetty=Debug")); + _server.unregisterMBean(new ObjectName("jboss.web:Jetty=Debug")); } catch(Exception e) { 1.10 +17 -24 contrib/jetty/src/main/org/jboss/jetty/JettyServiceMBean.java Index: JettyServiceMBean.java =================================================================== RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyServiceMBean.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- JettyServiceMBean.java 2001/11/26 03:24:53 1.9 +++ JettyServiceMBean.java 2002/01/03 04:00:55 1.10 @@ -5,43 +5,36 @@ * See terms of license at gnu.org. */ -// $Id: JettyServiceMBean.java,v 1.9 2001/11/26 03:24:53 starksm Exp $ - package org.jboss.jetty; import org.jboss.deployment.DeploymentException; /** - * <description> + * ??? * - * @see <related> - * @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a> - * @version $Revision: 1.9 $ + * @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a> + * @version $Revision: 1.10 $ */ public interface JettyServiceMBean - extends org.jboss.web.AbstractWebContainerMBean + extends org.jboss.web.AbstractWebContainerMBean { + String OBJECT_NAME = "jboss.web:service=Jetty"; - // Constants ----------------------------------------------------- - public static final String OBJECT_NAME = ":service=Jetty"; - - // Public -------------------------------------------------------- - - public void setConfiguration(String configUrl); - public String getConfiguration(); + void setConfiguration(String configUrl); + String getConfiguration(); - // public void setProperty(String property); - // public String getProperty(); + // void setProperty(String property); + // String getProperty(); - public boolean getPublishMBeans(); - public void setPublishMBeans(boolean publishMBeans); + boolean getPublishMBeans(); + void setPublishMBeans(boolean publishMBeans); - public boolean getUnpackWars(); - public void setUnpackWars(boolean unpackWars); + boolean getUnpackWars(); + void setUnpackWars(boolean unpackWars); - public String getWebDefault(); - public void setWebDefault(String webDefault); + String getWebDefault(); + void setWebDefault(String webDefault); - public void setJettyHome(String jettyHome); - public String getJettyHome(); + void setJettyHome(String jettyHome); + String getJettyHome(); }
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development