diff options
| author | duke2906 <philipp.prangenberg@gmail.com> | 2016-09-26 15:09:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 15:09:20 +0200 |
| commit | 960bf899414d89221e92138fdb98777c3f4f73ec (patch) | |
| tree | 87f5fd96185aa5f2fff0f84e2e2fa8be379ee837 /src/org/traccar/web/WebServer.java | |
| parent | 0d3c05a24992eeeba02032e474d3a9bbb3239f10 (diff) | |
| parent | aaec58aec04256845dc37afd713b488071b1406b (diff) | |
| download | trackermap-server-960bf899414d89221e92138fdb98777c3f4f73ec.tar.gz trackermap-server-960bf899414d89221e92138fdb98777c3f4f73ec.tar.bz2 trackermap-server-960bf899414d89221e92138fdb98777c3f4f73ec.zip | |
Merge pull request #1 from tananaev/master
Update Changes, including version 3.7
Diffstat (limited to 'src/org/traccar/web/WebServer.java')
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index e022a9285..ec15ea2be 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -34,6 +34,7 @@ import org.traccar.api.CorsResponseFilter; import org.traccar.api.ObjectMapperProvider; import org.traccar.api.ResourceErrorHandler; import org.traccar.api.SecurityRequestFilter; +import org.traccar.api.resource.AttributeAliasResource; import org.traccar.api.resource.CommandResource; import org.traccar.api.resource.GroupPermissionResource; import org.traccar.api.resource.ServerResource; @@ -161,7 +162,7 @@ public class WebServer { GroupResource.class, DeviceResource.class, PositionResource.class, CommandTypeResource.class, EventResource.class, GeofenceResource.class, DeviceGeofenceResource.class, GeofencePermissionResource.class, GroupGeofenceResource.class, - NotificationResource.class, ReportResource.class); + NotificationResource.class, ReportResource.class, AttributeAliasResource.class); servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*"); handlers.addHandler(servletHandler); |