aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pom.xml6
-rw-r--r--sonar-application/pom.xml2
-rw-r--r--sonar-application/src/main/assembly/conf/wrapper.conf15
-rw-r--r--sonar-batch/pom.xml2
-rw-r--r--sonar-plugin-api/pom.xml2
-rw-r--r--sonar-server/pom.xml2
-rw-r--r--sonar-server/src/dev/web.xml17
-rw-r--r--sonar-server/src/dev/webdefault.xml11
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/jetty-web.xml10
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/web.xml14
-rw-r--r--sonar-ws-client/pom.xml2
11 files changed, 33 insertions, 50 deletions
diff --git a/pom.xml b/pom.xml
index 864d2fd6402..a1510f2b770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<sonarJava.version>1.3</sonarJava.version>
<sonarGwt.version>3.3.1</sonarGwt.version>
<h2.version>1.3.172</h2.version>
- <jetty.version>7.6.11.v20130520</jetty.version>
+ <jetty.version>8.1.12.v20130726</jetty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.min.version>3.0.5</maven.min.version>
<maven.api.version>2.2.0</maven.api.version>
@@ -955,9 +955,9 @@
<version>3.0.1</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>3.0.20100224</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index eac47e09a19..52d2b28ad3f 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -44,7 +44,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index f6ae9409ada..0ef0bf41059 100644
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -2,10 +2,11 @@
wrapper.java.additional.1=-Djava.awt.headless=true
wrapper.java.additional.2=-XX:MaxPermSize=128m
wrapper.java.additional.3=-XX:+HeapDumpOnOutOfMemoryError
+wrapper.java.additional.4=-Dfile.encoding=UTF-8
# RECOMMENDED : uncomment if Java Virtual Machine is a JDK but not a JRE. To know which JVM you use, execute
# 'java -version'. JDK displays 'Server VM'.
-#wrapper.java.additional.4=-server
+#wrapper.java.additional.5=-server
# Initial Java Heap Size (in MB)
wrapper.java.initmemory=256
@@ -44,16 +45,16 @@ wrapper.app.parameter.1=org.sonar.application.StartServer
#********************************************************************
# Profiling and debbuging - for development only
-# If wrapper.java.additional.4=-server is not commented, parameter ids should start from 5 instead of 4.
+# If wrapper.java.additional.5=-server is not commented, parameter ids should start from 6 instead of 5.
#********************************************************************
# Java remote debugging
-#wrapper.java.additional.4=-agentlib:jdwp=transport=dt_socket,server=y,address=8000
+#wrapper.java.additional.5=-agentlib:jdwp=transport=dt_socket,server=y,address=8000
# JMX remote monitoring on Sun JVM (warning, security is disabled)
-#wrapper.java.additional.4=-Dcom.sun.management.jmxremote
-#wrapper.java.additional.5=-Dcom.sun.management.jmxremote.port=9005
-#wrapper.java.additional.6=-Dcom.sun.management.jmxremote.authenticate=false
-#wrapper.java.additional.7=-Dcom.sun.management.jmxremote.ssl=false
+#wrapper.java.additional.5=-Dcom.sun.management.jmxremote
+#wrapper.java.additional.6=-Dcom.sun.management.jmxremote.port=9005
+#wrapper.java.additional.7=-Dcom.sun.management.jmxremote.authenticate=false
+#wrapper.java.additional.8=-Dcom.sun.management.jmxremote.ssl=false
#********************************************************************
# Wrapper Logging Properties
diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml
index a982ade9b23..4c86b9e75f0 100644
--- a/sonar-batch/pom.xml
+++ b/sonar-batch/pom.xml
@@ -94,7 +94,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index df1fac38c6e..7d885fcb6eb 100644
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -126,7 +126,7 @@
<artifactId>xalan</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<optional>true</optional>
</dependency>
diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index ba327dd33dd..7b14a4d60ca 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -114,7 +114,7 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/sonar-server/src/dev/web.xml b/sonar-server/src/dev/web.xml
index 601ccff04c5..77bc34d5f59 100644
--- a/sonar-server/src/dev/web.xml
+++ b/sonar-server/src/dev/web.xml
@@ -1,13 +1,9 @@
<?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_2_5.xsd"
- metadata-complete="true"
- version="2.5"
->
-
- <display-name>Sonar</display-name>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ id="SonarQube" version="3.0">
+ <display-name>SonarQube</display-name>
<context-param>
<param-name>public.root</param-name>
@@ -106,6 +102,9 @@
<session-config>
<!-- in minutes -->
<session-timeout>20</session-timeout>
+ <cookie-config>
+ <http-only>true</http-only>
+ </cookie-config>
</session-config>
<listener>
diff --git a/sonar-server/src/dev/webdefault.xml b/sonar-server/src/dev/webdefault.xml
index e874fe74e18..3967afba965 100644
--- a/sonar-server/src/dev/webdefault.xml
+++ b/sonar-server/src/dev/webdefault.xml
@@ -17,13 +17,10 @@
<!-- by the jetty.xml file. -->
<!-- -->
<!-- ===================================================================== -->
-<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"
->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ id="SonarQube" version="3.0">
<description>
Default web.xml file.
diff --git a/sonar-server/src/main/webapp/WEB-INF/jetty-web.xml b/sonar-server/src/main/webapp/WEB-INF/jetty-web.xml
deleted file mode 100644
index 6274e74f9d4..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/jetty-web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
- <Get name="sessionHandler">
- <Get name="sessionManager">
- <Set name="httpOnly" type="boolean">true</Set>
- </Get>
- </Get>
-</Configure> \ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/web.xml b/sonar-server/src/main/webapp/WEB-INF/web.xml
index cb45bfae633..51e389f9639 100644
--- a/sonar-server/src/main/webapp/WEB-INF/web.xml
+++ b/sonar-server/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ id="SonarQube" version="3.0">
+ <display-name>SonarQube</display-name>
<context-param>
<param-name>public.root</param-name>
@@ -125,13 +125,9 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns
<session-config>
<!-- in minutes -->
<session-timeout>20</session-timeout>
- <!--
- Only servlet 3.0+. We're currently stuck at servlet 2.5. Meanwhile
- we use jetty-web.xml and META-INF/context.xml for Tomcat (see useHttpOnly attribute)
<cookie-config>
<http-only>true</http-only>
</cookie-config>
- -->
</session-config>
<listener>
diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml
index 7f29ceb4ac6..3d0d98ae3d6 100644
--- a/sonar-ws-client/pom.xml
+++ b/sonar-ws-client/pom.xml
@@ -51,7 +51,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 04:31:33 +0000