Simplify project layout

4 files changed, 135 insertions, 0 deletions

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
new file mode 100644
index 00000000..5de708f0
--- /dev/null
+++ b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemServlet.java
@@ -0,0 +1,36 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package org.eclipse.viatra.solver.language.web;
+
+import com.google.inject.Injector;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import org.eclipse.xtext.util.DisposableRegistry;
+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;
+        
+        DisposableRegistry disposableRegistry;
+        
+        public void init() throws ServletException {
+                super.init();
+                Injector injector = new ProblemWebSetup().createInjectorAndDoEMFRegistration();
+                this.disposableRegistry = injector.getInstance(DisposableRegistry.class);
+        }
+        
+        public void destroy() {
+                if (disposableRegistry != null) {
+                        disposableRegistry.dispose();
+                        disposableRegistry = null;
+                }
+                super.destroy();
+        }
+        
+}
diff --git a/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemWebModule.java b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemWebModule.java
new file mode 100644
index 00000000..0eea7f1e
--- /dev/null
+++ b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemWebModule.java
@@ -0,0 +1,11 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package org.eclipse.viatra.solver.language.web;
+
+
+/**
+ * Use this class to register additional components to be used within the web application.
+ */
+public class ProblemWebModule extends AbstractProblemWebModule {
+}
diff --git a/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemWebSetup.java b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemWebSetup.java
new file mode 100644
index 00000000..8d5778af
--- /dev/null
+++ b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ProblemWebSetup.java
@@ -0,0 +1,23 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package org.eclipse.viatra.solver.language.web;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import org.eclipse.viatra.solver.language.ProblemRuntimeModule;
+import org.eclipse.viatra.solver.language.ProblemStandaloneSetup;
+import org.eclipse.viatra.solver.language.ide.ProblemIdeModule;
+import org.eclipse.xtext.util.Modules2;
+
+/**
+ * Initialization support for running Xtext languages in web applications.
+ */
+public class ProblemWebSetup extends ProblemStandaloneSetup {
+        
+        @Override
+        public Injector createInjector() {
+                return Guice.createInjector(Modules2.mixin(new ProblemRuntimeModule(), new ProblemIdeModule(), new ProblemWebModule()));
+        }
+        
+}
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
new file mode 100644
index 00000000..d25f4ae9
--- /dev/null
+++ b/language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java
@@ -0,0 +1,65 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package org.eclipse.viatra.solver.language.web;
+
+import java.net.InetSocketAddress;
+import org.eclipse.jetty.annotations.AnnotationConfiguration;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.log.Slf4jLog;
+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;
+
+/**
+ * This program starts an HTTP server for testing the web integration of your DSL.
+ * Just execute it and point a web browser to http://localhost:8080/
+ */
+public class ServerLauncher {
+        public static void main(String[] args) {
+                Server server = new Server(new InetSocketAddress("localhost", 1313));
+                WebAppContext ctx = new WebAppContext();
+                ctx.setResourceBase("src/main/webapp");
+                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,
+                        ".*/org\\.eclipse\\.viatra\\.solver\\.language\\.web/.*,.*\\.jar");
+                ctx.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false");
+                server.setHandler(ctx);
+                Slf4jLog log = new Slf4jLog(ServerLauncher.class.getName());
+                try {
+                        server.start();
+                        log.info("Server started " + server.getURI() + "...");
+                        new Thread() {
+
+                                public void run() {
+                                        try {
+                                                log.info("Press enter to stop the server...");
+                                                int key = System.in.read();
+                                                if (key != -1) {
+                                                        server.stop();
+                                                } else {
+                                                        log.warn(
+                                                                        "Console input is not available. In order to stop the server, you need to cancel process manually.");
+                                                }
+                                        } catch (Exception e) {
+                                                log.warn(e);
+                                        }
+                                }
+
+                        }.start();
+                        server.join();
+                } catch (Exception exception) {
+                        log.warn(exception.getMessage());
+                        System.exit(1);
+                }
+        }
+}