diff options
-rw-r--r-- | build.gradle | 8 | ||||
-rw-r--r-- | gradle/source-layout.gradle | 12 | ||||
-rw-r--r-- | language-model/problem.aird | 2 | ||||
-rw-r--r-- | language-web/src/main/java/org/eclipse/viatra/solver/language/web/ServerLauncher.java | 19 |
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 { | |||
31 | configurations.all { | 31 | configurations.all { |
32 | exclude group: 'asm' | 32 | exclude group: 'asm' |
33 | } | 33 | } |
34 | |||
35 | eclipse.classpath.file.whenMerged { | ||
36 | for (entry in entries) { | ||
37 | if (entry.path.endsWith('xtext-gen')) { | ||
38 | entry.entryAttributes['ignore_optional_problems'] = true | ||
39 | } | ||
40 | } | ||
41 | } | ||
34 | } | 42 | } |
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 { | |||
26 | plugins.withId('war') { | 26 | plugins.withId('war') { |
27 | webAppDirName = "src/main/webapp" | 27 | webAppDirName = "src/main/webapp" |
28 | } | 28 | } |
29 | |||
30 | eclipse { | ||
31 | classpath { | ||
32 | file.whenMerged { | ||
33 | for (entry in entries) { | ||
34 | if (entry.path.endsWith('-gen')) { | ||
35 | entry.entryAttributes['ignore_optional_problems'] = true | ||
36 | } | ||
37 | } | ||
38 | } | ||
39 | } | ||
40 | } \ 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 @@ | |||
3 | <viewpoint:DAnalysis uid="_CqOewKA4EeuqkpDnuik1sg" selectedViews="_CsAAYKA4EeuqkpDnuik1sg" version="14.3.1.202003261200"> | 3 | <viewpoint:DAnalysis uid="_CqOewKA4EeuqkpDnuik1sg" selectedViews="_CsAAYKA4EeuqkpDnuik1sg" version="14.3.1.202003261200"> |
4 | <semanticResources>src/main/resources/model/problem.ecore</semanticResources> | 4 | <semanticResources>src/main/resources/model/problem.ecore</semanticResources> |
5 | <semanticResources>src/main/resources/model/problem.genmodel</semanticResources> | 5 | <semanticResources>src/main/resources/model/problem.genmodel</semanticResources> |
6 | <semanticResources>build/resources/main/model/problem.ecore</semanticResources> | ||
7 | <semanticResources>build/resources/main/model/problem.genmodel</semanticResources> | ||
6 | <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> | 8 | <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> |
7 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> | 9 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> |
8 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="c29543bd-4d24-42d3-8f5b-82d41af742bd"> | 10 | <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; | |||
14 | import org.eclipse.jetty.webapp.WebXmlConfiguration; | 14 | import org.eclipse.jetty.webapp.WebXmlConfiguration; |
15 | 15 | ||
16 | /** | 16 | /** |
17 | * This program starts an HTTP server for testing the web integration of your DSL. | 17 | * This program starts an HTTP server for testing the web integration of your |
18 | * Just execute it and point a web browser to http://localhost:8080/ | 18 | * DSL. Just execute it and point a web browser to http://localhost:8080/ |
19 | */ | 19 | */ |
20 | public class ServerLauncher { | 20 | public class ServerLauncher { |
21 | public static void main(String[] args) { | 21 | public static void main(String[] args) { |
22 | Server server = new Server(new InetSocketAddress("localhost", 1313)); | 22 | Server server = new Server(new InetSocketAddress("localhost", 1313)); |
23 | WebAppContext ctx = new WebAppContext(); | 23 | WebAppContext ctx = new WebAppContext(); |
24 | ctx.setResourceBase("src/main/webapp"); | 24 | ctx.setResourceBase("src/main/webapp"); |
25 | ctx.setWelcomeFiles(new String[] {"index.html"}); | 25 | ctx.setWelcomeFiles(new String[] { "index.html" }); |
26 | ctx.setContextPath("/"); | 26 | ctx.setContextPath("/"); |
27 | ctx.setConfigurations(new Configuration[] { | 27 | ctx.setConfigurations(new Configuration[] { new AnnotationConfiguration(), new WebXmlConfiguration(), |
28 | new AnnotationConfiguration(), | 28 | new WebInfConfiguration(), new MetaInfConfiguration() }); |
29 | new WebXmlConfiguration(), | 29 | ctx.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, ".*/language-web/.*,.*\\.jar"); |
30 | new WebInfConfiguration(), | ||
31 | new MetaInfConfiguration() | ||
32 | }); | ||
33 | ctx.setAttribute(WebInfConfiguration.CONTAINER_JAR_PATTERN, | ||
34 | ".*/org\\.eclipse\\.viatra\\.solver\\.language\\.web/.*,.*\\.jar"); | ||
35 | ctx.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false"); | 30 | ctx.setInitParameter("org.eclipse.jetty.servlet.Default.useFileMappedBuffer", "false"); |
36 | server.setHandler(ctx); | 31 | server.setHandler(ctx); |
37 | Slf4jLog log = new Slf4jLog(ServerLauncher.class.getName()); | 32 | Slf4jLog log = new Slf4jLog(ServerLauncher.class.getName()); |
@@ -39,7 +34,6 @@ public class ServerLauncher { | |||
39 | server.start(); | 34 | server.start(); |
40 | log.info("Server started " + server.getURI() + "..."); | 35 | log.info("Server started " + server.getURI() + "..."); |
41 | new Thread() { | 36 | new Thread() { |
42 | |||
43 | public void run() { | 37 | public void run() { |
44 | try { | 38 | try { |
45 | log.info("Press enter to stop the server..."); | 39 | log.info("Press enter to stop the server..."); |
@@ -54,7 +48,6 @@ public class ServerLauncher { | |||
54 | log.warn(e); | 48 | log.warn(e); |
55 | } | 49 | } |
56 | } | 50 | } |
57 | |||
58 | }.start(); | 51 | }.start(); |
59 | server.join(); | 52 | server.join(); |
60 | } catch (Exception exception) { | 53 | } catch (Exception exception) { |