Merge branch 'master' of https://github.com/tananaev/traccar

Conflicts:
	src/org/traccar/database/DataManager.java

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);