From 9d1480acee27e4a80de5be4e1db7df72796cea5e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 23 Aug 2014 22:55:55 +0200
Subject: [PATCH] update jetty to version 9.2.2.v20140723

---
 pom.xml                                       |   2 +-
 scm-clients/scm-cli-client/pom.xml            |  15 +--
 scm-clients/scm-client-impl/pom.xml           |  15 +--
 scm-plugin-backend/pom.xml                    |   5 +-
 scm-server/pom.xml                            |   6 -
 scm-server/src/main/conf/server-config.xml    | 126 ++++++------------
 .../main/java/sonia/scm/server/ScmServer.java |  11 +-
 scm-webapp/pom.xml                            |  48 +++----
 scm-webapp/src/main/conf/jetty.xml            |  42 ++++++
 9 files changed, 107 insertions(+), 163 deletions(-)
 create mode 100644 scm-webapp/src/main/conf/jetty.xml

diff --git a/pom.xml b/pom.xml
index e822496ea0..3c84ce2535 100644
--- a/pom.xml
+++ b/pom.xml
@@ -438,7 +438,7 @@
     <legman.version>1.2.0</legman.version>
     
     <!-- webserver -->
-    <jetty.version>7.6.15.v20140411</jetty.version>
+    <jetty.version>9.2.2.v20140723</jetty.version>
 
     <!-- security libraries -->
     <shiro.version>1.2.3</shiro.version>
diff --git a/scm-clients/scm-cli-client/pom.xml b/scm-clients/scm-cli-client/pom.xml
index 50b3c03c9d..5df700628d 100644
--- a/scm-clients/scm-cli-client/pom.xml
+++ b/scm-clients/scm-cli-client/pom.xml
@@ -166,7 +166,7 @@
           </plugin>
 
           <plugin>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
             <version>${jetty.version}</version>
             <configuration>
@@ -182,20 +182,13 @@
                   <value>UTF-8</value>
                 </systemProperty>
               </systemProperties>
-              <connectors>
-                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                  <port>8081</port>
-                  <maxIdleTime>60000</maxIdleTime>
-                  <requestHeaderSize>16384</requestHeaderSize>
-                </connector>
-              </connectors>
+              <httpConnector>
+                <port>8081</port>
+              </httpConnector>
               <webApp>
                 <contextPath>/scm</contextPath>
               </webApp>
               <war>${project.build.directory}/webapp/scm-webapp.war</war>
-              <source>${project.build.javaLevel}</source>
-              <target>${project.build.javaLevel}</target>
-              <encoding>${project.build.sourceEncoding}</encoding>
               <scanIntervalSeconds>0</scanIntervalSeconds>
               <daemon>true</daemon>
             </configuration>
diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml
index 8bfe7af4a9..45e7069988 100644
--- a/scm-clients/scm-client-impl/pom.xml
+++ b/scm-clients/scm-client-impl/pom.xml
@@ -168,7 +168,7 @@
           </plugin>
       
           <plugin>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
             <version>${jetty.version}</version>
             <configuration>
@@ -184,20 +184,13 @@
                   <value>UTF-8</value>
                 </systemProperty>
               </systemProperties>
-              <connectors>
-                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                  <port>8081</port>
-                  <maxIdleTime>60000</maxIdleTime>
-                  <requestHeaderSize>16384</requestHeaderSize>
-                </connector>
-              </connectors>
+              <httpConnector>
+                <port>8081</port>
+              </httpConnector>
               <webApp>
                 <contextPath>/scm</contextPath>
               </webApp>
               <war>${project.build.directory}/webapp/scm-webapp.war</war>
-              <source>${project.build.javaLevel}</source>
-              <target>${project.build.javaLevel}</target>
-              <encoding>${project.build.sourceEncoding}</encoding>
               <scanIntervalSeconds>0</scanIntervalSeconds>
               <daemon>true</daemon>
             </configuration>
diff --git a/scm-plugin-backend/pom.xml b/scm-plugin-backend/pom.xml
index 97487a169e..08ce0b2493 100644
--- a/scm-plugin-backend/pom.xml
+++ b/scm-plugin-backend/pom.xml
@@ -137,7 +137,7 @@
       </plugin>
 
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>${jetty.version}</version>
         <configuration>
@@ -146,9 +146,6 @@
           <webApp>
             <contextPath>/scm-plugin-backend</contextPath>
           </webApp>
-          <source>${project.build.javaLevel}</source>
-          <target>${project.build.javaLevel}</target>
-          <encoding>${project.build.sourceEncoding}</encoding>
           <scanIntervalSeconds>0</scanIntervalSeconds>
         </configuration>
       </plugin>
diff --git a/scm-server/pom.xml b/scm-server/pom.xml
index dd04797de3..6b5f12f9dc 100644
--- a/scm-server/pom.xml
+++ b/scm-server/pom.xml
@@ -41,12 +41,6 @@
       <version>${jetty.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-ajp</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-
   </dependencies>
 
   <build>
diff --git a/scm-server/src/main/conf/server-config.xml b/scm-server/src/main/conf/server-config.xml
index f55553ab45..dd89ba65ae 100644
--- a/scm-server/src/main/conf/server-config.xml
+++ b/scm-server/src/main/conf/server-config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 <!--
 
     Copyright (c) 2010, Sebastian Sdorra
@@ -41,36 +41,58 @@
         Purpose of the document follows.
 -->
 
-<Configure class="org.eclipse.jetty.server.Server">
+<Configure id="ScmServer" class="org.eclipse.jetty.server.Server">
 
+  <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+    <!-- increase header size for mercurial -->
+    <Set name="requestHeaderSize">16384</Set>
+    <Set name="responseHeaderSize">16384</Set>
+
+    <!-- forwarding
+    <Call name="addCustomizer">
+      <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg>
+    </Call>
+    -->
+  </New>
+  
+  <!--
+  Connectors
+  -->
   <Call name="addConnector">
     <Arg>
-      <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
-        <Set name="host">
-          <SystemProperty name="jetty.host" />
-        </Set>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server">
+          <Ref refid="ScmServer" />
+        </Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config">
+                  <Ref refid="httpConfig" />
+                </Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
         <Set name="port">
           <SystemProperty name="jetty.port" default="8080" />
         </Set>
-        <Set name="requestHeaderSize">16384</Set>
-        <!-- for mod_proxy -->
-        <!--
-        <Set name="forwarded">true</Set>
-        -->
       </New>
     </Arg>
   </Call>
 
   <New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
     <Set name="contextPath">/scm</Set>
-    <Set name="war"><SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war</Set>
+    <Set name="war">
+      <SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war</Set>
     <!-- disable directory listings -->
     <Call name="setInitParameter">
       <Arg>org.eclipse.jetty.servlet.Default.dirAllowed</Arg>
       <Arg>false</Arg>
     </Call>
     <Set name="tempDirectory">
-      <SystemProperty name="basedir" default="."/>/work
+      <SystemProperty name="basedir" default="."/>/work/scm
     </Set>
   </New>
 
@@ -80,13 +102,14 @@
       <New class="org.eclipse.jetty.util.resource.ResourceCollection">
         <Arg>
           <Array type="java.lang.String">
-            <Item><SystemProperty name="basedir" default="."/>/var/webapp/docroot</Item>
+            <Item>
+              <SystemProperty name="basedir" default="."/>/var/webapp/docroot</Item>
           </Array>
         </Arg>
       </New>
     </Set>
     <Set name="tempDirectory">
-      <SystemProperty name="basedir" default="."/>/work
+      <SystemProperty name="basedir" default="."/>/work/docroot
     </Set>
   </New>
   
@@ -100,82 +123,9 @@
           <Item>
             <Ref id="docroot" />
           </Item>
-          <!--
-          <Item>
-            <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
-          </Item>
-          -->
         </Array>
       </Set>
     </New>
   </Set>
-  
-  <!-- request logging -->
-  <!--
-  <Ref id="RequestLog">
-    <Set name="requestLog">
-      <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
-        <Arg><SystemProperty name="basedir" default="."/>/var/log/yyyy_mm_dd.request.log</Arg>
-        <Set name="retainDays">90</Set>
-        <Set name="append">true</Set>
-        <Set name="extended">false</Set>
-        <Set name="LogTimeZone">GMT</Set>
-       </New>
-    </Set>
-  </Ref>
-  -->
-
-  <!-- mod_proxy_ajp or mod_jk -->
-  <!--
-  <Call name="addConnector">
-    <Arg>
-       <New class="org.eclipse.jetty.ajp.Ajp13SocketConnector">
-         <Set name="port">8009</Set>
-       </New>
-    </Arg>
-  </Call>
-  -->
-
-  <!-- SSL-Connector -->
-  <!--
-     Documentation for the SSL-Connector: 
-     http://wiki.eclipse.org/Jetty/Reference/SSL_Connectors
-  -->
-  <!--
-  <Call name="addConnector">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
-        <Set name="Port">8181</Set>
-        <Set name="maxIdleTime">30000</Set>
-        <Set name="requestHeaderSize">16384</Set>
-        <Set name="keystore"><SystemProperty name="basedir" default="." />/conf/keystore.jks</Set>
-        <Set name="password">OBF:xxx</Set>
-        <Set name="keyPassword">OBF:xxx</Set>
-        <Set name="truststore"><SystemProperty name="basedir" default="." />/conf/keystore.jks</Set>
-        <Set name="trustPassword">OBF:xxx</Set>
-      </New>
-    </Arg>
-  </Call>
-  -->
-
-  <!-- JMX support -->
-  <!--
-  <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
-    name="getPlatformMBeanServer" />
-
-  <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
-    <Arg>
-      <Ref id="MBeanServer" />
-    </Arg>
-  </New>
-
-  <Get id="Container" name="container">
-    <Call name="addEventListener">
-      <Arg>
-        <Ref id="MBeanContainer" />
-      </Arg>
-    </Call>
-  </Get>
-  -->
 
 </Configure>
diff --git a/scm-server/src/main/java/sonia/scm/server/ScmServer.java b/scm-server/src/main/java/sonia/scm/server/ScmServer.java
index 507e12a37f..07b0593386 100644
--- a/scm-server/src/main/java/sonia/scm/server/ScmServer.java
+++ b/scm-server/src/main/java/sonia/scm/server/ScmServer.java
@@ -99,16 +99,9 @@ public class ScmServer extends Thread
 
       server.join();
     }
-    catch (Exception ex)
+    catch (InterruptedException ex)
     {
-      if (ex instanceof ScmServerException)
-      {
-        throw(ScmServerException) ex;
-      }
-      else
-      {
-        throw new ScmServerException("could not start scm-server", ex);
-      }
+      throw new ScmServerException("could not start scm-server", ex);
     }
   }
 
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 126c63e60f..f19cdc5938 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -451,10 +451,13 @@
       </plugin>
 
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>${jetty.version}</version>
         <configuration>
+          <httpConnector>
+            <port>8081</port>
+          </httpConnector>
           <stopPort>8005</stopPort>
           <stopKey>STOP</stopKey>
           <systemProperties>
@@ -471,19 +474,10 @@
               <value>true</value>
             </systemProperty>
           </systemProperties>
-          <connectors>
-            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-              <port>8081</port>
-              <maxIdleTime>60000</maxIdleTime>
-              <requestHeaderSize>16384</requestHeaderSize>
-            </connector>
-          </connectors>
           <webApp>
             <contextPath>/scm</contextPath>
           </webApp>
-          <source>${project.build.javaLevel}</source>
-          <target>${project.build.javaLevel}</target>
-          <encoding>${project.build.sourceEncoding}</encoding>
+          <jettyXml>${project.basedir}/src/main/conf/jetty.xml</jettyXml>
           <scanIntervalSeconds>0</scanIntervalSeconds>
         </configuration>
       </plugin>        
@@ -587,10 +581,13 @@
           </plugin>
 
           <plugin>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
             <version>${jetty.version}</version>
             <configuration>
+              <httpConnector>
+                <port>8081</port>
+              </httpConnector>
               <stopPort>8085</stopPort>
               <stopKey>STOP</stopKey>
               <systemProperties>
@@ -599,16 +596,7 @@
                   <value>target/scm-it</value>
                 </systemProperty>
               </systemProperties>
-              <connectors>
-                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                  <port>8081</port>
-                  <maxIdleTime>60000</maxIdleTime>
-                  <requestHeaderSize>16384</requestHeaderSize>
-                </connector>
-              </connectors>
-              <source>${project.build.javaLevel}</source>
-              <target>${project.build.javaLevel}</target>
-              <encoding>${project.build.sourceEncoding}</encoding>
+              <jettyXml>${project.basedir}/src/main/conf/jetty.xml</jettyXml>
               <scanIntervalSeconds>0</scanIntervalSeconds>
               <daemon>true</daemon>
             </configuration>
@@ -667,10 +655,13 @@
           </plugin>
           
           <plugin>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
             <version>${jetty.version}</version>
             <configuration>
+              <httpConnector>
+                <port>8082</port>
+              </httpConnector>
               <stopPort>8086</stopPort>
               <stopKey>STOP</stopKey>
               <systemProperties>
@@ -679,16 +670,7 @@
                   <value>target/scm-it</value>
                 </systemProperty>
               </systemProperties>
-              <connectors>
-                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                  <port>8082</port>
-                  <maxIdleTime>60000</maxIdleTime>
-                  <requestHeaderSize>16384</requestHeaderSize>
-                </connector>
-              </connectors>
-              <source>${project.build.javaLevel}</source>
-              <target>${project.build.javaLevel}</target>
-              <encoding>${project.build.sourceEncoding}</encoding>
+              <jettyXml>${project.basedir}/src/main/conf/jetty.xml</jettyXml>
               <scanIntervalSeconds>0</scanIntervalSeconds>
               <daemon>true</daemon>
             </configuration>
diff --git a/scm-webapp/src/main/conf/jetty.xml b/scm-webapp/src/main/conf/jetty.xml
new file mode 100644
index 0000000000..6abd6e54c7
--- /dev/null
+++ b/scm-webapp/src/main/conf/jetty.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
+<!--*
+Copyright (c) 2010, Sebastian Sdorra
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of SCM-Manager; nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+http://bitbucket.org/sdorra/scm-manager
+
+-->
+
+<Configure id="ScmServer" class="org.eclipse.jetty.server.Server">
+
+  <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+    <!-- increase header size for mercurial -->
+    <Set name="requestHeaderSize">16384</Set>
+    <Set name="responseHeaderSize">16384</Set>
+  </New>
+  
+</Configure>
\ No newline at end of file