summaryrefslogtreecommitdiffstats
path: root/sonar-server/src/dev/web.xml
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2011-02-02 11:29:19 +0100
committersimonbrandhof <simon.brandhof@gmail.com>2011-02-02 11:32:11 +0100
commitd5d6d99b766bf32448b9544d80a5cabe242196c5 (patch)
tree7a91523e9ccf4f46d3b98e8ddb58e8c159a57733 /sonar-server/src/dev/web.xml
parentc75f06d423d330fcd85ffcca92a58dfb5db8e77b (diff)
downloadsonarqube-d5d6d99b766bf32448b9544d80a5cabe242196c5.tar.gz
sonarqube-d5d6d99b766bf32448b9544d80a5cabe242196c5.zip
SONAR-1302 Upgrade to rails 2.3.5 to fix session expiration
Diffstat (limited to 'sonar-server/src/dev/web.xml')
-rw-r--r--sonar-server/src/dev/web.xml35
1 files changed, 24 insertions, 11 deletions
diff --git a/sonar-server/src/dev/web.xml b/sonar-server/src/dev/web.xml
index 5943fb50f09..eb572468163 100644
--- a/sonar-server/src/dev/web.xml
+++ b/sonar-server/src/dev/web.xml
@@ -7,6 +7,17 @@
<display-name>Sonar</display-name>
<context-param>
+ <param-name>public.root</param-name>
+ <param-value>/</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>rails.env</param-name>
+ <param-value>development</param-value>
+ </context-param>
+
+
+ <context-param>
<param-name>jruby.min.runtimes</param-name>
<param-value>1</param-value>
</context-param>
@@ -29,12 +40,7 @@
</filter>
<filter>
<filter-name>RackFilter</filter-name>
- <filter-class>org.sonar.server.ui.SonarRackFilter</filter-class>
- <init-param>
- <description>List of files extensions that will not be processed by the rack filter</description>
- <param-name>exclusions</param-name>
- <param-value>gif,png,ico,jpg,jpeg,css,js</param-value>
- </init-param>
+ <filter-class>org.jruby.rack.RackFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>DatabaseSessionFilter</filter-name>
@@ -57,6 +63,10 @@
<servlet-name>static</servlet-name>
<servlet-class>org.sonar.server.plugins.StaticResourcesServlet</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>batch</servlet-name>
+ <servlet-class>org.sonar.server.plugins.BatchResourcesServlet</servlet-class>
+ </servlet>
<servlet-mapping>
<servlet-name>chart</servlet-name>
@@ -70,16 +80,19 @@
<servlet-name>static</servlet-name>
<url-pattern>/static/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>batch</servlet-name>
+ <url-pattern>/batch/*</url-pattern>
+ </servlet-mapping>
<listener>
<listener-class>org.sonar.server.platform.PlatformLifecycleListener</listener-class>
</listener>
<listener>
+ <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class>
+ </listener>
+ <listener>
<listener-class>ch.qos.logback.classic.selector.servlet.ContextDetachingSCL</listener-class>
</listener>
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
-</web-app> \ No newline at end of file
+</web-app>