User: jules_gosnell
Date: 01/11/26 15:39:22
Modified: jetty/src/main/org/jboss/jetty JettyService.java
Log:
sort out DebugMBean
lose some dead code
Revision Changes Path
1.31 +3 -72 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- JettyService.java 2001/11/26 03:24:53 1.30
+++ JettyService.java 2001/11/26 23:39:22 1.31
@@ -5,39 +5,28 @@
* See terms of license at gnu.org.
*/
-// $Id: JettyService.java,v 1.30 2001/11/26 03:24:53 starksm Exp $
+// $Id: JettyService.java,v 1.31 2001/11/26 23:39:22 jules_gosnell Exp $
package org.jboss.jetty;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import java.util.Vector;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.log4j.Category;
import org.jboss.deployment.DeploymentException;
-import org.jboss.system.ServiceMBeanSupport;
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
import org.jboss.web.AbstractWebContainer;
import org.jboss.web.WebApplication;
-import org.mortbay.http.HttpServer;
-import org.mortbay.jetty.jmx.DebugMBean;
-import org.mortbay.jetty.jmx.JettyServerMBean;
-import org.mortbay.jetty.servlet.WebApplicationContext;
import org.mortbay.util.Log;
-import org.mortbay.xml.XmlConfiguration;
/**
* A service to launch jetty from JMX.
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Julian Gosnell</a>
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
*/
// NOTES
@@ -49,39 +38,9 @@
extends AbstractWebContainer
implements JettyServiceMBean, MBeanRegistration
{
-
- class DebugMBean
- extends org.mortbay.jetty.jmx.DebugMBean
- {
- public DebugMBean()
- throws
- javax.management.MBeanException,
- javax.management.InstanceNotFoundException
- {
- super();
- }
-
-// protected String
-// newObjectName(MBeanServer server)
-// {
-// //return super.newObjectName(server);
-// String name=uniqueObjectName(server, "Jetty"+":");
-// name=name.substring(0, name.length()-"Code=0".length())+"Debug";
-// return name;
-// }
-
- String
- hackNewObjectName(MBeanServer server)
- {
- return newObjectName(server);
- }
- }
-
-
public static final String NAME = "Jetty";
Category _log = Category.getInstance(getClass().getName());
- DebugMBean _debug = null;
JettyMBean _mbean = null;
Jetty _jetty = null;
MBeanServer _server = null;
@@ -138,29 +97,6 @@
/** the usual path separators we know */
protected final static String KNOWN_PATH_SEPARATORS=":;";
- /** tiny helper that converts classpath properties to the target platform */
- protected String convertPath(String original)
- {
- // should be set, but who knows
- String separator=System.getProperty("path.separator",";");
- boolean first=true;
- StringBuffer result=new StringBuffer();
- StringTokenizer tokenizer=new StringTokenizer(original,KNOWN_PATH_SEPARATORS);
- while(tokenizer.hasMoreTokens()) {
- if(!first) {
- result.append(separator);
- } else {
- first=false;
- }
- result.append(tokenizer.nextToken());
- }
- return result.toString();
- }
-
- /** this is the property in which Jasper expects the additional classpath
- */
- protected final static String TC_PATH_ADD="tc_path_add";
-
/**
* enter the jetty.properties file to the system properties such that
* Jasper will find the right jars to compile
@@ -177,9 +113,6 @@
System.getProperties().load(propertiesIn);
- // make sure that the tc_path_add property is correctly set
- //
System.setProperty(TC_PATH_ADD,convertPath(System.getProperty(TC_PATH_ADD,"")));
-
_log.info("loaded properties from: "+props);
}
@@ -209,8 +142,7 @@
_log.info("MBean peers WILL be created for Jetty Contexts");
_mbean = new JettyMBean(_jetty);
_server.registerMBean(_mbean, new ObjectName(_mbean.newObjectName(_server)));
- _debug = new DebugMBean();
- _server.registerMBean(_debug, new
ObjectName(_debug.hackNewObjectName(_server)));
+ _log.info(_mbean.newObjectName(_server));
}
catch (Throwable e)
{
@@ -300,7 +232,6 @@
_jetty.destroy();
_jetty=null;
_mbean=null;
- _debug=null;
}
else
_log.warn("WARNING: Jetty has already been destroyed");
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
