Skip to content

Add pomfirst build + add K3FSM example MEP server #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Add pomfirst build + add K3FSM example MEP server #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5bebda4
Initial version
dvojtise May 13, 2020
7bd92d9
pom cleanup
dvojtise May 14, 2020
b339222
create a set of "pomfirst" pom
dvojtise May 15, 2020
991f634
adding code in order to help debug classloader issue
dvojtise May 15, 2020
4a64872
Merge branch 'master' into model_execution_protocol
dvojtise May 29, 2020
01565be
share launch conf for build full studio from eclipse
dvojtise May 29, 2020
4404b29
remove rename strategy binding
dvojtise May 29, 2020
eacf0d7
use full qualified name in logger
dvojtise Jun 2, 2020
7750bf1
force lsp4j version
dvojtise Jun 2, 2020
75b7633
improve error detection
dvojtise Jun 2, 2020
7745a41
remove debug pause
dvojtise Jun 3, 2020
578555b
fix tests
dvojtise Jun 3, 2020
500f32c
try to force timeout in test in ci
dvojtise Jun 3, 2020
31c89b1
immroved tests for mep
dvojtise Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>gemoc-studio_root</name>
<name>gemoc-studio</name>
<comment></comment>
<projects>
</projects>
Expand Down
16 changes: 16 additions & 0 deletions dev_support/launchconf/gemoc-studio full_compilation (tycho).launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean install"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value="test_linux"/>
<listAttribute key="M2_PROPERTIES"/>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/gemoc-studio/dev_support/full_compilation}"/>
</launchConfiguration>
16 changes: 16 additions & 0 deletions dev_support/launchconf/gemoc-studio pomfirst.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean install"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES"/>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="true"/>
<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/gemoc-studio/dev_support/pomfirst}"/>
</launchConfiguration>
21 changes: 21 additions & 0 deletions dev_support/pomfirst/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.gemoc.gemoc_studio</groupId>
<artifactId>org.eclipse.gemoc.gemoc_studio.pomfirst</artifactId>
<version>1.0.0-SNAPSHOT</version>

<packaging>pom</packaging>



<modules>
<!-- <module>../language_workbench</module> -->
<module>../../official_samples/K3FSM/pomfirst</module>
<module>../../../gemoc-studio-modeldebugging/pomfirst</module>
<module>../../../gemoc-studio-execution-java/pomfirst</module>
</modules>


</project>
2 changes: 1 addition & 1 deletion ...mples/K3FSM/language_workbench/org.eclipse.gemoc.example.k3fsm.k3dsa/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.gemoc.example.k3fsm.k3dsa
Bundle-SymbolicName: org.eclipse.gemoc.example.k3fsm.k3dsa; singleton:=true
Export-Package: org.eclipse.gemoc.example.k3fsm.k3dsa
Bundle-Name: org.eclipse.gemoc.example.k3fsm.k3dsa
Bundle-Version: 1.0.0
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Require-Bundle: fr.inria.diverse.k3.al.annotationprocessor.plugin;bundle-version="3.0.0";visibility:="reexport",
org.eclipse.xtend.lib;bundle-version="2.6.0";visibility:="private",
Expand Down
2 changes: 1 addition & 1 deletion ...mples/K3FSM/language_workbench/org.eclipse.gemoc.example.k3fsm.xdsml/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.gemoc.example.k3fsm.xdsml
Bundle-SymbolicName: org.eclipse.gemoc.example.k3fsm.xdsml; singleton:=true
Bundle-Name: org.eclipse.gemoc.example.k3fsm.xdsml
Bundle-Version: 1.0.0
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Require-Bundle: org.eclipse.xtend.lib;bundle-version="2.7.0";visibility:="private",
org.eclipse.xtext.xbase.lib;bundle-version="2.7.0";visibility:="private",
Expand Down
2 changes: 1 addition & 1 deletion ...ial_samples/K3FSM/language_workbench/org.eclipse.gemoc.example.k3fsm/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gemoc.example.k3fsm;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
216 changes: 197 additions & 19 deletions official_samples/K3FSM/language_workbench/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,28 @@
http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>org.eclipse.gemoc.gemoc_studio</groupId>
<artifactId>org.eclipse.gemoc.example.k3fsm.lwb.bundles</artifactId>

<version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>


<parent>
<!-- <parent>
<groupId>org.eclipse.gemoc.gemoc_studio</groupId>
<artifactId>org.eclipse.gemoc.gemoc_studio.parent</artifactId>
<version>3.2.0-SNAPSHOT</version>
<relativePath>../../../gemoc_studio</relativePath>
</parent>
</parent> -->
<properties>
<tycho-version>1.5.1</tycho-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<xtend.version>2.14.0</xtend.version>
<eclipse.release.p2.url>http://download.eclipse.org/releases/photon</eclipse.release.p2.url>
<k3.p2.url>http://www.kermeta.org/k3/update_2018-09-05</k3.p2.url>
<melange.p2.url>http://melange.inria.fr/updatesite/nightly/update_2018-12-03/</melange.p2.url>

<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<modules>
<module>org.eclipse.gemoc.example.k3fsm</module>
Expand Down Expand Up @@ -44,20 +54,188 @@
<layout>p2</layout>
<url>${melange.p2.url}</url>
</repository>
<!-- <repository> -->
<!-- <id>ELK</id> -->
<!-- <layout>p2</layout> -->
<!-- <url>${elk.p2.url}</url> -->
<!-- </repository> -->
<!-- <repository> -->
<!-- <id>APP4MC</id> -->
<!-- <layout>p2</layout> -->
<!-- <url>${app4mc.p2.url}</url> -->
<!-- </repository> -->
<!-- <repository> -->
<!-- <id>AspectJ</id> -->
<!-- <layout>p2</layout> -->
<!-- <url>${aspectJ.p2.url}</url> -->
<!-- </repository> -->
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<!-- enable source bundle generation -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>plugin-source</id>
<goals>
<goal>plugin-source</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- enable source feature generation -->
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-source-feature-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>source-feature</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>attach-p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
</plugin>
<!--<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>materialize-products</id>
<goals>
<goal>materialize-products</goal>
</goals>
</execution>
<execution>
<id>archive-products</id>
<goals>
<goal>archive-products</goal>
</goals>
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<!-- environments that will be built -->
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<!-- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment> -->
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
</environments>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
<!-- Java compiler plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtend.version}</version>
<executions>
<execution>
<goals>
<goal>compile</goal>
<goal>xtend-install-debug-info</goal>
<goal>testCompile</goal>
<goal>xtend-test-install-debug-info</goal>
</goals>
<configuration>
<outputDirectory>xtend-gen</outputDirectory>
</configuration>
</execution>
</executions>
<!-- workaround https://github.com/eclipse/xtext/issues/1231 -->
<!-- workaround https://github.com/eclipse/xtext/issues/1373 -->
<!-- Remove with upgrade to Xtext 2.15 -->
<dependencies>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.13.102</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
<version>1.3.110</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
<version>1.2.101</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.codegen</artifactId>
<version>2.11.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
44 changes: 44 additions & 0 deletions official_samples/K3FSM/pomfirst/org.eclipse.gemoc.example.k3fsm.mep.server/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="xtend-gen">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
1 change: 1 addition & 0 deletions official_samples/K3FSM/pomfirst/org.eclipse.gemoc.example.k3fsm.mep.server/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dependency-reduced-pom.xml
Loading