Rename package from http to web

1 files changed, 0 insertions, 116 deletions

diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java
deleted file mode 100644
index 785d817e8..000000000
--- a/src/org/traccar/http/WebServer.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.http;
-
-import java.net.InetSocketAddress;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.traccar.Config;
-import org.traccar.helper.Log;
-
-/**
- * Integrated HTTP server
- */
-public class WebServer {
-
-    private Server server;
-    
-    private void initServer(Config config) {
-
-        String address = config.getString("web.address");
-        int port = config.getInteger("web.port", 8082);
-        if (address == null) {
-            server = new Server(port);
-        } else {
-            server = new Server(new InetSocketAddress(address, port));
-        }
-    }
-    
-    public WebServer(Config config, DataSource dataSource) {
-        
-        initServer(config);
-        
-        try {
-            javax.naming.Context context = new InitialContext();
-            context.bind("java:/DefaultDS", dataSource);
-        } catch (Exception error) {
-            Log.warning(error);
-        }
-
-        WebAppContext webapp = new WebAppContext();
-        webapp.setContextPath("/");
-        webapp.setWar(config.getString("web.application"));
-        server.setHandler(webapp);        
-    }
-
-    public WebServer(Config config) {
-        
-        initServer(config);
-
-        ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS);
-        servletHandler.setContextPath("/api");
-        servletHandler.addServlet(new ServletHolder(new AsyncServlet()), "/async/*");
-        servletHandler.addServlet(new ServletHolder(new ServerServlet()), "/server/*");
-        servletHandler.addServlet(new ServletHolder(new UserServlet()), "/user/*");
-        servletHandler.addServlet(new ServletHolder(new DeviceServlet()), "/device/*");
-        servletHandler.addServlet(new ServletHolder(new PositionServlet()), "/position/*");
-        servletHandler.addServlet(new ServletHolder(new CommandsServlet()), "/commands/*");
-        servletHandler.addServlet(new ServletHolder(new MainServlet()), "/*");
-
-        /*ResourceHandler mobileResourceHandler = new ResourceHandler();
-        mobileResourceHandler.setResourceBase(properties.getProperty("web.mobile"));
-        mobileResourceHandler.setWelcomeFiles(new String[] {"index.html"});
-        ContextHandler mobileContext = new ContextHandler("/m");
-        mobileContext.setHandler(mobileResourceHandler);*/
-
-        ResourceHandler resourceHandler = new ResourceHandler();
-        resourceHandler.setResourceBase(config.getString("web.path"));
-        if (config.getBoolean("web.debug")) {
-            resourceHandler.setWelcomeFiles(new String[] { "debug.html" });
-        } else {
-            resourceHandler.setWelcomeFiles(new String[] { "release.html" });
-        }
-
-        HandlerList handlerList = new HandlerList();
-        handlerList.setHandlers(new Handler[] {servletHandler, resourceHandler});
-
-        server.setHandler(handlerList);
-    }
-
-    public void start() {
-        try {
-            server.start();
-        } catch (Exception error) {
-            Log.warning(error);
-        }
-    }
-
-    public void stop() {
-        try {
-            server.stop();
-        } catch (Exception error) {
-            Log.warning(error);
-        }
-    }
-
-}