aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/http/MainServlet.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-04-27 15:24:31 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-04-27 15:24:31 +1200
commitf61e2b5c21c1df4da2c8aa77e4bf33589b4b49a6 (patch)
treea3cd68ec873e9d4e26340a845c73467dfce9e4f0 /src/org/traccar/http/MainServlet.java
parentba9551ce3e4a3aade38d5f3b2ac7dee9d022a466 (diff)
downloadtrackermap-server-f61e2b5c21c1df4da2c8aa77e4bf33589b4b49a6.tar.gz
trackermap-server-f61e2b5c21c1df4da2c8aa77e4bf33589b4b49a6.tar.bz2
trackermap-server-f61e2b5c21c1df4da2c8aa77e4bf33589b4b49a6.zip
Separate Servlet for devices
Diffstat (limited to 'src/org/traccar/http/MainServlet.java')
-rw-r--r--src/org/traccar/http/MainServlet.java21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/http/MainServlet.java
index 74a3bb3d5..a3eae4e55 100644
--- a/src/org/traccar/http/MainServlet.java
+++ b/src/org/traccar/http/MainServlet.java
@@ -16,11 +16,9 @@
package org.traccar.http;
import java.io.IOException;
-import java.security.Permission;
import java.sql.SQLException;
import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.json.Json;
@@ -53,8 +51,6 @@ public class MainServlet extends HttpServlet {
if (command.equals("/async")) {
async(req.startAsync());
- } else if (command.startsWith("/device")) {
- device(req, resp);
} else if (command.equals("/login")) {
login(req, resp);
} else if (command.equals("/logout")) {
@@ -212,23 +208,6 @@ public class MainServlet extends HttpServlet {
asyncSessions.get(userId).request(context);
}
}
-
- private void device(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-
- long userId = (Long) req.getSession().getAttribute(USER_ID);
-
- JsonObjectBuilder result = Json.createObjectBuilder();
-
- try {
- result.add("success", true);
- result.add("data", Context.getDataManager().getDevices(userId));
- } catch(SQLException error) {
- result.add("success", false);
- result.add("error", error.getMessage());
- }
-
- resp.getWriter().println(result.build().toString());
- }
private void login(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
try {