--- android/TrainInfoService/WebContent/WEB-INF/web.xml	2010/02/02 18:47:55	581
+++ android/TrainInfoService/WebContent/WEB-INF/web.xml	2010/05/18 20:58:04	735
@@ -9,6 +9,26 @@
     <welcome-file>default.htm</welcome-file>
     <welcome-file>default.jsp</welcome-file>
   </welcome-file-list>
+  <context-param>
+    <description>Bool: Describes whether to use normal bane.dk site or use the failover (bane.dk/lite)</description>
+    <param-name>usetempsite</param-name>
+    <param-value>false</param-value>
+  </context-param>
+  <context-param>
+    <description>Int: The error threshold for banedk circuitbreaker</description>
+    <param-name>banedk_threshold</param-name>
+    <param-value>5</param-value>
+  </context-param>
+  <context-param>
+    <description>Int: the timeout for an open banedk circuitbreaker (milliseconds) </description>
+    <param-name>banedk_timeout</param-name>
+    <param-value>60000</param-value>
+  </context-param>
+  <context-param>
+    <description>Int: how long should banedk results be cached (milliseconds) </description>
+    <param-name>cache_timeout</param-name>
+    <param-value>120000</param-value>
+  </context-param>
   <resource-ref>
     <description>
       Resource reference to a factory for java.sql.Connection
@@ -54,10 +74,6 @@
     <display-name>DepartureServlet</display-name>
     <servlet-name>DepartureServlet</servlet-name>
     <servlet-class>dk.thoerup.traininfoservice.banedk.DepartureServlet</servlet-class>
-    <init-param>
-    	<param-name>usetempsite</param-name>
-    	<param-value>false</param-value>
-    </init-param>
   </servlet>
   <servlet-mapping>
     <servlet-name>DepartureServlet</servlet-name>
@@ -68,33 +84,36 @@
     <display-name>TimetableServlet</display-name>
     <servlet-name>TimetableServlet</servlet-name>
     <servlet-class>dk.thoerup.traininfoservice.banedk.TimetableServlet</servlet-class>
-    <init-param>
-    	<param-name>usetempsite</param-name>
-    	<param-value>false</param-value>
-    </init-param>    
   </servlet>
   <servlet-mapping>
     <servlet-name>TimetableServlet</servlet-name>
     <url-pattern>/TimetableServlet</url-pattern>
   </servlet-mapping>
-
   <servlet>
     <description></description>
     <display-name>CircuitBreakerServlet</display-name>
     <servlet-name>CircuitBreakerServlet</servlet-name>
     <servlet-class>dk.thoerup.traininfoservice.CircuitBreakerServlet</servlet-class>
     <init-param>
-    	<param-name>readonly</param-name>
-    	<param-value>0</param-value>
+      <param-name>readonly</param-name>
+      <param-value>0</param-value>
     </init-param>
   </servlet>
-
   <servlet-mapping>
     <servlet-name>CircuitBreakerServlet</servlet-name>
     <url-pattern>/CircuitBreakerServlet</url-pattern>
   </servlet-mapping>
-
   <listener>
     <listener-class>dk.thoerup.traininfoservice.CircuitBreakerListener</listener-class>
   </listener>
+  <servlet>
+    <description></description>
+    <display-name>TestServlet</display-name>
+    <servlet-name>TestServlet</servlet-name>
+    <servlet-class>dk.thoerup.traininfoservice.TestServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>TestServlet</servlet-name>
+    <url-pattern>/TestServlet</url-pattern>
+  </servlet-mapping>
 </web-app>
\ No newline at end of file