aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/web
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-06-01 15:28:54 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-06-01 15:28:54 +1200
commit3db183a5535a986b015566c6df929da8c6ca9630 (patch)
tree3183f44e2b9b8ccfa2c460221b1d04fa74f0e9e9 /src/org/traccar/web
parentcce427a783cbe0c2eca6a278d7327294002847e5 (diff)
parent41c46575a92f746622c61b07004b7a0832712a54 (diff)
downloadtrackermap-server-3db183a5535a986b015566c6df929da8c6ca9630.tar.gz
trackermap-server-3db183a5535a986b015566c6df929da8c6ca9630.tar.bz2
trackermap-server-3db183a5535a986b015566c6df929da8c6ca9630.zip
Merge pull request #1981 from Abyss777/master
Implement events subsystem
Diffstat (limited to 'src/org/traccar/web')
-rw-r--r--src/org/traccar/web/WebServer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java
index 8144af0b6..751db7a33 100644
--- a/src/org/traccar/web/WebServer.java
+++ b/src/org/traccar/web/WebServer.java
@@ -44,6 +44,7 @@ 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.api.resource.EventResource;
import org.traccar.helper.Log;
import javax.naming.InitialContext;
@@ -148,7 +149,8 @@ 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, CommandTypeResource.class);
+ GroupResource.class, DeviceResource.class, PositionResource.class,
+ CommandTypeResource.class, EventResource.class);
servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*");
handlers.addHandler(servletHandler);