diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-06-18 11:56:59 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-18 11:56:59 +1200 |
| commit | b3b0cd9d6f2d26cef2e64ef38e23203f1f3fa51a (patch) | |
| tree | 2e8deb61d372095aebb8270f740501c8124ea8c4 /src/org/traccar/web/WebServer.java | |
| parent | d801cba474cd05bb088348f04e8557ca638cd74f (diff) | |
| parent | 82a78ff77a076231a8429f0dd84678d61c31d44a (diff) | |
| download | trackermap-server-b3b0cd9d6f2d26cef2e64ef38e23203f1f3fa51a.tar.gz trackermap-server-b3b0cd9d6f2d26cef2e64ef38e23203f1f3fa51a.tar.bz2 trackermap-server-b3b0cd9d6f2d26cef2e64ef38e23203f1f3fa51a.zip | |
Merge pull request #2012 from Abyss777/master
Implement Geofences on server side
Diffstat (limited to 'src/org/traccar/web/WebServer.java')
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index 751db7a33..c06ee5d35 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -44,7 +44,11 @@ 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.DeviceGeofenceResource; import org.traccar.api.resource.EventResource; +import org.traccar.api.resource.GeofencePermissionResource; +import org.traccar.api.resource.GeofenceResource; +import org.traccar.api.resource.GroupGeofenceResource; import org.traccar.helper.Log; import javax.naming.InitialContext; @@ -150,7 +154,8 @@ public class WebServer { resourceConfig.registerClasses(ServerResource.class, SessionResource.class, CommandResource.class, GroupPermissionResource.class, DevicePermissionResource.class, UserResource.class, GroupResource.class, DeviceResource.class, PositionResource.class, - CommandTypeResource.class, EventResource.class); + CommandTypeResource.class, EventResource.class, GeofenceResource.class, + DeviceGeofenceResource.class, GeofencePermissionResource.class, GroupGeofenceResource.class); servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*"); handlers.addHandler(servletHandler); |