summaryrefslogtreecommitdiffstats
path: root/build/package/WebContent
diff options
context:
space:
mode:
authorJani Laakso <jani.laakso@itmill.com>2008-04-11 14:24:24 +0000
committerJani Laakso <jani.laakso@itmill.com>2008-04-11 14:24:24 +0000
commit9f92df84e9f0a99fd765116522b4e5ed6722251f (patch)
treef3bc543517d2a631476bc9298bc27b1c9c6206b8 /build/package/WebContent
parentb0ccad9f0cd49013d969ca2ab7ab7f283fd6e77c (diff)
downloadvaadin-framework-9f92df84e9f0a99fd765116522b4e5ed6722251f.tar.gz
vaadin-framework-9f92df84e9f0a99fd765116522b4e5ed6722251f.zip
Added StatusServlet used by Toolkit Automated Testing project.
Default session lifetime is now 20 minutes. svn changeset:4165/svn branch:trunk
Diffstat (limited to 'build/package/WebContent')
-rw-r--r--build/package/WebContent/WEB-INF/web.xml20
1 files changed, 18 insertions, 2 deletions
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index 86ae7b7d29..686e74ddd9 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -11,6 +11,10 @@
IT Mill Toolkit examples
</description>
+ <session-config>
+ <session-timeout>20</session-timeout>
+ </session-config>
+
<!-- Permit use of IT Mill Testing Tools for this servlet container -->
<context-param>
<param-name>testingToolsActive</param-name>
@@ -270,7 +274,7 @@
</init-param>
</servlet>
- <!-- Automated tests used by Testing Tools plug-in client -->
+ <!-- Section begins: Automated tests used by Testing Tools plug-in client -->
<servlet>
<servlet-name>TestSimplestApplication</servlet-name>
<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
@@ -298,6 +302,12 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>StatusServlet</servlet-name>
+ <servlet-class>com.itmill.toolkit.automatedtests.util.StatusServlet</servlet-class>
+ </servlet>
+ <!-- Section ends: Automated tests used by Testing Tools plug-in client -->
+
<servlet-mapping>
<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
<url-pattern>/run/*</url-pattern>
@@ -414,7 +424,7 @@
<url-pattern>/NotificationDemo/*</url-pattern>
</servlet-mapping>
- <!-- Automated tests used by Testing Tools plug-in client -->
+ <!-- Section begins: Automated tests used by Testing Tools plug-in client -->
<servlet-mapping>
<servlet-name>TestSimplestApplication</servlet-name>
<url-pattern>/TestSimplestApplication/*</url-pattern>
@@ -429,6 +439,12 @@
<servlet-name>TestFeatureBrowser</servlet-name>
<url-pattern>/TestFeatureBrowser/*</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>StatusServlet</servlet-name>
+ <url-pattern>/StatusServlet/*</url-pattern>
+ </servlet-mapping>
+ <!-- Section ends: Automated tests used by Testing Tools plug-in client -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>