diff options
-rw-r--r-- | setup/linux/traccar.xml | 3 | ||||
-rw-r--r-- | setup/macosx/traccar.xml | 3 | ||||
-rw-r--r-- | setup/windows/traccar.xml | 3 | ||||
-rw-r--r-- | src/org/traccar/http/WebServer.java | 7 |
4 files changed, 6 insertions, 10 deletions
diff --git a/setup/linux/traccar.xml b/setup/linux/traccar.xml index 99b66336a..593042985 100644 --- a/setup/linux/traccar.xml +++ b/setup/linux/traccar.xml @@ -9,8 +9,7 @@ <entry key='web.enable'>true</entry> <entry key='web.port'>8082</entry> <entry key='web.new'>true</entry> - <entry key='web.path'>web</entry> - <entry key='web.mobile'>webm</entry> + <entry key='web.path'>/opt/traccar/web</entry> <entry key='geocoder.enable'>true</entry> <entry key='geocoder.type'>google</entry> diff --git a/setup/macosx/traccar.xml b/setup/macosx/traccar.xml index 99b66336a..593042985 100644 --- a/setup/macosx/traccar.xml +++ b/setup/macosx/traccar.xml @@ -9,8 +9,7 @@ <entry key='web.enable'>true</entry> <entry key='web.port'>8082</entry> <entry key='web.new'>true</entry> - <entry key='web.path'>web</entry> - <entry key='web.mobile'>webm</entry> + <entry key='web.path'>/opt/traccar/web</entry> <entry key='geocoder.enable'>true</entry> <entry key='geocoder.type'>google</entry> diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml index 667dfbfb7..354ebffc1 100644 --- a/setup/windows/traccar.xml +++ b/setup/windows/traccar.xml @@ -9,8 +9,7 @@ <entry key='web.enable'>true</entry>
<entry key='web.port'>8082</entry>
<entry key='web.new'>true</entry>
- <entry key='web.path'>web</entry>
- <entry key='web.mobile'>webm</entry>
+ <entry key='web.path'>[WEB]</entry>
<entry key='geocoder.enable'>true</entry>
<entry key='geocoder.type'>google</entry>
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); |