diff options
author | Abyss777 <abyss@fox5.ru> | 2016-06-24 09:36:20 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-06-24 09:36:20 +0500 |
commit | 52e7002ed39c333884529c3a0e8b4c6d23f0115e (patch) | |
tree | 57e93aa9381b391e0e3e18f8208a7e2b364d5c8d /src/org/traccar/web | |
parent | bd2e0fdc6fe222316e9e740aa265b6d132d407b6 (diff) | |
download | traccar-server-52e7002ed39c333884529c3a0e8b4c6d23f0115e.tar.gz traccar-server-52e7002ed39c333884529c3a0e8b4c6d23f0115e.tar.bz2 traccar-server-52e7002ed39c333884529c3a0e8b4c6d23f0115e.zip |
- Reverted changes in web-client
- Removed duplicate flag
Diffstat (limited to 'src/org/traccar/web')
-rw-r--r-- | src/org/traccar/web/WebServer.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index 2fa5c1a80..c06ee5d35 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -29,7 +29,6 @@ import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.traccar.Config; -import org.traccar.Context; import org.traccar.api.AsyncSocketServlet; import org.traccar.api.CorsResponseFilter; import org.traccar.api.ObjectMapperProvider; @@ -155,14 +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); - if (Context.getConfig().getBoolean("event.enable")) { - resourceConfig.registerClasses(EventResource.class); - } - if (Context.getConfig().getBoolean("geofence.enable")) { - resourceConfig.registerClasses(GeofenceResource.class, DeviceGeofenceResource.class, - GeofencePermissionResource.class, GroupGeofenceResource.class); - } + CommandTypeResource.class, EventResource.class, GeofenceResource.class, + DeviceGeofenceResource.class, GeofencePermissionResource.class, GroupGeofenceResource.class); servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/*"); handlers.addHandler(servletHandler); |