From c91259f62618358ccf662a5d883f70df79ecbe65 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 1 Jun 2015 12:25:33 +1200 Subject: Add servlet for server settings --- src/org/traccar/http/ServerServlet.java | 48 +++++++++++++++++++++++++++++++++ src/org/traccar/http/WebServer.java | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/org/traccar/http/ServerServlet.java 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()), "/*"); -- cgit v1.2.3