3 files changed, 74 insertions, 6 deletions

diff --git a/src/org/traccar/web/CommandServlet.java b/src/org/traccar/web/CommandServlet.java
index be2d50ccc..d307913df 100644
--- a/src/org/traccar/web/CommandServlet.java
+++ b/src/org/traccar/web/CommandServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.traccar.web;
 
 import javax.json.Json;
diff --git a/src/org/traccar/web/ConsoleServlet.java b/src/org/traccar/web/ConsoleServlet.java
new file mode 100644
index 000000000..b219eaba4
--- /dev/null
+++ b/src/org/traccar/web/ConsoleServlet.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.web;
+
+import org.h2.server.web.ConnectionInfo;
+import org.h2.server.web.WebServlet;
+import org.traccar.Context;
+import org.traccar.helper.Log;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class ConsoleServlet extends WebServlet {
+
+    @Override
+    public void init() {
+        super.init();
+
+        try {
+            Field field = WebServlet.class.getDeclaredField("server");
+            field.setAccessible(true);
+            org.h2.server.web.WebServer server = (org.h2.server.web.WebServer) field.get(this);
+
+            ConnectionInfo connectionInfo = new ConnectionInfo("Traccar|"
+                    + Context.getConfig().getString("database.driver") + "|"
+                    + Context.getConfig().getString("database.url") + "|"
+                    + Context.getConfig().getString("database.user"));
+
+            Method method = org.h2.server.web.WebServer.class.getDeclaredMethod("updateSetting", ConnectionInfo.class);
+            method.setAccessible(true);
+            method.invoke(server, connectionInfo);
+
+        } catch (NoSuchFieldException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
+            Log.warning(e);
+        }
+    }
+
+}
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 146dee613..0f9bf8181 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -61,6 +61,9 @@ public class WebServer {
                 break;
             case "new":
                 initApi();
+                if (config.getBoolean("web.console")) {
+                    initConsole();
+                }
                 initWebApp();
                 break;
             case "old":
@@ -118,12 +121,10 @@ public class WebServer {
         handlers.addHandler(servletHandler);
     }
 
-    private void initRestApi() {
-        ResourceConfig resourceConfig = new ResourceConfig();
-        resourceConfig.packages("org.traccar.api");
-        ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
-        ServletHolder servletHolder = new ServletHolder(new ServletContainer(resourceConfig));
-        servletHandler.addServlet(servletHolder, "/rest/*");
+    private void initConsole() {
+        ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        servletHandler.setContextPath("/console");
+        servletHandler.addServlet(new ServletHolder(new ConsoleServlet()), "/*");
         handlers.addHandler(servletHandler);
     }