Fix running outside of Eclipse

4 files changed, 16 insertions, 25 deletions

diff --git a/build.gradle b/build.gradle
index de4df91e..fa501550 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,4 +31,12 @@ subprojects {
         configurations.all {
                 exclude group: 'asm'
         }
+        
+        eclipse.classpath.file.whenMerged {
+                for (entry in entries) {
+                        if (entry.path.endsWith('xtext-gen')) {
+                                entry.entryAttributes['ignore_optional_problems'] = true
+                        }
+                }
+        }
 }
diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle
index 5febbee3..d347fb13 100644
--- a/gradle/source-layout.gradle
+++ b/gradle/source-layout.gradle
@@ -26,15 +26,3 @@ jar {
 plugins.withId('war') {
         webAppDirName = "src/main/webapp"
 }
-
-eclipse {
-        classpath {
-                file.whenMerged {
-                        for (entry in entries) {
-                                if (entry.path.endsWith('-gen')) {
-                                        entry.entryAttributes['ignore_optional_problems'] = true
-                                }
-                        }
-                }
-        }
-}
\ No newline at end of file
diff --git a/language-model/problem.aird b/language-model/problem.aird
index 047b72a2..29e6d68c 100644
--- a/language-model/problem.aird
+++ b/language-model/problem.aird
@@ -3,6 +3,8 @@
   <viewpoint:DAnalysis uid="_CqOewKA4EeuqkpDnuik1sg" selectedViews="_CsAAYKA4EeuqkpDnuik1sg" version="14.3.1.202003261200">
     <semanticResources>src/main/resources/model/problem.ecore</semanticResources>
     <semanticResources>src/main/resources/model/problem.genmodel</semanticResources>
+    <semanticResources>build/resources/main/model/problem.ecore</semanticResources>
+    <semanticResources>build/resources/main/model/problem.genmodel</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
       <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="c29543bd-4d24-42d3-8f5b-82d41af742bd">
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 d25f4ae9..d0b2562a 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
@@ -14,24 +14,19 @@ 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/
+ * 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.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.setConfigurations(new Configuration[] { new AnnotationConfiguration(), new WebXmlConfiguration(),
+                                new WebInfConfiguration(), new MetaInfConfiguration() });
+                ctx.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/language-web/.*,.*\\.jar");
                 ctx.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false");
                 server.setHandler(ctx);
                 Slf4jLog log = new Slf4jLog(ServerLauncher.class.getName());
@@ -39,7 +34,6 @@ public class ServerLauncher {
                         server.start();
                         log.info("Server started " + server.getURI() + "...");
                         new Thread() {
-
                                 public void run() {
                                         try {
                                                 log.info("Press enter to stop the server...");
@@ -54,7 +48,6 @@ public class ServerLauncher {
                                                 log.warn(e);
                                         }
                                 }
-
                         }.start();
                         server.join();
                 } catch (Exception exception) {