--- android/TrainInfoService/WebContent/WEB-INF/web.xml	2010/06/09 20:17:01	812
+++ android/TrainInfoService/WebContent/WEB-INF/web.xml	2010/09/08 12:31:55	1034
@@ -5,14 +5,11 @@
     <welcome-file>index.html</welcome-file>
     <welcome-file>index.htm</welcome-file>
     <welcome-file>index.jsp</welcome-file>
-    <welcome-file>default.html</welcome-file>
-    <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>
+    <description>Bool: Describes whether to use azure based trafikinfo.bane.dk site or use the old (www.bane.dk)</description>
+    <param-name>useazuresite</param-name>
+    <param-value>true</param-value>
   </context-param>
   <context-param>
     <description>Int: The error threshold for banedk circuitbreaker</description>
@@ -29,11 +26,16 @@
     <param-name>cache_timeout</param-name>
     <param-value>120000</param-value>
   </context-param>
-    <context-param>
+  <context-param>
     <description>Int: with which interval should statistics be save to DB (milliseconds) </description>
     <param-name>stats_interval</param-name>
     <param-value>300000</param-value>
   </context-param>
+  <context-param>  
+  	<description>Int: how long should the fetcher wait for bane.dk to reply (milliseconds)</description>
+  	<param-name>reply_timeout</param-name>
+  	<param-value>3000</param-value>
+  </context-param>
   <resource-ref>
     <description>
       Resource reference to a factory for java.sql.Connection
@@ -44,94 +46,5 @@
     <res-type>javax.sql.DataSource</res-type>
     <res-auth>Container</res-auth>
   </resource-ref>
-  <servlet>
-    <description></description>
-    <display-name>LocateStations</display-name>
-    <servlet-name>LocateStations</servlet-name>
-    <servlet-class>dk.thoerup.traininfoservice.LocateStations</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>LocateStations</servlet-name>
-    <url-pattern>/LocateStations</url-pattern>
-  </servlet-mapping>
-  <servlet>
-    <description></description>
-    <display-name>DumpResultSet</display-name>
-    <servlet-name>DumpResultSet</servlet-name>
-    <servlet-class>dk.thoerup.traininfoservice.DumpResultSet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>DumpResultSet</servlet-name>
-    <url-pattern>/DumpResultSet</url-pattern>
-  </servlet-mapping>
-  <servlet>
-    <description></description>
-    <display-name>LoadStations</display-name>
-    <servlet-name>LoadStations</servlet-name>
-    <servlet-class>dk.thoerup.traininfoservice.LoadStations</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>LoadStations</servlet-name>
-    <url-pattern>/LoadStations</url-pattern>
-  </servlet-mapping>
-  <servlet>
-    <description></description>
-    <display-name>DepartureServlet</display-name>
-    <servlet-name>DepartureServlet</servlet-name>
-    <servlet-class>dk.thoerup.traininfoservice.banedk.DepartureServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>DepartureServlet</servlet-name>
-    <url-pattern>/DepartureServlet</url-pattern>
-  </servlet-mapping>
-  <servlet>
-    <description></description>
-    <display-name>TimetableServlet</display-name>
-    <servlet-name>TimetableServlet</servlet-name>
-    <servlet-class>dk.thoerup.traininfoservice.banedk.TimetableServlet</servlet-class>
-  </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>
-    </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>
-  <servlet>
-    <description></description>
-    <display-name>RequestPlotter</display-name>
-    <servlet-name>RequestPlotter</servlet-name>
-    <servlet-class>dk.thoerup.traininfoservice.RequestPlotter</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>RequestPlotter</servlet-name>
-    <url-pattern>/RequestPlotter</url-pattern>
-  </servlet-mapping>
-  <listener>
-    <listener-class>dk.thoerup.traininfoservice.StatisticsListener</listener-class>
-  </listener>
+
 </web-app>
\ No newline at end of file