Simplify project layout

9 files changed, 345 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);
+                }
+        }
+}
diff --git a/language-web/src/main/webapp/index.html b/language-web/src/main/webapp/index.html
new file mode 100644
index 00000000..3fb66d62
--- /dev/null
+++ b/language-web/src/main/webapp/index.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Language" content="en-us">
+<title>Example Web Editor</title>
+<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.52.2/lib/codemirror.css" />
+<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.52.2/addon/hint/show-hint.css" />
+<link rel="stylesheet" type="text/css" href="xtext/2.26.0.M1/xtext-codemirror.css" />
+<link rel="stylesheet" type="text/css" href="style.css" />
+<body>
+    <div class="container">
+        <div class="header">
+            <h1>Example Problem Web Editor</h1>
+        </div>
+        <div class="content">
+            <div class="xtext-editor"
+                 data-editor-xtext-lang="problem"
+                 data-editor-enable-formatting-action="true"
+                 data-editor-send-full-text="false"
+            ><pre>class Family {
+    contains Person[] members
+}
+
+class Person {
+    Person[] children opposite parent
+    Person parent opposite children
+    TaxStatus[1] taxStatus
+}
+
+enum TaxStatus {
+        child, student, adult, retired
+}
+
+error invalidTaxStatus(Person p) :-
+        taxStatus(p, child), children(p, _q).
+
+Family('family').
+members('family', anne).
+members('family', bob).
+members('family', ciri).
+children(anne, ciri).
+?children(bob, ciri).
+taxStatus(anne, adult).
+
+scope Family = 1, Person += 5..10.</pre></div>
+        </div>
+    </div>
+    <script type="text/javascript" src="webjars/requirejs/2.3.6/require.min.js"></script>
+    <script type="text/javascript" src="script.js"></script>
+</body>
diff --git a/language-web/src/main/webapp/script.js b/language-web/src/main/webapp/script.js
new file mode 100644
index 00000000..dced7eca
--- /dev/null
+++ b/language-web/src/main/webapp/script.js
@@ -0,0 +1,20 @@
+var baseUrl = window.location.pathname;
+var fileIndex = baseUrl.indexOf("index.html");
+if (fileIndex > 0)
+    baseUrl = baseUrl.slice(0, fileIndex)
+require.config({
+    baseUrl: baseUrl,
+    paths: {
+        "text": "webjars/requirejs-text/2.26.0.M1/text",
+        "jquery": "webjars/jquery/3.6.0/jquery.min",
+        "xtext/xtext-codemirror": "xtext/2.26.0.M1/xtext-codemirror",
+    },
+    packages: [{
+        name: "codemirror",
+        location: "webjars/codemirror/5.52.2",
+        main: "lib/codemirror"
+    }]
+});
+require(["xtext-resources/generated/mode-problem", "xtext/xtext-codemirror"], function(mode, xtext) {
+        window.xtextEditor = xtext.createEditor({baseUrl: baseUrl,});
+});
diff --git a/language-web/src/main/webapp/style.css b/language-web/src/main/webapp/style.css
new file mode 100644
index 00000000..9a89dd81
--- /dev/null
+++ b/language-web/src/main/webapp/style.css
@@ -0,0 +1,105 @@
+body {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        font: 16px Helvetica,sans-serif;
+}
+
+a {
+        color: #22a;
+        text-decoration: none;
+}
+
+a:hover {
+        text-decoration: underline;
+}
+
+.container {
+        display: block;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: 24px 24px 36px 24px;
+}
+
+.header {
+        display: block;
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        padding: 16px;
+        background: #dbdbdb;
+        border-radius: 16px;
+        color: #383838;
+}
+
+.header h1 {
+    font-size: 36px;
+    margin: 0;
+}
+
+.content {
+        display: block;
+        position: absolute;
+        top: 108px;
+        bottom: 0;
+        left: 0;
+        width: 50%;
+        box-shadow: 0 0 8px rgba(80, 10, 98, .25), 0 10px 24px rgba(80, 10, 98, .35);
+        border-radius: 16px;
+}
+
+.xtext-editor {
+        display: block;
+        position: absolute;
+        top: 16px;
+        bottom: 16px;
+        left: 16px;
+        right: 16px;
+        border: 1px solid #aaa;
+}
+
+.problem-class {
+        color: #005032;
+}
+
+.problem-abstract {
+        color: #8b8816;
+}
+
+.problem-enum {
+        color: #644632;
+}
+
+.problem-reference {
+        color: #0000c0;
+}
+
+.problem-containment {
+        font-weight: bold;
+}
+
+
+.CodeMirror .problem-node {
+        color: inherit;
+}
+
+.problem-enum-node {
+        color: #1a1a1a !important;
+        font-weight: bold;
+}
+
+.problem-new-node {
+        font-style: italic;
+}
+
+.problem-variable {
+        color: #6a3e3e;
+}
+
+.problem-singleton-variable {
+        opacity: 0.7;
+}
diff --git a/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js b/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js
new file mode 100644
index 00000000..89373b1c
--- /dev/null
+++ b/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js
@@ -0,0 +1,22 @@
+define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, SimpleMode) {
+        var keywords = "abstract|class|contains|enum|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
+        CodeMirror.defineSimpleMode("xtext/problem", {
+                start: [
+                        {token: "comment", regex: "\\/\\/.*$"},
+                        {token: "comment", regex: "\\/\\*", next : "comment"},
+                        {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},
+                        {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},
+                        {token: "lparen", regex: "[\\[({]"},
+                        {token: "rparen", regex: "[\\])}]"},
+                        {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
+                ],
+                comment: [
+                        {token: "comment", regex: ".*?\\*\\/", next : "start"},
+                        {token: "comment", regex: ".+"}
+                ],
+                meta: {
+                        dontIndentStates: ["comment"],
+                        lineComment: "//"
+                }
+        });
+});
diff --git a/language-web/src/main/xtext-gen/org/eclipse/viatra/solver/language/web/AbstractProblemWebModule.java b/language-web/src/main/xtext-gen/org/eclipse/viatra/solver/language/web/AbstractProblemWebModule.java
new file mode 100644
index 00000000..fefb7da3
--- /dev/null
+++ b/language-web/src/main/xtext-gen/org/eclipse/viatra/solver/language/web/AbstractProblemWebModule.java
@@ -0,0 +1,14 @@
+/*
+ * generated by Xtext 2.26.0.M1
+ */
+package org.eclipse.viatra.solver.language.web;
+
+import org.eclipse.xtext.web.server.DefaultWebModule;
+
+/**
+ * Manual modifications go to {@link ProblemWebModule}.
+ */
+@SuppressWarnings("all")
+public abstract class AbstractProblemWebModule extends DefaultWebModule {
+
+}