aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-27 11:04:12 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-27 11:04:12 +1200
commita59b2ecb49216963163fbff1665e4f9e88bde889 (patch)
treede9f2c725571f68a378541ea528b9f885542bf31 /src/org/traccar
parentfe2a12db2143698fa61c57af87734af078ce52d9 (diff)
downloadtraccar-server-a59b2ecb49216963163fbff1665e4f9e88bde889.tar.gz
traccar-server-a59b2ecb49216963163fbff1665e4f9e88bde889.tar.bz2
traccar-server-a59b2ecb49216963163fbff1665e4f9e88bde889.zip
Use new web app by default
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/Context.java2
-rw-r--r--src/org/traccar/database/DataManager.java2
-rw-r--r--src/org/traccar/http/WebServer.java2
3 files changed, 3 insertions, 3 deletions
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");