diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2014-10-09 13:24:47 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2014-10-09 13:24:47 +1300 |
| commit | 4f5f815f88e81000510ef2544e3e392fd7465d8e (patch) | |
| tree | 3e36831dacd62eb36242973517ff41fa069b272a /src/org/traccar/ServerManager.java | |
| parent | 21d69f45cd5badf52e175fc234c5c7bd3c2aeb35 (diff) | |
| download | trackermap-server-4f5f815f88e81000510ef2544e3e392fd7465d8e.tar.gz trackermap-server-4f5f815f88e81000510ef2544e3e392fd7465d8e.tar.bz2 trackermap-server-4f5f815f88e81000510ef2544e3e392fd7465d8e.zip | |
Integrate c3p0 database library
Diffstat (limited to 'src/org/traccar/ServerManager.java')
| -rw-r--r-- | src/org/traccar/ServerManager.java | 7 |
1 files changed, 3 insertions, 4 deletions
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()); } } |