Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
198b037
Example's metaprog entry fixed (#209)
Kairides Jun 11, 2020
e6b0305
update changelog
dvojtise Jun 16, 2020
8de687f
add metaprog ecore to base dsl of melangek3fsm
dvojtise Jun 17, 2020
dcc61c7
update aird
dvojtise Jun 19, 2020
ad1c406
avoid .dsl error by adding carriage return
dvojtise Jun 19, 2020
7a886ea
provide github issue templates (#215)
dvojtise Jul 17, 2020
0a8ee7e
add PR template
dvojtise Jul 17, 2020
a66f941
Update pull_request_template.md
dvojtise Jul 17, 2020
636526c
move general PR template
dvojtise Jul 17, 2020
3aa91d6
improved PR template
dvojtise Jul 17, 2020
98a5397
cleanup
dvojtise Jul 17, 2020
4861350
Bump to Eclipse 2020-03 (#212)
dvojtise Jul 20, 2020
97a37a2
Remove declaration of ALESiriusInterpreter in headles launcher (#216)
dvojtise Jul 24, 2020
20e4929
Improvement of the official examples documentation (#217)
dvojtise Oct 21, 2020
c27393d
try a move to java 11
jdeantoni Nov 8, 2020
741782a
Update README.asciidoc
dvojtise Nov 9, 2020
e9a725f
bump to java 11
jdeantoni Nov 10, 2020
1918d97
Merge branch 'master' of https://github.com/eclipse/gemoc-studio
jdeantoni Nov 10, 2020
45cbb24
bummp docker to java 11
jdeantoni Nov 10, 2020
497d45c
bummp the studio to java 11
jdeantoni Nov 10, 2020
531b504
docker with openjdk 11 and openjfx 11 for jenkins build
Nov 10, 2020
9ef4d89
Merge branch 'master' of https://github.com/eclipse/gemoc-studio.git
jdeantoni Nov 10, 2020
f1a0ad7
update readme
Nov 10, 2020
480ec5d
Merge branch 'master' of [email protected]:eclipse/gemoc-studio.git
Nov 10, 2020
937b3de
update readme
Nov 10, 2020
a80b8db
update JAVAFX_HOME
jdeantoni Nov 10, 2020
27f45b1
fix path to javafx
Nov 10, 2020
4a2d180
Merge branch 'master' of [email protected]:eclipse/gemoc-studio.git
Nov 10, 2020
87897c7
Bump to java 11
jdeantoni Nov 12, 2020
0ccbc29
remove erroneous -vmargs
jdeantoni Nov 12, 2020
9ef8693
remove addmodules stuff
jdeantoni Nov 12, 2020
b0e1587
Update gemoc_studio.product
jdeantoni Nov 12, 2020
44e6173
Initial version
dvojtise May 13, 2020
7c281c1
pom cleanup
dvojtise May 14, 2020
7db78e9
create a set of "pomfirst" pom
dvojtise May 15, 2020
c5c46d1
adding code in order to help debug classloader issue
dvojtise May 15, 2020
32b8e5f
share launch conf for build full studio from eclipse
dvojtise May 29, 2020
f829588
remove rename strategy binding
dvojtise May 29, 2020
f7a4d56
use full qualified name in logger
dvojtise Jun 2, 2020
0a9a359
force lsp4j version
dvojtise Jun 2, 2020
761762d
improve error detection
dvojtise Jun 2, 2020
4b263cf
remove debug pause
dvojtise Jun 3, 2020
c55a93d
fix tests
dvojtise Jun 3, 2020
4988ea5
try to force timeout in test in ci
dvojtise Jun 3, 2020
6993b06
immroved tests for mep
dvojtise Jun 4, 2020
7ce647e
Refactor to support MEP at Engine level
pjeanjean Jun 10, 2020
fac54f2
Better separation between Headless Engine and MEP
pjeanjean Jun 12, 2020
258af88
Rename LSP4J server
pjeanjean Jun 12, 2020
4ef20c4
Stable state: plaink3 engine + debugger + trace
pjeanjean Jul 1, 2020
ef6a321
Working demo with omniscient debugging and REPL
pjeanjean Mar 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Bug report
about: Create a report to help us improve the GEMOC Studio integration (if you know that the issue is relative to a given component, consider opening the issue on one of the other GEMOC github repositories)
title: ''
labels: bug
assignees: ''

---

## Bug description

<!-- A clear and concise description of what the bug is. -->


## Expected behavior

<!-- A clear and concise description of what you were expecting to happen. -->


## How to reproduce

Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

## Additional context

<!-- Please fill in the following fields: -->

- **GEMOC Studio version**:
- **Java version**:
- **OS**:

## Screenshot

<!-- If applicable -->


22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Feature request
about: Suggest an idea to improve the GEMOC Studio integration (if you know that the issue is relative to a given component, consider opening the issue on one of the other GEMOC github repositories)
title: ''
labels: enhancement
assignees: ''

---

## Motivation

<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->


## Proposed Solution

<!-- A clear and concise description of what you want to happen. -->


## Proposed Implementation

<!-- Optional: if you know enough about the project feel free to suggest a way to implement the solution -->
25 changes: 25 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

## Description

<!-- A description of what the PR does. -->
<!-- optional, provide a rationale explaining its goal -->

Does X

## Changes

<!-- more details , changed documentation sections, changed version, some details about the code changes -->

-

## Contribution to issues

Contribute to #
Closes #

## Companion Pull Requests

<!-- optional, indicate if this PR must be accepted in conjunction with some PR in other GEMOC github repositories in order to provide a working Studio-->
<!-- you may have to edit this PR after submitting it in order to get all cross references between the PRs -->

- PR #
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ node_modules
.polyglot.*
.META-INF_MANIFEST.MF
feature.xml.takari_issue_192
**/.settings
**/*.log
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>1.5.1</version>
<version>1.7.0</version>
</extension>
</extensions>
8 changes: 7 additions & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>gemoc-studio_root</name>
<name>gemoc-studio</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
46 changes: 46 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,51 @@
# Changelog

## v3.2.0 (16/06/2020)

#### Enhancements:

- [**enhancement**] Add wait for treeitem after expand in tests [#197](https://github.com/eclipse/gemoc-studio/pull/197)
- [**enhancement**][**refactoring**] Improve default Engine addon launch conf tab [#193](https://github.com/eclipse/gemoc-studio/pull/193)
- [**enhancement**] Add automatic creation of missing source folders [#179](https://github.com/eclipse/gemoc-studio/pull/179)
- [**enhancement**] Remove event manager from feature.xml [#177](https://github.com/eclipse/gemoc-studio/pull/177)

#### Bug Fixes:

- [**bug**] Example's metaprog entry fixed [#209](https://github.com/eclipse/gemoc-studio/pull/209)
- [**bug**] Fix xdsmlFilePath attribute in plugin.xml [#196](https://github.com/eclipse/gemoc-studio/pull/196)
- [**bug**] Fix method getEntry of DslImpl [#186](https://github.com/eclipse/gemoc-studio/pull/186)
- [**bug**] autosrc: set java compliance to 1.8 [#182](https://github.com/eclipse/gemoc-studio/pull/182)
- [**bug**][**bump**] Stop ALE engine on error [#176](https://github.com/eclipse/gemoc-studio/pull/176)
- [**bug**] Do not wait for discovery update site availability check in tests [#173](https://github.com/eclipse/gemoc-studio/pull/173)

#### Refactorings

- [**refactoring**] Move commons to gemoc-studio-modeldebugging git repository [#200](https://github.com/eclipse/gemoc-studio/pull/200)
- [**refactoring**] Move JavaEngine to its own dedicated git repository [#199](https://github.com/eclipse/gemoc-studio/pull/199)
- [**refactoring**] Uses new generic Context and RunConfiguration classes from execution framework [#198](https://github.com/eclipse/gemoc-studio/pull/198)
- [**refactoring**] Use general extension point + nature and builder refactoring [#185](https://github.com/eclipse/gemoc-studio/pull/185)

#### Version upgrades

- [**bump**][**releng**] Change Timesquare updatesite [#195](https://github.com/eclipse/gemoc-studio/pull/195)
- [**bump**] Bump to Sirius 6.1.3 [#194](https://github.com/eclipse/gemoc-studio/pull/194)
- [**bump**] Bump ALE to latest version [#184](https://github.com/eclipse/gemoc-studio/pull/184)
- [**bump**] Bump GEMOC Studio to 3.2.0 [#174](https://github.com/eclipse/gemoc-studio/pull/174)

#### Release Engineering

- [**releng**] Fix machine-id of the jenkins docker image [#205](https://github.com/eclipse/gemoc-studio/pull/205)
- [**releng**] Deploy GEMOC artefacts to maven repository (repo.eclipse.org) [#204](https://github.com/eclipse/gemoc-studio/pull/204)
- [**releng**] Add OCLInEcore to the GEMOC Studio [#188](https://github.com/eclipse/gemoc-studio/pull/188)
- [**releng**] Improve test video recording [#190](https://github.com/eclipse/gemoc-studio/pull/190)
- [**releng**] Tycho 1.5 and p2 dependencies optimisation [#189](https://github.com/eclipse/gemoc-studio/pull/189)
- [**releng**] Use custom docker image for building the studio on the CI [#187](https://github.com/eclipse/gemoc-studio/pull/187)
- [**releng**] Improved docker image for local build [#181](https://github.com/eclipse/gemoc-studio/pull/181)
- [**releng**] Remove deprecated update site [#180](https://github.com/eclipse/gemoc-studio/pull/180)
- [**releng**] Merge products and updatesite projects [#175](https://github.com/eclipse/gemoc-studio/pull/175)

---

## v3.2.0-20191216 (16/12/2019)

#### Enhancements:
Expand Down
2 changes: 2 additions & 0 deletions dev_support/full_compilation/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/workspace/
/?/
/configuration/
14 changes: 14 additions & 0 deletions dev_support/full_compilation/README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,20 @@ The build also assemble complementary results:
- an update site, available in `gemoc_studio/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/target/repository/`
- an archivable version of the web help; available in `gemoc-studio/docs/org.eclipse.gemoc.studio.doc/target/publish/webhelp/`


[NOTE]
====
You can save some time on the compilation in development mode using some of the following options of the mvn command line:

* `-P !plantuml` disabling this profile will disable plantuml image generation of the documentation (cf. https://github.com/eclipse/gemoc-studio/blob/master/docs/org.eclipse.gemoc.studio.doc/pom.xml)
* `-P test_linux` this profile will compile only the linux version of the studio (or `-P test_win64` for windows cf. https://github.com/eclipse/gemoc-studio/blob/master/gemoc_studio/pom.xml)
* `--projects !../../gemoc_studio/tests/org.eclipse.gemoc.studio.tests.system.lwb,!../../gemoc_studio/tests/org.eclipse.gemoc.studio.tests.system.mwb` do not launch system tests (but still create the full studio)
* `--offline` offline, (useful if you already have a full successful build that has installed all required dependencies in your local maven repository
* `-DskipTests=true` do not launch unit tests
====



==== Advanced usage using docker

If you have trouble to reproduce a bug in the CI or want to make sure that the CI will pass, you can run the maven build in a docker that mimic the CI environment.
Expand Down
2 changes: 1 addition & 1 deletion dev_support/full_compilation/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
xvfb

RUN apt-get install -y --no-install-recommends \
openjdk-8-jdk \
openjdk-11-jdk \
openjfx \
maven

Expand Down
7 changes: 5 additions & 2 deletions dev_support/full_compilation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@
<groupId>org.eclipse.gemoc</groupId>
<artifactId>complete-studio</artifactId>
<packaging>pom</packaging>
<version>3.0.0-SNAPSHOT</version>
<version>3.3.0-SNAPSHOT</version>
<name>Complete GEMOC Studio compilation</name>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<modules>
<!--<module>../../../gemoc-studio</module>-->
<module>../../../gemoc-studio/official_samples/sample.deployers</module>
<module>../../../gemoc-studio/docs/org.eclipse.gemoc.studio.doc</module>
<!--<module>../../../gemoc-studio/docs/org.eclipse.gemoc.studio.doc</module>-->
<module>../../../gemoc-studio/gemoc_studio</module>
<module>../../../gemoc-studio-modeldebugging</module>
<module>../../../gemoc-studio-execution-java</module>
<module>../../../gemoc-studio-execution-ale</module>
<!--
<module>../../../gemoc-studio-moccml</module>
<module>../../../gemoc-studio-execution-moccml</module>
-->
</modules>
<distributionManagement>
<repository>
Expand Down
16 changes: 12 additions & 4 deletions dev_support/jenkins/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ENTRYPOINT [ "uid_entrypoint", "jenkins-slave" ]

# Required for python36u
RUN yum install -y yum-utils && \
yum install -y https://centos7.iuscommunity.org/ius-release.rpm
yum install -y https://repo.ius.io/ius-release-el7.rpm

# https://linuxize.com/post/how-to-install-ffmpeg-on-centos-7/
RUN rpm -v --import http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro
Expand Down Expand Up @@ -60,7 +60,7 @@ RUN yum update -y \
metacity \
mutter \
net-snmp-devel.x86_64 \
java-1.8.0-openjdk-devel \
java-11-openjdk-devel \
openssl-devel.x86_64 \
patch \
perl \
Expand Down Expand Up @@ -100,11 +100,19 @@ RUN yum update -y \
zsh \
&& yum clean all


ENV HOME=/home/jenkins

RUN wget https://gluonhq.com/download/javafx-11-0-2-sdk-linux -O ${HOME}/javafx-11-0-2-sdk-linux.zip
RUN unzip ${HOME}/javafx-11-0-2-sdk-linux.zip -d ${HOME}
RUN rm ${HOME}/javafx-11-0-2-sdk-linux.zip

ENV JAVAFX_HOME=${HOME}/javafx-sdk-11.0.2

RUN ln -s /usr/bin/git /usr/local/bin/git \
&& ln -s /bin/bash /usr/local/bin/hipp_shell \
&& if [ ! -a /etc/machine-id ] || [ ! -s /etc/machine-id ]; then dbus-uuidgen > /etc/machine-id; fi

ENV HOME=/home/jenkins
ENV DISPLAY :0

RUN mkdir -p ${HOME}/.vnc && chmod -R 775 ${HOME} \
Expand All @@ -130,4 +138,4 @@ ENV _JAVA_OPTIONS="-XX:MaxRAMPercentage=64.0"

WORKDIR /home/jenkins

USER 10001:0
USER 10001:0
5 changes: 1 addition & 4 deletions dev_support/jenkins/docker/README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

Reference: https://wiki.eclipse.org/Jenkins

The current migration pod doesn't match our need for 2 reasons:
- missing grapviz (used to produce some documentation images (note: graphviz version
must either below 2.39.x or above 2.41, cf. cf. https://forum.plantuml.net/5425/relation-long-with-graphviz-using-labels-relations-namespace)
- missing video capture tool in order to track the flacky UI tests

includes OpenJDK 11, JavaFX 11

Base for the images:

Expand Down
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
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
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 docs/org.eclipse.gemoc.studio.doc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.eclipse.gemoc.documentation</groupId>
<artifactId>gemoc-studio-documentation</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.3.0-SNAPSHOT</version>
<!-- <packaging>jdocbook</packaging>-->
<packaging>jar</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,12 @@ include::userguide/headless_install_language_headContent.asciidoc[]
== Run model
include::userguide/headless_run_model_headContent.asciidoc[]


////
= Tutorials

== Tuto 1
include::tutorials_headContent.asciidoc[]
////

= Examples

Expand All @@ -260,8 +261,6 @@ include::../../../../../official_samples/K3FSM/docs/K3FSM.asciidoc[]

include::../../../../../official_samples/MelangeK3FSM/docs/MelangeK3FSM.asciidoc[]

include::../../../../../official_samples/MelangeK3FSM/docs/MelangeK3FSM.asciidoc[]

include::../../../../../../gemoc-studio-execution-moccml/examples/moccmlSigPML/docs/README.asciidoc[]

= Developer Guide
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="output" path="bin"/>
Expand Down
Loading