diff --git a/SubServers.Web/pom.xml b/SubServers.Web/pom.xml
index 9541da89..5c351648 100644
--- a/SubServers.Web/pom.xml
+++ b/SubServers.Web/pom.xml
@@ -42,12 +42,17 @@
org.eclipse.jetty
jetty-server
- 9.4.3.v20170317
+ 11.0.11
org.eclipse.jetty
jetty-servlet
- 9.4.3.v20170317
+ 11.0.11
+
+
+ com.google.code.gson
+ gson
+ 2.9.1
@@ -112,7 +117,7 @@
maven-assembly-plugin
2.2-beta-5
- SubServers.Console
+ SubServers.Web
../Artifacts/Plugins
jar-with-dependencies
diff --git a/SubServers.Web/src/net/ME1312/SubServers/Web/ExternalMain.java b/SubServers.Web/src/net/ME1312/SubServers/Web/ExternalMain.java
new file mode 100644
index 00000000..0d42c4ad
--- /dev/null
+++ b/SubServers.Web/src/net/ME1312/SubServers/Web/ExternalMain.java
@@ -0,0 +1,8 @@
+package net.ME1312.SubServers.Web;
+
+public class ExternalMain {
+ public static void main(String[] args) throws Exception {
+ JettyServer server = new JettyServer();
+ server.start();
+ }
+}
diff --git a/SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java b/SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java
index c213c035..68b89b4b 100644
--- a/SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java
+++ b/SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java
@@ -1,6 +1,6 @@
package net.ME1312.SubServers.Web;
-import net.ME1312.SubServers.Web.endpoints.BlockingServlet;
+import net.ME1312.SubServers.Web.endpoints.StatusServlet;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -17,7 +17,7 @@ public class JettyServer {
ServletHandler handler = new ServletHandler();
server.setHandler(handler);
- handler.addServletWithMapping(BlockingServlet.class, "/status");
+ handler.addServletWithMapping(StatusServlet.class, "/status");
server.start();
}
}
\ No newline at end of file
diff --git a/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/BlockingServlet.java b/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/BlockingServlet.java
deleted file mode 100644
index 54694311..00000000
--- a/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/BlockingServlet.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package net.ME1312.SubServers.Web.endpoints;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public class BlockingServlet extends HttpServlet {
-
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- response.setContentType("application/json");
- response.setStatus(HttpServletResponse.SC_OK);
- response.getWriter().println("{ \"status\": \"ok\"}");
- }
-}
diff --git a/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/StatusServlet.java b/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/StatusServlet.java
new file mode 100644
index 00000000..3cbf55c2
--- /dev/null
+++ b/SubServers.Web/src/net/ME1312/SubServers/Web/endpoints/StatusServlet.java
@@ -0,0 +1,22 @@
+package net.ME1312.SubServers.Web.endpoints;
+
+import com.google.gson.Gson;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class StatusServlet extends HttpServlet {
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ response.setContentType("application/json");
+ response.setStatus(HttpServletResponse.SC_OK);
+
+ Map map = new HashMap<>();
+ map.put("status", "ok");
+
+ response.getWriter().println(new Gson().toJson(map));
+ }
+}