--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2011/04/04 08:59:46	1253
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/DepartureServlet.java	2011/04/19 11:52:39	1303
@@ -18,9 +18,10 @@
 
 import dk.thoerup.android.traininfo.common.DepartureBean;
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
-import dk.thoerup.traininfoservice.StationDAO;
 import dk.thoerup.traininfoservice.Statistics;
+import dk.thoerup.traininfoservice.TraininfoSettings;
 import dk.thoerup.traininfoservice.banedk.DepartureFetcher.FetchTrainType;
+import dk.thoerup.traininfoservice.db.StationDAO;
 
 /**
  * Servlet implementation class DepartureServlet
@@ -43,11 +44,9 @@
 	public void init() throws ServletException {
 		super.init();
 
-		boolean useAzureSite =  Boolean.parseBoolean( getServletContext().getInitParameter("useazuresite") );
-		int cacheTimeout =  Integer.parseInt( getServletContext().getInitParameter("cache_timeout") );
-		int replyTimeout =  Integer.parseInt( getServletContext().getInitParameter("reply_timeout") ); 
-		logger.info( "DepartureServlet, use azure site=" + useAzureSite + ", cache=" + cacheTimeout);
-		fetcher = new DepartureFetcher(useAzureSite, cacheTimeout, replyTimeout);
+
+		TraininfoSettings settings = (TraininfoSettings) getServletContext().getAttribute("settings");
+		fetcher = new DepartureFetcher(settings);
 		
 		/*
 		xslTransFact = TransformerFactory.newInstance();