diff --git a/integration-test/install-server.py b/integration-test/install-server.py index 64e60fbe069d6446b949cc062b1e5144f092a028..4add5375b079ca2552a6db951e14ffbbaebd68cd 100644 --- a/integration-test/install-server.py +++ b/integration-test/install-server.py @@ -116,6 +116,6 @@ print(response.text) print(token) -response = requests.get("http://localhost:8080/api/nameservice/name/aberaud",headers=header) +response = requests.get("http://localhost:8080/api/nameserver/name/aberaud",headers=header) print(response.status_code) print(response.text) \ No newline at end of file diff --git a/jams-server/src/main/java/module-info.java b/jams-server/src/main/java/module-info.java index 266f35d04d0bfc44cb26030d1e8f472a7e80b941..6024a4383902e5a0f5003b4416d8271996a6bcd7 100644 --- a/jams-server/src/main/java/module-info.java +++ b/jams-server/src/main/java/module-info.java @@ -13,6 +13,7 @@ module jams.server { requires jami.nameserver; requires jami.dht; requires nimbus.jose.jwt; + requires java.desktop; exports net.jami.jams.server.servlets.general to org.apache.tomcat.embed.core; exports net.jami.jams.server.servlets.filters to org.apache.tomcat.embed.core; exports net.jami.jams.server.servlets.api.auth.login to org.apache.tomcat.embed.core; diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java index 2964501e80eea1c3643acc84bf0846db47b5a64a..a7d8e8c714f38a9541a920198b00b59a2ca18fed 100644 --- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java +++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java @@ -9,6 +9,7 @@ import org.apache.catalina.webresources.DirResourceSet; import org.apache.catalina.webresources.JarResourceSet; import org.apache.catalina.webresources.StandardRoot; +import java.awt.*; import java.io.File; import java.net.URI; import java.net.URLDecoder; @@ -63,6 +64,11 @@ public class TomcatLauncher { context.addWelcomeFile("web/login"); try { tomcat.start(); + //Try to pop-up Web-UI + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + Desktop.getDesktop().browse(new URI("https://localhost:8080")); + } + else log.info("There is no graphical interface on this system - please connect remotely!"); } catch (Exception e) { log.error("Web-server has failed to start - this is critical!"); diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java index e8aa9c3d7a83711af7db1a70d9c6cec5d793822c..850c36219b5e80915c897422d8abf0d0cfbc9e47 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/AddressServlet.java @@ -13,7 +13,7 @@ import java.io.IOException; import static net.jami.jams.server.Server.nameServer; -@WebServlet("/api/namserver/addr/*") +@WebServlet("/api/nameserver/addr/*") public class AddressServlet extends HttpServlet { @Override diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/NameServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/NameServlet.java index 10f58799cceb337f51f6e378d7befecde9bf16b0..06f52e1d4e3997b650af92b0ccc5f0dd8ad07ef6 100644 --- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/NameServlet.java +++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/jaminameserver/NameServlet.java @@ -12,7 +12,7 @@ import java.io.IOException; import static net.jami.jams.server.Server.nameServer; -@WebServlet("/api/namserver/name/*") +@WebServlet("/api/nameserver/name/*") public class NameServlet extends HttpServlet { @Override