From 6de6b4defd7558b3849f2d28a7c2e26879895a2d Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 17 Jun 2013 22:16:05 +0200
Subject: [PATCH] SONAR-4157 downgrade to jetty 7.6 for compatibility with
 tomcat 6 (servlet 2.5)

---
 pom.xml                                      | 12 +++++++++---
 sonar-batch/pom.xml                          |  5 +++++
 sonar-plugin-api/pom.xml                     |  2 +-
 sonar-server/pom.xml                         |  2 +-
 sonar-server/src/dev/web.xml                 | 11 +++++++----
 sonar-server/src/main/webapp/WEB-INF/web.xml | 17 ++++++++++++-----
 sonar-ws-client/pom.xml                      |  8 +++++++-
 7 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5fa6116e92c..83257edf077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <sonarJava.version>1.3-RC1</sonarJava.version>
     <sonarGwt.version>3.3.1</sonarGwt.version>
     <h2.version>1.3.167</h2.version>
-    <jetty.version>8.1.9.v20130131</jetty.version>
+    <jetty.version>7.6.11.v20130520</jetty.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.min.version>2.2.1</maven.min.version>
     <jdk.min.version>1.6</jdk.min.version>
@@ -967,13 +967,19 @@
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.0.1</version>
+        <artifactId>servlet-api</artifactId>
+        <version>2.5</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
         <version>${jetty.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml
index ff132535d69..14d96eb04b0 100644
--- a/sonar-batch/pom.xml
+++ b/sonar-batch/pom.xml
@@ -93,6 +93,11 @@
       <artifactId>jetty-server</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.skyscreamer</groupId>
       <artifactId>jsonassert</artifactId>
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index 69529e7a48a..4c175261a50 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -127,7 +127,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <artifactId>servlet-api</artifactId>
       <optional>true</optional>
     </dependency>
 
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index ba963f5be3b..07630f30bbd 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -111,7 +111,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <artifactId>servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/sonar-server/src/dev/web.xml b/sonar-server/src/dev/web.xml
index fef16ea1aaf..601ccff04c5 100644
--- a/sonar-server/src/dev/web.xml
+++ b/sonar-server/src/dev/web.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
+<web-app
+  xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  metadata-complete="true"
+  version="2.5"
+>
 
   <display-name>Sonar</display-name>
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/web.xml b/sonar-server/src/main/webapp/WEB-INF/web.xml
index 2249a67997a..48e05712b44 100644
--- a/sonar-server/src/main/webapp/WEB-INF/web.xml
+++ b/sonar-server/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-         metadata-complete="true"
-         version="3.0">
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
   <display-name>Sonar</display-name>
 
@@ -48,6 +46,11 @@
     <filter-name>RackFilter</filter-name>
     <filter-class>org.jruby.rack.RackFilter</filter-class>
   </filter>
+  <filter>
+    <!-- compatibility with servlet 2.5 containers like tomcat 6 -->
+    <filter-name>ContinuationFilter</filter-name>
+    <filter-class>org.eclipse.jetty.continuation.ContinuationFilter</filter-class>
+  </filter>
   <filter>
     <filter-name>GZIPFilter</filter-name>
     <filter-class>org.eclipse.jetty.servlets.GzipFilter</filter-class>
@@ -60,6 +63,10 @@
       <param-value>16384</param-value>
     </init-param>
   </filter>
+  <filter-mapping>
+    <filter-name>ContinuationFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
   <filter-mapping>
     <filter-name>GZIPFilter</filter-name>
     <url-pattern>/*</url-pattern>
diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml
index eb61c38a516..5d09bdbb026 100644
--- a/sonar-ws-client/pom.xml
+++ b/sonar-ws-client/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.codehaus.sonar</groupId>
@@ -50,6 +51,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
-- 
2.39.5