aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-12-17 18:08:53 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-12-17 18:08:53 +1300
commit2c1aee51f375885b3ee575425814ca8cbe6129ff (patch)
treec519ac6e8c55db26b017abc05cddc39d68c8ab95 /src/org/traccar/database
parent3b0019a516a732e1a0cdbde1d2ce58a1c96cf953 (diff)
downloadtraccar-server-2c1aee51f375885b3ee575425814ca8cbe6129ff.tar.gz
traccar-server-2c1aee51f375885b3ee575425814ca8cbe6129ff.tar.bz2
traccar-server-2c1aee51f375885b3ee575425814ca8cbe6129ff.zip
Implement changeset for version 3.0
Diffstat (limited to 'src/org/traccar/database')
-rw-r--r--src/org/traccar/database/DataManager.java25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index caf6d9db3..f905b4ded 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -19,6 +19,8 @@ import com.mchange.v2.c3p0.ComboPooledDataSource;
import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
@@ -160,22 +162,19 @@ public class DataManager implements IdentityManager {
if (config.getString("web.type", "new").equals("new") || config.getString("web.type", "new").equals("api")) {
- /*try {
- ResourceAccessor resourceAccessor = new FileSystemResourceAccessor();
+ /*ResourceAccessor resourceAccessor = new FileSystemResourceAccessor();
- Database database = DatabaseFactory.getInstance().openDatabase(
- config.getString("database.url"),
- config.getString("database.user"),
- config.getString("database.password"),
- null, resourceAccessor);
+ Database database = DatabaseFactory.getInstance().openDatabase(
+ config.getString("database.url"),
+ config.getString("database.user"),
+ config.getString("database.password"),
+ null, resourceAccessor);
- Liquibase liquibase = new Liquibase(
- config.getString("database.changelog"), new FileSystemResourceAccessor(), database);
+ Liquibase liquibase = new Liquibase(
+ config.getString("database.changelog"), resourceAccessor, database);
+
+ liquibase.update(new Contexts());*/
- liquibase.update(new Contexts());
- } catch (Exception e) {
- Log.warning(e);
- }*/
boolean exist = false;