Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more JMX fixes 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@178 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2009-04-22 06:17:24 +00:00
parent 2bd6ef266b
commit c555b7a0bf
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
View File

@ -62,7 +62,7 @@ public class WebAppDeployer extends AbstractLifeCycle
_configurationClasses=configurationClasses;
}
public HandlerContainer getContexts()
public HandlerCollection getContexts()
{
return _contexts;
}

2
jetty-jmx/src/main/java/org/eclipse/jetty/handler/jmx/ContextHandlerMBean.java → jetty-jmx/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java
View File

@ -11,7 +11,7 @@
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
package org.eclipse.jetty.handler.jmx;
package org.eclipse.jetty.server.handler.jmx;
import java.util.Enumeration;
import java.util.HashMap;

2
jetty-jmx/src/main/java/org/eclipse/jetty/webapp/jmx/WebAppContextMBean.java
View File

@ -13,7 +13,7 @@
package org.eclipse.jetty.webapp.jmx;
import org.eclipse.jetty.handler.jmx.ContextHandlerMBean;
import org.eclipse.jetty.server.handler.jmx.ContextHandlerMBean;
import org.eclipse.jetty.webapp.WebAppContext;
public class WebAppContextMBean extends ContextHandlerMBean

9
jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java
View File

@ -8,8 +8,10 @@ import org.eclipse.jetty.http.security.Password;
import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.webapp.WebAppContext;
public class DemoServer
@ -42,11 +44,16 @@ public class DemoServer
login.putUser("admin",new Password("password"),new String[]{"user","admin"});
server.addBean(login);
// ContextHandlerCollection
ContextHandlerCollection contexts = new ContextHandlerCollection();
server.setHandler(contexts);
// setup webapp
WebAppContext context = new WebAppContext();
context.setWar(args[0]);
context.setDefaultsDescriptor("../jetty-webapp/src/main/config/etc/webdefault.xml");
server.setHandler(context);
contexts.addHandler(context);
// start the server
server.start();