From 0829e036a06dba8fd71a1438de2e27ec2d60e31e Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 10 Mar 2022 17:42:48 +0100 Subject: [PATCH 1/9] add lsp4j and jetty plugins to target platform Signed-off-by: Didier Vojtisek --- .../gemoc_studio.target | 5 ++++- .../gemoc_studio.tpd | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target index 4e0f546b..d78e8097 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target @@ -1,7 +1,7 @@ - + @@ -22,6 +22,8 @@ + + @@ -34,6 +36,7 @@ + diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.tpd b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.tpd index 841a6557..2a134694 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.tpd +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.tpd @@ -32,6 +32,8 @@ location eclipse "https://download.eclipse.org/releases/2021-12" { org.eclipse.epp.mpc.feature.group org.eclipse.equinox.p2.sdk.feature.group org.eclipse.equinox.executable.feature.group + org.eclipse.equinox.server.jetty.feature.group + org.eclipse.lsp4j.sdk.feature.group org.eclipse.m2e.feature.feature.group org.eclipse.m2e.logback.feature.feature.group org.eclipse.m2m.qvt.oml.feature.group @@ -45,6 +47,7 @@ location eclipse "https://download.eclipse.org/releases/2021-12" { org.eclipse.swtbot.eclipse.feature.group org.eclipse.swtbot.ide.feature.group org.eclipse.swtbot.feature.group + org.eclipse.wst.web_core.feature.feature.group org.eclipse.wst.xml_core.feature.feature.group org.eclipse.wst.xml_ui.feature.feature.group org.eclipse.xtext.sdk.feature.group From 85c9792f23993138e8279ab53fee873628bfd84c Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 11 Mar 2022 15:39:26 +0100 Subject: [PATCH 2/9] use p2 with all jetty bundles Signed-off-by: Didier Vojtisek --- .../gemoc_studio.target | 6 +++++- .../gemoc_studio.tpd | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target index d78e8097..c9adebe9 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target @@ -1,7 +1,7 @@ - + @@ -102,6 +102,10 @@ + + + + diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.tpd b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.tpd index 2a134694..0403627e 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.tpd +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.tpd @@ -132,4 +132,8 @@ location fxclipse "https://download.eclipse.org/efxclipse/updates-released/3.7.0 org.eclipse.fx.runtime.min.feature.feature.group } +location jetty "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927" { + org.eclipse.jetty.bundles.f.feature.group +} + From e9e67e9bdccbc7f085de6576303fc5f114d29046 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 28 Mar 2022 17:16:21 +0200 Subject: [PATCH 3/9] targetplatform with jetty add a second dev target platform for convenience that allow to not have to open all required gemoc projects when developping --- .../gemoc_studio.target | 230 +- .../gemoc_studio_dev.target | 2132 +++++++++++++++++ 2 files changed, 2276 insertions(+), 86 deletions(-) create mode 100644 gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio_dev.target diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target index c9adebe9..7cf01d40 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target @@ -1,111 +1,169 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + org.eclipse.jetty.osgi + jetty-osgi-boot + 10.0.6 + jar + + + + + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + 1.3.4 + jar + + + + + + + com.ibm.icu + icu4j + 70.1 + jar + + + + + + + javax.servlet + javax.servlet-api + 3.1.0 + jar + + + + + + + org.eclipse.jetty.websocket + websocket-javax-server + 10.0.6 + jar + + + + + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + 1.1.2 + jar + + + - + \ No newline at end of file diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio_dev.target b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio_dev.target new file mode 100644 index 00000000..7fbbe6fd --- /dev/null +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio_dev.target @@ -0,0 +1,2132 @@ + + + + + + + + + + + + + + + + + + + + + + org.eclipse.jetty.osgi + jetty-osgi-boot + 10.0.6 + jar + + + + + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + 1.3.4 + jar + + + + + + + com.ibm.icu + icu4j + 70.1 + jar + + + + + + + javax.servlet + javax.servlet-api + 3.1.0 + jar + + + + + + + org.eclipse.jetty.websocket + websocket-javax-server + 10.0.6 + jar + + + + + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + 1.1.2 + jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 4b9ea2efed2e45c8e17778fa5a2af9aaf7d78e36 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Mon, 28 Mar 2022 18:00:03 +0200 Subject: [PATCH 4/9] bump to tycho 2.7.0 --- .mvn/extensions.xml | 2 +- gemoc_studio/plugins/gemoc_studio-eclipse-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index f9988103..ca92c477 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho.extras tycho-pomless - 2.5.0 + 2.7.0 \ No newline at end of file diff --git a/gemoc_studio/plugins/gemoc_studio-eclipse-bom/pom.xml b/gemoc_studio/plugins/gemoc_studio-eclipse-bom/pom.xml index a65aa057..ca3156e6 100644 --- a/gemoc_studio/plugins/gemoc_studio-eclipse-bom/pom.xml +++ b/gemoc_studio/plugins/gemoc_studio-eclipse-bom/pom.xml @@ -33,7 +33,7 @@ UTF-8 true - 2.5.0 + 2.7.0 2.25.0 http://download.eclipse.org/releases/2021-12 From d0f7c617884759b2537fe90d0016b6f5e64b22c5 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 30 Mar 2022 11:27:57 +0200 Subject: [PATCH 5/9] remove tycho warning --- .mvn/extensions.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index ca92c477..320ec994 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,8 +1,8 @@ - - org.eclipse.tycho.extras - tycho-pomless - 2.7.0 - + + org.eclipse.tycho + tycho-build + 2.7.0 + \ No newline at end of file From c0ff8686c74c556a62580f646e84b2fd9eed6b4b Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Wed, 30 Mar 2022 11:53:04 +0200 Subject: [PATCH 6/9] add eaop server to headless --- .../feature.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.headless.feature/feature.xml b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.headless.feature/feature.xml index f65dffc6..578d3f27 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.headless.feature/feature.xml +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.headless.feature/feature.xml @@ -101,6 +101,9 @@ http://www.eclipse.org/legal/epl-v10.html + + + Date: Thu, 31 Mar 2022 17:33:42 +0200 Subject: [PATCH 7/9] add EAOP documentation --- .../pomfirst_full_compilation/README.asciidoc | 74 +++++++++++++++++++ .../tycho_full_compilation/README.asciidoc | 11 ++- docs/org.eclipse.gemoc.studio.doc/pom.xml | 4 + .../dev/Protocols_headContent.asciidoc | 28 +++++++ .../images/dev/ProtocolsOverview.plantuml | 15 ++++ .../src/main/asciidoc/master.asciidoc | 9 ++- 6 files changed, 139 insertions(+), 2 deletions(-) create mode 100644 dev_support/pomfirst_full_compilation/README.asciidoc create mode 100644 docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc create mode 100644 docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/images/dev/ProtocolsOverview.plantuml diff --git a/dev_support/pomfirst_full_compilation/README.asciidoc b/dev_support/pomfirst_full_compilation/README.asciidoc new file mode 100644 index 00000000..b84e9d89 --- /dev/null +++ b/dev_support/pomfirst_full_compilation/README.asciidoc @@ -0,0 +1,74 @@ +//////////////////////////////////////////////////////////////// +// Reproduce title only if not included in master documentation +//////////////////////////////////////////////////////////////// +ifndef::includedInMaster[] + += Developer Guide +== Contributing + +endif::[] + + +=== Compilation of the pom first jar + +==== Introduction + +Some of the components provided as part of the GEMOC Studio are now available as pomfirst. This means that the jar are compiled and provided using +maven dependency system (while the Eclipse studio is compiled using manifest dependency information using tycho). + +Only a subset of the components are provided as pomfirst. You can still use them in your pomfirst build but will need to rebuild the dependencies for maven. +(You can also open a request https://github.com/eclipse/gemoc-studio/issues for a given jar you may require). + +The source code of the [GEMOC Studio](http://gemoc.org/studio/) is currently spread among different git repositories in Eclipse organization. + +This project relies on the presence of the correct git repositories (cloned with the correct name) to locally build a working studio. + + +==== Usage + +First checkout the git repositories : + +[source,bourne] +---- +git clone https://github.com/eclipse/gemoc-studio +git clone https://github.com/eclipse/gemoc-studio-modeldebugging +git clone https://github.com/eclipse/gemoc-studio-execution-moccml +git clone https://github.com/eclipse/gemoc-studio-moccml +git clone https://github.com/eclipse/gemoc-studio-execution-ale +git clone https://github.com/eclipse/gemoc-studio-execution-java +---- + +Note: the repositories must keep their names (Ie. do not change the destination folder name) as the maven pom file expects to find them at specific locations. + +Generate the protocols code + +[source,bourne] +---- +cd gemoc-studio-modeldebugging/protocols/generators/ts/JSONSchema2APIProtocolGenerator +npm run build +npm run generate +---- + +Then compile and install the pomfirst component: + +[source,bourne] +---- +cd gemoc-studio/dev_support/pomfirst_full_compilation +mvn install +---- + +[NOTE] +==== +Most of the pomfirst component are completely recompiled from the same sources as their tycho equivalent but using maven dependencies instead of platform target. +This is NOT only a repackaging of the .class and ensure that the dependencies are all defined. + +They typically use `maven-resources-plugin` to copy the java sources. +==== + +[NOTE] +==== +`gemoc-studio/dev_support/pomfirst_full_compilation/pom.xml` is a convenient central place to compile all of them across the GEMOC repositories in one command. +==== + + + diff --git a/dev_support/tycho_full_compilation/README.asciidoc b/dev_support/tycho_full_compilation/README.asciidoc index 7995ab94..4a2c4a3c 100644 --- a/dev_support/tycho_full_compilation/README.asciidoc +++ b/dev_support/tycho_full_compilation/README.asciidoc @@ -34,7 +34,16 @@ git clone https://github.com/eclipse/gemoc-studio-execution-java Note: the repositories must keep their names (Ie. do not change the destination folder name) as the maven pom file expects to find them at specific locations. -Then compile using maven: +Generate the protocols code + +[source,bourne] +---- +cd gemoc-studio-modeldebugging/protocols/generators/ts/JSONSchema2APIProtocolGenerator +npm run build +npm run generate +---- + +Then compile the Eclipse Studio using maven: [source,bourne] ---- diff --git a/docs/org.eclipse.gemoc.studio.doc/pom.xml b/docs/org.eclipse.gemoc.studio.doc/pom.xml index afd320d8..b001ef9c 100644 --- a/docs/org.eclipse.gemoc.studio.doc/pom.xml +++ b/docs/org.eclipse.gemoc.studio.doc/pom.xml @@ -171,6 +171,10 @@ ${basedir}/../../../gemoc-studio-modeldebugging/commons/docs/dev/images images + + + ${basedir}/../../../gemoc-studio-modeldebugging/protocols/engine_addon_protocol/docs/images + images ${basedir}/../../../gemoc-studio-execution-java/docs/dev/images diff --git a/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc b/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc new file mode 100644 index 00000000..733dfac9 --- /dev/null +++ b/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc @@ -0,0 +1,28 @@ +//////////////////////////////////////////////////////////////// +// Reproduce title only if not included in master documentation +//////////////////////////////////////////////////////////////// +ifndef::includedInMaster[] + += Developer Guide +== Components Overview + +endif::[] + + +footnote:[asciidoc source of this page: https://github.com/eclipse/gemoc-studio/tree/master/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc.] + +In addition to java API, the GEMOC Studio implements several web protocols. + +For consistency, these protocols are defined using the same mechanism as LSP. + +However, in order to be deployed internally in web browsers, instead of defining a socket or a port for each protocol, most implementation in the studio use websockets. + +For convenience, an extensible websocket server is provided as an eclipse plugin. This allows to deploy a new endpoint in any eclipse based application or IDE, +simply by adding a plugin extension. + +<> shows an overview of the components that offer or use the protocols in the Eclipse Studio. + +[[img-ProtocolsOverview-devguide]] +.Protocols overview +image::images/dev/ProtocolsOverview.png["Protocols overview", 1024] + diff --git a/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/images/dev/ProtocolsOverview.plantuml b/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/images/dev/ProtocolsOverview.plantuml new file mode 100644 index 00000000..d5d19f7e --- /dev/null +++ b/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/images/dev/ProtocolsOverview.plantuml @@ -0,0 +1,15 @@ +@startuml +skinparam ComponentBorderColor black + +scale max 1024 width +scale max 800 height + +node "Execution Framework" as exec_framework { + [org.eclipse.gemoc.executionframework.addon.eaop.server] +} + +interface "Engine AddOn Protocol" as EAOP + +org.eclipse.gemoc.executionframework.addon.eaop.server - EAOP + +@enduml \ No newline at end of file diff --git a/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/master.asciidoc b/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/master.asciidoc index f4c2b0c0..2b97b5ca 100644 --- a/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/master.asciidoc +++ b/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/master.asciidoc @@ -316,10 +316,17 @@ include::../../../../../../gemoc-studio-execution-java/docs/dev/JavaExecution.as include::../../../../../../gemoc-studio-execution-ale/docs/dev/ALEExecution.asciidoc[] +== Protocols + +include::dev/Protocols_headContent.asciidoc[] + +include::../../../../../../gemoc-studio-modeldebugging/protocols/engine_addon_protocol/docs/EngineAddonProtocol.asciidoc[] + == Contributing -include::../../../../../../gemoc-studio/dev_support/full_compilation/README.asciidoc[] +include::../../../../../../gemoc-studio/dev_support/tycho_full_compilation/README.asciidoc[] +include::../../../../../../gemoc-studio/dev_support/pomfirst_full_compilation/README.asciidoc[] === Developing new features From cc73de4754e7101adfeffede4addffb6746baa05 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Thu, 31 Mar 2022 17:40:10 +0200 Subject: [PATCH 8/9] fix figure presentation --- .../src/main/asciidoc/dev/Protocols_headContent.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc b/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc index 733dfac9..9f4a7981 100644 --- a/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc +++ b/docs/org.eclipse.gemoc.studio.doc/src/main/asciidoc/dev/Protocols_headContent.asciidoc @@ -24,5 +24,5 @@ simply by adding a plugin extension. [[img-ProtocolsOverview-devguide]] .Protocols overview -image::images/dev/ProtocolsOverview.png["Protocols overview", 1024] +image::images/dev/ProtocolsOverview.png["Protocols overview"] From 28094f1f3ab1a13cf5897142a52c1b7ec05ce578 Mon Sep 17 00:00:00 2001 From: Didier Vojtisek Date: Fri, 8 Apr 2022 11:41:11 +0200 Subject: [PATCH 9/9] add mapstruct to targetplatform --- .../gemoc_studio.target | 130 +++---- .../gemoc_studio_dev.target | 316 ++---------------- 2 files changed, 93 insertions(+), 353 deletions(-) diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target index 7cf01d40..41ce8e3a 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio.target @@ -104,66 +104,76 @@ - - - - org.eclipse.jetty.osgi - jetty-osgi-boot - 10.0.6 - jar - - - - - - - org.apache.aries.spifly - org.apache.aries.spifly.dynamic.bundle - 1.3.4 - jar - - - - - - - com.ibm.icu - icu4j - 70.1 - jar - - - - - - - javax.servlet - javax.servlet-api - 3.1.0 - jar - - - - - - - org.eclipse.jetty.websocket - websocket-javax-server - 10.0.6 - jar - - - - - - - org.eclipse.jetty.toolchain - jetty-javax-websocket-api - 1.1.2 - jar - - - + + + + org.eclipse.jetty.osgi + jetty-osgi-boot + 10.0.6 + jar + + + + + + + org.apache.aries.spifly + org.apache.aries.spifly.dynamic.bundle + 1.3.4 + jar + + + + + + + com.ibm.icu + icu4j + 70.1 + jar + + + + + + + javax.servlet + javax.servlet-api + 3.1.0 + jar + + + + + + + org.eclipse.jetty.websocket + websocket-javax-server + 10.0.6 + jar + + + + + + + org.eclipse.jetty.toolchain + jetty-javax-websocket-api + 1.1.2 + jar + + + + + + + org.mapstruct + mapstruct + 1.4.2.Final + jar + + + \ No newline at end of file diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio_dev.target b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio_dev.target index 7fbbe6fd..3dbc5bf6 100644 --- a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio_dev.target +++ b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.targetplatform/gemoc_studio_dev.target @@ -76,37 +76,39 @@ + + + + org.mapstruct + mapstruct + 1.4.2.Final + jar + + + - - - - - - - - @@ -196,23 +198,17 @@ - - - - - - @@ -220,7 +216,6 @@ - @@ -232,8 +227,8 @@ - + @@ -242,15 +237,11 @@ - - - - - - + + @@ -258,8 +249,6 @@ - - @@ -270,11 +259,9 @@ - - @@ -283,18 +270,12 @@ - - - - - - @@ -303,8 +284,6 @@ - - @@ -324,13 +303,11 @@ - + - - @@ -338,8 +315,6 @@ - - @@ -393,60 +368,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -454,127 +405,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -642,8 +537,6 @@ - - @@ -677,23 +570,17 @@ - - - - - - @@ -791,24 +678,16 @@ - - - - - - - - @@ -828,14 +707,10 @@ - - - - @@ -848,24 +723,16 @@ - - - - - - - - @@ -876,8 +743,6 @@ - - @@ -902,21 +767,15 @@ - - - - - - @@ -1240,20 +1099,18 @@ - - - - + + @@ -1265,19 +1122,13 @@ - - - - - - @@ -1293,73 +1144,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1376,22 +1199,13 @@ - - - - - - - - - @@ -1410,39 +1224,29 @@ - - - - - - - - - - @@ -1528,12 +1332,8 @@ - - - - @@ -1632,21 +1432,15 @@ - - - - - - + + - - @@ -1665,8 +1459,6 @@ - - @@ -1702,8 +1494,6 @@ - - @@ -1766,10 +1556,7 @@ - - - @@ -1777,21 +1564,15 @@ - - - - - - @@ -1801,81 +1582,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1897,8 +1650,6 @@ - - @@ -1926,12 +1677,8 @@ - - - - @@ -2009,8 +1756,6 @@ - - @@ -2044,7 +1789,6 @@ - @@ -2077,13 +1821,11 @@ - - - - - + + + @@ -2092,11 +1834,9 @@ - - - + @@ -2106,27 +1846,17 @@ - - - - - - - - - - - + \ No newline at end of file