diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-09-22 17:51:23 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-22 17:51:23 +1200 |
| commit | 05cb432d786e3e4248b54dc47d457ebf9e33ba62 (patch) | |
| tree | 2534c50504dc2282417b5d14567155977d0c32fb /src/org/traccar/web | |
| parent | 55ee0b56cd1f668711b9ffc82e7d90961435b42f (diff) | |
| parent | c8816bdd85d62fb767795b2dc4d31326fdad9cd5 (diff) | |
| download | trackermap-server-05cb432d786e3e4248b54dc47d457ebf9e33ba62.tar.gz trackermap-server-05cb432d786e3e4248b54dc47d457ebf9e33ba62.tar.bz2 trackermap-server-05cb432d786e3e4248b54dc47d457ebf9e33ba62.zip | |
Merge pull request #2354 from Abyss777/device_attribute_aliases
Add attributes aliases
Diffstat (limited to 'src/org/traccar/web')
| -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); |