aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/web/WebServer.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-05-09 14:47:28 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-05-09 14:47:28 +1200
commit4e44bf1fa20bf6ce41cc7e0eed9b79d079454f82 (patch)
treee145e20169c61e12bb57f9145bc0c626add5596d /src/org/traccar/web/WebServer.java
parent7ed27b733d442cb442a8049263fab282b39e5872 (diff)
parent301f2d314f446410da78615ac76ce0c07571d445 (diff)
downloadtrackermap-server-4e44bf1fa20bf6ce41cc7e0eed9b79d079454f82.tar.gz
trackermap-server-4e44bf1fa20bf6ce41cc7e0eed9b79d079454f82.tar.bz2
trackermap-server-4e44bf1fa20bf6ce41cc7e0eed9b79d079454f82.zip
Merge pull request #1920 from gaborgsomogyi/command_framework
Get supported commands from server
Diffstat (limited to 'src/org/traccar/web/WebServer.java')
-rw-r--r--src/org/traccar/web/WebServer.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index fc78dce65..8144af0b6 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -35,14 +35,15 @@ import org.traccar.api.ObjectMapperProvider;
import org.traccar.api.ResourceErrorHandler;
import org.traccar.api.SecurityRequestFilter;
import org.traccar.api.resource.CommandResource;
-import org.traccar.api.resource.DevicePermissionResource;
-import org.traccar.api.resource.DeviceResource;
import org.traccar.api.resource.GroupPermissionResource;
-import org.traccar.api.resource.GroupResource;
-import org.traccar.api.resource.PositionResource;
import org.traccar.api.resource.ServerResource;
import org.traccar.api.resource.SessionResource;
+import org.traccar.api.resource.DevicePermissionResource;
import org.traccar.api.resource.UserResource;
+import org.traccar.api.resource.GroupResource;
+import org.traccar.api.resource.DeviceResource;
+import org.traccar.api.resource.PositionResource;
+import org.traccar.api.resource.CommandTypeResource;
import org.traccar.helper.Log;
import javax.naming.InitialContext;
@@ -147,7 +148,7 @@ public class WebServer {
resourceConfig.register(CorsResponseFilter.class);
resourceConfig.registerClasses(ServerResource.class, SessionResource.class, CommandResource.class,
GroupPermissionResource.class, DevicePermissionResource.class, UserResource.class,
- GroupResource.class, DeviceResource.class, PositionResource.class);
+ GroupResource.class, DeviceResource.class, PositionResource.class, CommandTypeResource.class);
servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*");
handlers.addHandler(servletHandler);