From 4f5f815f88e81000510ef2544e3e392fd7465d8e Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 9 Oct 2014 13:24:47 +1300
Subject: Integrate c3p0 database library

---
 src/org/traccar/ServerManager.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/ServerManager.java')

diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java
index 7c085d0be..2d3788720 100644
--- a/src/org/traccar/ServerManager.java
+++ b/src/org/traccar/ServerManager.java
@@ -40,8 +40,7 @@ import org.traccar.geocode.NominatimReverseGeocoder;
 import org.traccar.geocode.ReverseGeocoder;
 import org.traccar.helper.Log;
 import org.traccar.http.WebServer;
-import org.traccar.model.DataManager;
-import org.traccar.model.DatabaseDataManager;
+import org.traccar.database.DataManager;
 import org.traccar.protocol.*;
 
 /**
@@ -99,7 +98,7 @@ public class ServerManager {
             Log.setupLogger(properties);
         }
 
-        dataManager = new DatabaseDataManager(properties);
+        dataManager = new DataManager(properties);
 
         initGeocoder(properties);
 
@@ -178,7 +177,7 @@ public class ServerManager {
         
         // Initialize web server
         if (Boolean.valueOf(properties.getProperty("http.enable"))) {
-            webServer = new WebServer(properties);
+            webServer = new WebServer(properties, dataManager.getDataSource());
         }
     }
 
-- 
cgit v1.2.3