diff --git a/http-service/pom.xml b/http-service/pom.xml
index f154e66376..9f3f822cc3 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -35,6 +35,10 @@
http-service
war
+
+ 9.3.6.v20151106
+
+
net.runelite
@@ -42,10 +46,37 @@
${project.version}
+
+ org.apache.tomcat
+ servlet-api
+ 6.0.53
+ provided
+
+
com.sparkjava
spark-core
2.5.5
+
+
+
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-webapp
+
+
+ org.eclipse.jetty.websocket
+ websocket-server
+
+
+ org.eclipse.jetty.websocket
+ websocket-servlet
+
+
org.sql2o
@@ -80,6 +111,7 @@
1.0.0
runtime
+
com.github.scribejava
scribejava-apis
@@ -98,6 +130,33 @@
1.10.19
test
+
+
+
+ org.eclipse.jetty
+ jetty-server
+ ${jetty.version}
+ test
+
+
+ org.eclipse.jetty
+ jetty-webapp
+ ${jetty.version}
+ test
+
+
+ org.eclipse.jetty.websocket
+ websocket-server
+ ${jetty.version}
+ test
+
+
+ org.eclipse.jetty.websocket
+ websocket-servlet
+ ${jetty.version}
+ test
+
+
com.google.inject.extensions
guice-testlib
diff --git a/http-service/src/main/java/net/runelite/http/service/SparkServlet.java b/http-service/src/main/java/net/runelite/http/service/SparkServlet.java
new file mode 100644
index 0000000000..5f4157a994
--- /dev/null
+++ b/http-service/src/main/java/net/runelite/http/service/SparkServlet.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2017, Adam
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.http.service;
+
+import java.io.IOException;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+import spark.globalstate.ServletFlag;
+import spark.http.matching.MatcherFilter;
+import spark.route.ServletRoutes;
+import spark.servlet.SparkApplication;
+import spark.staticfiles.StaticFilesConfiguration;
+
+public class SparkServlet extends HttpServlet
+{
+ private final SparkApplication service = new Service();
+
+ private final MatcherFilter matcherFilter;
+
+ public SparkServlet()
+ {
+ ServletFlag.runFromServlet();
+
+ service.init();
+
+ matcherFilter = new MatcherFilter(ServletRoutes.get(), StaticFilesConfiguration.servletInstance, true, false);
+ }
+
+ private void run(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ final String relativePath = req.getPathInfo();
+
+ HttpServletRequestWrapper requestWrapper = new HttpServletRequestWrapper(req)
+ {
+ @Override
+ public String getPathInfo()
+ {
+ return relativePath;
+ }
+
+ @Override
+ public String getRequestURI()
+ {
+ return relativePath;
+ }
+
+ };
+
+ FilterChain chain = (req2, resp2) ->
+ {
+ // Called if the matcherFilter ends up not setting a body
+ resp.setStatus(404);
+ };
+
+ matcherFilter.doFilter(requestWrapper, resp, chain);
+ }
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ run(req, resp);
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ run(req, resp);
+ }
+
+ @Override
+ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ run(req, resp);
+ }
+
+ @Override
+ protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ run(req, resp);
+ }
+}
diff --git a/http-service/src/main/webapp/WEB-INF/web.xml b/http-service/src/main/webapp/WEB-INF/web.xml
index 7dce4b86f3..47ba7366da 100644
--- a/http-service/src/main/webapp/WEB-INF/web.xml
+++ b/http-service/src/main/webapp/WEB-INF/web.xml
@@ -30,26 +30,15 @@
Runelite API
-
- SparkFilter
- spark.servlet.SparkFilter
-
- applicationClass
- net.runelite.http.service.Service
-
-
+
+ SparkServlet
+ net.runelite.http.service.SparkServlet
+
-
- SparkFilter
+
+ SparkServlet
/*
-
-
-
- Database Connection
- jdbc/runelite
- javax.sql.DataSource
- Container
-
+
com.commongroundpublishing.slf4j.impl.ServletContextLoggerSCL