aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-01 12:25:33 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-01 12:25:33 +1200
commitc91259f62618358ccf662a5d883f70df79ecbe65 (patch)
tree27a22a5f76826ce949ada40a35841fecd85a0ce4 /src/org
parentb2ccb23a541d5d927696385bdf96beb7f99348b2 (diff)
downloadtraccar-server-c91259f62618358ccf662a5d883f70df79ecbe65.tar.gz
traccar-server-c91259f62618358ccf662a5d883f70df79ecbe65.tar.bz2
traccar-server-c91259f62618358ccf662a5d883f70df79ecbe65.zip
Add servlet for server settings
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/http/ServerServlet.java48
-rw-r--r--src/org/traccar/http/WebServer.java2
2 files changed, 49 insertions, 1 deletions
diff --git a/src/org/traccar/http/ServerServlet.java b/src/org/traccar/http/ServerServlet.java
new file mode 100644
index 000000000..baac99084
--- /dev/null
+++ b/src/org/traccar/http/ServerServlet.java
@@ -0,0 +1,48 @@
+/*
+ * 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.http;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.traccar.Context;
+import org.traccar.model.Server;
+
+public class ServerServlet extends BaseServlet {
+
+ @Override
+ protected boolean handle(String command, HttpServletRequest req, HttpServletResponse resp) throws Exception {
+ if (command.equals("/get")) {
+ get(req, resp);
+ } else if (command.equals("/update")) {
+ update(req, resp);
+ } else {
+ return false;
+ }
+ return true;
+ }
+
+ private void get(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+ sendResponse(resp.getWriter(), JsonConverter.objectToJson(
+ Context.getDataManager().getServer()));
+ }
+
+ private void update(HttpServletRequest req, HttpServletResponse resp) throws Exception {
+ Context.getDataManager().updateServer(JsonConverter.objectFromJson(
+ req.getReader(), new Server()));
+ sendResponse(resp.getWriter(), true);
+ }
+
+}
diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java
index 4a7b029e1..c6dd6e04d 100644
--- a/src/org/traccar/http/WebServer.java
+++ b/src/org/traccar/http/WebServer.java
@@ -18,7 +18,6 @@ package org.traccar.http;
import java.net.InetSocketAddress;
import java.util.Properties;
import javax.naming.InitialContext;
-
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandler;
@@ -53,6 +52,7 @@ public class WebServer {
ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
servletHandler.setContextPath("/api");
servletHandler.addServlet(new ServletHolder(new AsyncServlet()), "/async/*");
+ servletHandler.addServlet(new ServletHolder(new DeviceServlet()), "/server/*");
servletHandler.addServlet(new ServletHolder(new DeviceServlet()), "/device/*");
servletHandler.addServlet(new ServletHolder(new PositionServlet()), "/position/*");
servletHandler.addServlet(new ServletHolder(new MainServlet()), "/*");