From 56dcfb9c39fa6b7750837c0f60000e8833f54657 Mon Sep 17 00:00:00 2001
From: Felix Sidokhine <felix.sidokhine@randstad.ca>
Date: Thu, 14 May 2020 14:37:13 +0300
Subject: [PATCH] update endpoint names and some other minor stuff
---
integration-test/install-server.py | 2 +-
jams-server/src/main/java/module-info.java | 1 +
.../main/java/net/jami/jams/server/core/TomcatLauncher.java | 6 ++++++
.../server/servlets/api/jaminameserver/AddressServlet.java | 2 +-
.../server/servlets/api/jaminameserver/NameServlet.java | 2 +-
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/integration-test/install-server.py b/integration-test/install-server.py
index 64e60fbe..4add5375 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 266f35d0..6024a438 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 2964501e..a7d8e8c7 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 e8aa9c3d..850c3621 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 10f58799..06f52e1d 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
--
GitLab