[tor-commits] [onionoo/master] Upgrade to jetty9.

[karsten at torproject.org]

commit e9f62c16cd621565a3e2664f41c1bfd486cf1704
Author: iwakeh <iwakeh at torproject.org>
Date:   Thu Jul 6 08:22:11 2017 +0000

    Upgrade to jetty9.
    
    Jetty8 is EOL and not part of Debian stable anymore.
    Implements task-23069.
---
 CHANGELOG.md                 |  1 +
 build.xml                    | 24 ++++++++++++------------
 src/main/resources/jetty.xml | 17 +++++++++--------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 850e4c1..9e0f5e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
  * Medium changes
    - Add a parse history for imported descriptor archives.
+   - Upgrade to Jetty9 and other Debian stretch dependencies.
 
 
 # Changes in version 4.0-1.2.0 - 2017-02-28
diff --git a/build.xml b/build.xml
index d5aea73..df895b4 100644
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,7 @@
   <property name="release.version"
             value="${onionoo.protocol.version}-1.2.0-dev"/>
   <property name="metricslibversion" value="2.0.0"/>
-  <property name="jetty.version" value="-8.1.16.v20140903" />
+  <property name="jetty.version" value="-9.2.21.v20170120" />
   <property name="warfile"
             value="onionoo-${release.version}.war"/>
 
@@ -55,17 +55,17 @@
   </patternset>
 
   <patternset id="web" >
-    <include name="servlet-api-3.0.jar"/>
-    <include name="jetty8-server${jetty.version}.jar"/>
-    <include name="jetty8-servlets${jetty.version}.jar"/>
-    <include name="jetty8-servlet${jetty.version}.jar"/>
-    <include name="jetty8-util${jetty.version}.jar"/>
-    <include name="jetty8-http${jetty.version}.jar"/>
-    <include name="jetty8-io${jetty.version}.jar"/>
-    <include name="jetty8-xml${jetty.version}.jar"/>
-    <include name="jetty8-webapp${jetty.version}.jar"/>
-    <include name="jetty8-continuation${jetty.version}.jar"/>
-    <include name="jetty8-security${jetty.version}.jar"/>
+    <include name="servlet-api-3.1.jar"/>
+    <include name="jetty9-server${jetty.version}.jar"/>
+    <include name="jetty9-servlets${jetty.version}.jar"/>
+    <include name="jetty9-servlet${jetty.version}.jar"/>
+    <include name="jetty9-util${jetty.version}.jar"/>
+    <include name="jetty9-http${jetty.version}.jar"/>
+    <include name="jetty9-io${jetty.version}.jar"/>
+    <include name="jetty9-xml${jetty.version}.jar"/>
+    <include name="jetty9-webapp${jetty.version}.jar"/>
+    <include name="jetty9-continuation${jetty.version}.jar"/>
+    <include name="jetty9-security${jetty.version}.jar"/>
   </patternset>
 
   <patternset id="runtime" >
diff --git a/src/main/resources/jetty.xml b/src/main/resources/jetty.xml
index c172902..f2dce3d 100644
--- a/src/main/resources/jetty.xml
+++ b/src/main/resources/jetty.xml
@@ -5,13 +5,11 @@
 <Configure id="server" class="org.eclipse.jetty.server.Server" >
   <Set name="dumpAfterStart">false</Set>
 
-  <Set name="threadPool">
-    <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-      <Set name="minThreads">25</Set>
-      <Set name="maxThreads">250</Set>
-      <Set name="detailedDump">false</Set>
-    </New>
-  </Set>
+  <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
+    <Set name="minThreads">25</Set>
+    <Set name="maxThreads">250</Set>
+    <Set name="detailedDump">false</Set>
+  </New>
 
   <New id="webAppContext" class="org.eclipse.jetty.webapp.WebAppContext">
     <Set name="logUrlOnStart">true</Set>
@@ -24,7 +22,10 @@
 
   <Call name="addConnector">
     <Arg>
-      <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg>
+          <Ref id="server"/>
+        </Arg>
         <Set name="port">8080</Set>
       </New>
     </Arg>