From ef1b9605dc92de4bd68c899b30e7adb48a04ab53 Mon Sep 17 00:00:00 2001
From: "John D. Ament" <johndament@apache.org>
Date: Wed, 3 Jun 2015 22:10:51 -0400
Subject: [PATCH] ARTEMIS-119 Upgraded to Jetty 9.2.

---
 .../activemq/artemis/component/WebServerComponent.java   | 6 +++---
 pom.xml                                                  | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

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 @@
        <!-- base url for site deployment.  See distribution management for full url.  Override this in settings.xml for staging -->
       <staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
       <netty.version>4.0.28.Final</netty.version>
+      <jetty.version>9.2.11.v20150529</jetty.version>
       <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
       <activemq.version.versionName>${project.version}</activemq.version.versionName>
       <activemq.version.majorVersion>1</activemq.version.majorVersion>
@@ -437,7 +438,7 @@
          <dependency>
             <groupId>org.eclipse.jetty.aggregate</groupId>
             <artifactId>jetty-all</artifactId>
-            <version>8.1.16.v20140903</version>
+            <version>${jetty.version}</version>
             <!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
         </dependency>
         <dependency>
@@ -757,9 +758,9 @@
                <version>2.1</version>
             </plugin>
             <plugin>
-               <groupId>org.mortbay.jetty</groupId>
-               <artifactId>maven-jetty-plugin</artifactId>
-               <version>6.1.26</version>
+               <groupId>org.eclipse.jetty</groupId>
+               <artifactId>jetty-maven-plugin</artifactId>
+               <version>${jetty.version}</version>
             </plugin>
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>