aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-21 13:02:42 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-21 13:02:42 +1200
commitac454e7696cc2cedd953874d3cde3f78b3249328 (patch)
tree08f15094028c0a8111a46ebbe21908e3796864d7 /src/org/traccar
parent210cbf374881b06583145ee8aa784fc2b06a97f5 (diff)
downloadtraccar-server-ac454e7696cc2cedd953874d3cde3f78b3249328.tar.gz
traccar-server-ac454e7696cc2cedd953874d3cde3f78b3249328.tar.bz2
traccar-server-ac454e7696cc2cedd953874d3cde3f78b3249328.zip
Update web path config
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/http/WebServer.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java
index 9315ad059..622f2b6d4 100644
--- a/src/org/traccar/http/WebServer.java
+++ b/src/org/traccar/http/WebServer.java
@@ -20,7 +20,6 @@ import java.util.Properties;
import javax.naming.InitialContext;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -58,18 +57,18 @@ public class WebServer {
servletHandler.addServlet(new ServletHolder(new PositionServlet()), "/position/*");
servletHandler.addServlet(new ServletHolder(new MainServlet()), "/*");
- ResourceHandler mobileResourceHandler = new ResourceHandler();
+ /*ResourceHandler mobileResourceHandler = new ResourceHandler();
mobileResourceHandler.setResourceBase(properties.getProperty("web.mobile"));
mobileResourceHandler.setWelcomeFiles(new String[] {"index.html"});
ContextHandler mobileContext = new ContextHandler("/m");
- mobileContext.setHandler(mobileResourceHandler);
+ mobileContext.setHandler(mobileResourceHandler);*/
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setResourceBase(properties.getProperty("web.path"));
resourceHandler.setWelcomeFiles(new String[]{"index.html"});
HandlerList handlerList = new HandlerList();
- handlerList.setHandlers(new Handler[] {servletHandler, mobileContext, resourceHandler});
+ handlerList.setHandlers(new Handler[] {servletHandler, resourceHandler});
server.setHandler(handlerList);