From a59b2ecb49216963163fbff1665e4f9e88bde889 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 27 Jun 2015 11:04:12 +1200 Subject: Use new web app by default --- src/org/traccar/Context.java | 2 +- src/org/traccar/database/DataManager.java | 2 +- src/org/traccar/http/WebServer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 058b60150..9d65f3e64 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -91,7 +91,7 @@ public class Context { dataManager = new DataManager(properties); dataCache = new DataCache(); - if (Boolean.valueOf(properties.getProperty("web.new"))) { + if (!Boolean.valueOf(properties.getProperty("web.old"))) { permissionsManager = new PermissionsManager(); } diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 92f19b903..8b1ff2c2e 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -139,7 +139,7 @@ public class DataManager { public void initDatabaseSchema() throws SQLException { - if (Boolean.valueOf(properties.getProperty("web.new"))) { + if (!Boolean.valueOf(properties.getProperty("web.old"))) { Connection connection = dataSource.getConnection(); ResultSet result = connection.getMetaData().getTables( diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java index 622f2b6d4..21e43b3d3 100644 --- a/src/org/traccar/http/WebServer.java +++ b/src/org/traccar/http/WebServer.java @@ -46,7 +46,7 @@ public class WebServer { server = new Server(new InetSocketAddress(address, port)); } - if (Boolean.valueOf(properties.getProperty("web.new"))) { + if (!Boolean.valueOf(properties.getProperty("web.old"))) { ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS); servletHandler.setContextPath("/api"); -- cgit v1.2.3