From a59b2ecb49216963163fbff1665e4f9e88bde889 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 27 Jun 2015 11:04:12 +1200
Subject: Use new web app by default

---
 debug.xml                                 | 4 ++--
 setup/linux/traccar.xml                   | 1 -
 setup/macosx/traccar.xml                  | 1 -
 setup/windows/traccar.xml                 | 1 -
 src/org/traccar/Context.java              | 2 +-
 src/org/traccar/database/DataManager.java | 2 +-
 src/org/traccar/http/WebServer.java       | 2 +-
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debug.xml b/debug.xml
index 6c2260816..c29b30937 100644
--- a/debug.xml
+++ b/debug.xml
@@ -9,8 +9,8 @@
     <entry key='web.enable'>true</entry>
     <!--<entry key='web.address'></entry>-->
     <entry key='web.port'>8082</entry>
-    <!--<entry key='web.application'>../traccar-web/traccar-web.war</entry>-->
-    <entry key='web.new'>true</entry>
+    <!--<entry key='web.application'>../traccar-web/traccar-web.war</entry>
+    <entry key='web.old'>true</entry>-->
     <entry key='web.path'>web</entry>
     <entry key='web.mobile'>webm</entry>
 
diff --git a/setup/linux/traccar.xml b/setup/linux/traccar.xml
index 593042985..10f9cceae 100644
--- a/setup/linux/traccar.xml
+++ b/setup/linux/traccar.xml
@@ -8,7 +8,6 @@
 
     <entry key='web.enable'>true</entry>
     <entry key='web.port'>8082</entry>
-    <entry key='web.new'>true</entry>
     <entry key='web.path'>/opt/traccar/web</entry>
 
     <entry key='geocoder.enable'>true</entry>
diff --git a/setup/macosx/traccar.xml b/setup/macosx/traccar.xml
index 593042985..10f9cceae 100644
--- a/setup/macosx/traccar.xml
+++ b/setup/macosx/traccar.xml
@@ -8,7 +8,6 @@
 
     <entry key='web.enable'>true</entry>
     <entry key='web.port'>8082</entry>
-    <entry key='web.new'>true</entry>
     <entry key='web.path'>/opt/traccar/web</entry>
 
     <entry key='geocoder.enable'>true</entry>
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index 354ebffc1..0663c2382 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -8,7 +8,6 @@
 
     <entry key='web.enable'>true</entry>
     <entry key='web.port'>8082</entry>
-    <entry key='web.new'>true</entry>
     <entry key='web.path'>[WEB]</entry>
 
     <entry key='geocoder.enable'>true</entry>
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