From 0a118b7f4a16b2e3849fd77eeeaecac0f22128ba Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 19 Sep 2021 19:29:43 +0200 Subject: Allow launching server from Eclipse --- .../org/eclipse/viatra/solver/language/web/ProblemServlet.java | 2 -- .../org/eclipse/viatra/solver/language/web/ServerLauncher.java | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'language-web/src/main/java/org/eclipse') diff --git a/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemServlet.java b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemServlet.java index 337df54b..18b86ade 100644 --- a/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemServlet.java +++ b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemServlet.java @@ -4,7 +4,6 @@ package org.eclipse.viatra.solver.language.web; import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; import org.eclipse.xtext.util.DisposableRegistry; import org.eclipse.xtext.web.servlet.XtextServlet; @@ -12,7 +11,6 @@ import org.eclipse.xtext.web.servlet.XtextServlet; /** * Deploy this class into a servlet container to enable DSL-specific services. */ -@WebServlet(name = "XtextServices", urlPatterns = "/xtext-service/*") public class ProblemServlet extends XtextServlet { private static final long serialVersionUID = 1L; diff --git a/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java index a9017264..63088511 100644 --- a/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java +++ b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java @@ -9,15 +9,10 @@ import java.net.InetSocketAddress; import java.net.URI; import java.net.URISyntaxException; -import org.eclipse.jetty.annotations.AnnotationConfiguration; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.log.Slf4jLog; import org.eclipse.jetty.util.resource.Resource; -import org.eclipse.jetty.webapp.Configuration; -import org.eclipse.jetty.webapp.MetaInfConfiguration; import org.eclipse.jetty.webapp.WebAppContext; -import org.eclipse.jetty.webapp.WebInfConfiguration; -import org.eclipse.jetty.webapp.WebXmlConfiguration; public class ServerLauncher { private static final Slf4jLog LOG = new Slf4jLog(ServerLauncher.class.getName()); @@ -30,9 +25,7 @@ public class ServerLauncher { ctx.setBaseResource(baseResource); ctx.setWelcomeFiles(new String[] { "index.html" }); ctx.setContextPath("/"); - ctx.setConfigurations(new Configuration[] { new AnnotationConfiguration(), new WebXmlConfiguration(), - new WebInfConfiguration(), new MetaInfConfiguration() }); - ctx.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/build/classes/.*,.*\\.jar"); + ctx.addServlet(ProblemServlet.class, "/xtext-service/*"); ctx.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false"); server.setHandler(ctx); } -- cgit v1.2.3-70-g09d2