aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-04-14 11:57:43 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-04-14 11:57:43 +1200
commitf1bfd2e7e8791c8658f2196bc0ebd3f8294ac38e (patch)
tree9b81b90d6c4a78d205bdcea6d0df8230e9e44cb6 /src/org/traccar
parent15f3258905e964ab3b23d9c11fde4a1946ef10b0 (diff)
downloadtraccar-server-f1bfd2e7e8791c8658f2196bc0ebd3f8294ac38e.tar.gz
traccar-server-f1bfd2e7e8791c8658f2196bc0ebd3f8294ac38e.tar.bz2
traccar-server-f1bfd2e7e8791c8658f2196bc0ebd3f8294ac38e.zip
Add bytecode version check
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/Context.java5
-rw-r--r--src/org/traccar/geocoder/JsonGeocoder.java4
-rw-r--r--src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java4
-rw-r--r--src/org/traccar/geolocation/UniversalGeolocationProvider.java4
-rw-r--r--src/org/traccar/geolocation/UnwiredGeolocationProvider.java4
-rw-r--r--src/org/traccar/notification/EventForwarder.java2
6 files changed, 11 insertions, 12 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index e84e14b4c..1a35a2cb4 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -17,14 +17,13 @@ package org.traccar;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
+import com.ning.http.client.AsyncHttpClient;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Properties;
import org.apache.velocity.app.VelocityEngine;
-import org.asynchttpclient.AsyncHttpClient;
-import org.asynchttpclient.DefaultAsyncHttpClient;
import org.eclipse.jetty.util.URIUtil;
import org.traccar.database.AliasesManager;
import org.traccar.database.CalendarManager;
@@ -156,7 +155,7 @@ public final class Context {
return velocityEngine;
}
- private static final AsyncHttpClient ASYNC_HTTP_CLIENT = new DefaultAsyncHttpClient();
+ private static final AsyncHttpClient ASYNC_HTTP_CLIENT = new AsyncHttpClient();
public static AsyncHttpClient getAsyncHttpClient() {
return ASYNC_HTTP_CLIENT;
diff --git a/src/org/traccar/geocoder/JsonGeocoder.java b/src/org/traccar/geocoder/JsonGeocoder.java
index a914f26d8..6d1380729 100644
--- a/src/org/traccar/geocoder/JsonGeocoder.java
+++ b/src/org/traccar/geocoder/JsonGeocoder.java
@@ -15,8 +15,8 @@
*/
package org.traccar.geocoder;
-import org.asynchttpclient.AsyncCompletionHandler;
-import org.asynchttpclient.Response;
+import com.ning.http.client.AsyncCompletionHandler;
+import com.ning.http.client.Response;
import org.traccar.Context;
import javax.json.Json;
diff --git a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java
index 690a050e1..d6e45b550 100644
--- a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java
+++ b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java
@@ -15,8 +15,8 @@
*/
package org.traccar.geolocation;
-import org.asynchttpclient.AsyncCompletionHandler;
-import org.asynchttpclient.Response;
+import com.ning.http.client.AsyncCompletionHandler;
+import com.ning.http.client.Response;
import org.traccar.Context;
import org.traccar.model.CellTower;
import org.traccar.model.Network;
diff --git a/src/org/traccar/geolocation/UniversalGeolocationProvider.java b/src/org/traccar/geolocation/UniversalGeolocationProvider.java
index ee8ed78f2..6416b2633 100644
--- a/src/org/traccar/geolocation/UniversalGeolocationProvider.java
+++ b/src/org/traccar/geolocation/UniversalGeolocationProvider.java
@@ -16,8 +16,8 @@
package org.traccar.geolocation;
import com.fasterxml.jackson.core.JsonProcessingException;
-import org.asynchttpclient.AsyncCompletionHandler;
-import org.asynchttpclient.Response;
+import com.ning.http.client.AsyncCompletionHandler;
+import com.ning.http.client.Response;
import org.traccar.Context;
import org.traccar.model.Network;
diff --git a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java b/src/org/traccar/geolocation/UnwiredGeolocationProvider.java
index f9cef3de6..dcc5a4e7a 100644
--- a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java
+++ b/src/org/traccar/geolocation/UnwiredGeolocationProvider.java
@@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.asynchttpclient.AsyncCompletionHandler;
-import org.asynchttpclient.Response;
+import com.ning.http.client.AsyncCompletionHandler;
+import com.ning.http.client.Response;
import org.traccar.Context;
import org.traccar.model.CellTower;
import org.traccar.model.Network;
diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java
index 32556808c..bd7cfc0c5 100644
--- a/src/org/traccar/notification/EventForwarder.java
+++ b/src/org/traccar/notification/EventForwarder.java
@@ -16,7 +16,7 @@
package org.traccar.notification;
import com.fasterxml.jackson.core.JsonProcessingException;
-import org.asynchttpclient.BoundRequestBuilder;
+import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
import org.traccar.Context;
import org.traccar.helper.Log;
import org.traccar.model.Device;