Skip to content
Snippets Groups Projects
Commit 56dcfb9c authored by Felix Sidokhine's avatar Felix Sidokhine
Browse files

update endpoint names and some other minor stuff

parent 49523975
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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;
......
......@@ -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!");
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment