aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/http
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/http')
-rw-r--r--src/org/traccar/http/MainServlet.java30
-rw-r--r--src/org/traccar/http/WebServer.java21
2 files changed, 29 insertions, 22 deletions
diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/http/MainServlet.java
index c924898e2..e569b4892 100644
--- a/src/org/traccar/http/MainServlet.java
+++ b/src/org/traccar/http/MainServlet.java
@@ -23,19 +23,14 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.traccar.database.DataManager;
+import org.json.JSONObject;
+import org.traccar.Context;
import org.traccar.helper.Log;
public class MainServlet extends HttpServlet {
private static final String USER_ID = "userId";
- private final DataManager dataManager;
-
- public MainServlet(DataManager dataManager) {
- this.dataManager = dataManager;
- }
-
@Override
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -43,6 +38,8 @@ 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")) {
@@ -72,11 +69,28 @@ public class MainServlet extends HttpServlet {
}
});
}
+
+ private void device(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+
+ long userId = 1;//(Long) req.getSession().getAttribute(USER_ID);
+
+ JSONObject result = new JSONObject();
+
+ try {
+ result.put("success", true);
+ result.put("data", Context.getDataManager().getDevices(userId));
+ } catch(SQLException error) {
+ result.put("success", false);
+ result.put("error", error.getMessage());
+ }
+
+ resp.getWriter().println(result.toString());
+ }
private void login(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
try {
req.getSession().setAttribute(USER_ID,
- dataManager.login(req.getParameter("name"), req.getParameter("password")));
+ Context.getDataManager().login(req.getParameter("name"), req.getParameter("password")));
resp.getWriter().println("{ success: true }");
} catch (SQLException e) {
throw new ServletException(e);
diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java
index e90ddfe9b..64dfdfbed 100644
--- a/src/org/traccar/http/WebServer.java
+++ b/src/org/traccar/http/WebServer.java
@@ -15,27 +15,18 @@
*/
package org.traccar.http;
-import java.io.IOException;
-import java.io.PrintWriter;
import java.net.InetSocketAddress;
import java.util.Properties;
-import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.traccar.database.DataManager;
+import org.traccar.Context;
import org.traccar.helper.Log;
/**
@@ -45,7 +36,9 @@ public class WebServer {
private Server server;
- public WebServer(Properties properties, DataManager dataManager) {
+ public WebServer() {
+ Properties properties = Context.getProps();
+
String address = properties.getProperty("http.address");
Integer port = Integer.valueOf(properties.getProperty("http.port", "8082"));
if (address == null) {
@@ -58,7 +51,7 @@ public class WebServer {
ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
servletHandler.setContextPath("/api");
- servletHandler.addServlet(new ServletHolder(new MainServlet(dataManager)), "/*");
+ servletHandler.addServlet(new ServletHolder(new MainServlet()), "/*");
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setResourceBase(properties.getProperty("http.path"));
@@ -72,8 +65,8 @@ public class WebServer {
} else {
try {
- Context context = new InitialContext();
- context.bind("java:/DefaultDS", dataManager.getDataSource());
+ javax.naming.Context context = new InitialContext();
+ context.bind("java:/DefaultDS", Context.getDataManager().getDataSource());
} catch (Exception error) {
Log.warning(error);
}