diff options
| author | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:36:18 +0200 |
|---|---|---|
| committer | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:39:03 +0200 |
| commit | 516ef6a30eb59e1b9c3aa297e3595c5acf665530 (patch) | |
| tree | 2bed5e621be4786816bbf3d6adabe41d2d43fbdb /src/org/traccar/web/WebServer.java | |
| parent | 5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff) | |
| parent | 59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff) | |
| download | trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.gz trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.bz2 trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.zip | |
Merge branch 'master' into command_framework
Diffstat (limited to 'src/org/traccar/web/WebServer.java')
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index e61bf3d45..bcb0442f6 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -15,13 +15,6 @@ */ package org.traccar.web; -import java.io.IOException; -import java.io.Writer; -import java.net.InetSocketAddress; -import javax.naming.InitialContext; -import javax.servlet.http.HttpServletRequest; -import javax.sql.DataSource; - import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.SessionManager; @@ -53,6 +46,13 @@ import org.traccar.api.resource.PositionResource; import org.traccar.api.resource.SupportedCommandResource; import org.traccar.helper.Log; +import javax.naming.InitialContext; +import javax.servlet.http.HttpServletRequest; +import javax.sql.DataSource; +import java.io.IOException; +import java.io.Writer; +import java.net.InetSocketAddress; + public class WebServer { private Server server; |