diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java index e160d30be7..8453c46335 100644 --- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java +++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java @@ -24,10 +24,10 @@ import org.apache.activemq.artemis.dto.ComponentDTO; import org.apache.activemq.artemis.dto.WebServerDTO; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.server.handler.ResourceHandler; -import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.webapp.WebAppContext; public class WebServerComponent implements ExternalComponent @@ -44,7 +44,7 @@ public class WebServerComponent implements ExternalComponent String path = webServerConfig.path.startsWith("/") ? webServerConfig.path : "/" + webServerConfig.path; URI uri = new URI(webServerConfig.bind); server = new Server(); - org.eclipse.jetty.server.nio.SelectChannelConnector connector = new SelectChannelConnector(); + ServerConnector connector = new ServerConnector(server); connector.setPort(uri.getPort()); connector.setHost(uri.getHost()); @@ -92,7 +92,7 @@ public class WebServerComponent implements ExternalComponent public boolean isStarted() { - return false; + return server.isStarted(); } private void deployWar(String url, String warURL, String activeMQHome, String path) diff --git a/pom.xml b/pom.xml index e022695e6e..4ef69f1a43 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ scp://people.apache.org/x1/www/activemq.apache.org 4.0.28.Final + 9.2.11.v20150529 2.4 ${project.version} 1 @@ -437,7 +438,7 @@ org.eclipse.jetty.aggregate jetty-all - 8.1.16.v20140903 + ${jetty.version} @@ -757,9 +758,9 @@ 2.1 - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 + org.eclipse.jetty + jetty-maven-plugin + ${jetty.version} org.apache.maven.plugins