author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
426,496 | 27.01.2022 11:37:57 | -3,600 | 2acbcf6a7cf83e770e39a0bb668d86a3737fc769 | Catch exception during generation (/generatorOutput) | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.ui.server/models/org.modelix.ui.server.plugin.mps",
"new_path": "mps/org.modelix.ui.server/models/org.modelix.ui.server.plugin.mps",
"diff": "<property role=\"3TUv4t\" value=\"false\" />\n<property role=\"TrG5h\" value=\"e\" />\n<node concept=\"nSUau\" id=\"xvs04dHujc\" role=\"1tU5fm\">\n- <node concept=\"3uibUv\" id=\"3$1OzWlnJa6\" role=\"nSUat\">\n- <ref role=\"3uigEE\" to=\"wyt6:~InterruptedException\" resolve=\"InterruptedException\" />\n+ <node concept=\"3uibUv\" id=\"22Fk$FCAjQu\" role=\"nSUat\">\n+ <ref role=\"3uigEE\" to=\"wyt6:~Exception\" resolve=\"Exception\" />\n</node>\n</node>\n</node>\n<node concept=\"RRSsy\" id=\"3jYQuSB35mT\" role=\"3cqZAp\">\n<property role=\"RRSoG\" value=\"gZ5fh_4/error\" />\n<node concept=\"Xl_RD\" id=\"6tSARFM5ZAr\" role=\"RRSoy\">\n- <property role=\"Xl_RC\" value=\"Error on making temporary model\" />\n+ <property role=\"Xl_RC\" value=\"Generation failed\" />\n</node>\n<node concept=\"37vLTw\" id=\"6tSARFM5ZAs\" role=\"RRSow\">\n<ref role=\"3cqZAo\" node=\"3$1OzWlnE2m\" resolve=\"e\" />\n<node concept=\"3cpWs6\" id=\"3ldDl3LM_fV\" role=\"3cqZAp\">\n<node concept=\"3cpWs3\" id=\"3ldDl3M3yhv\" role=\"3cqZAk\">\n<node concept=\"3cpWs3\" id=\"3ldDl3LMJcE\" role=\"3uHU7B\">\n- <node concept=\"3cpWs3\" id=\"3ldDl3LMZOh\" role=\"3uHU7B\">\n- <node concept=\"2OqwBi\" id=\"3ldDl3LN1CK\" role=\"3uHU7w\">\n- <node concept=\"37vLTw\" id=\"3ldDl3LN05b\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3$1OzWlnE2m\" resolve=\"e\" />\n- </node>\n- <node concept=\"liA8E\" id=\"3ldDl3LN3s9\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"wyt6:~Throwable.getStackTrace()\" resolve=\"getStackTrace\" />\n- </node>\n- </node>\n- <node concept=\"3cpWs3\" id=\"3ldDl3LMTww\" role=\"3uHU7B\">\n<node concept=\"3cpWs3\" id=\"3ldDl3LMHFx\" role=\"3uHU7B\">\n<node concept=\"Xl_RD\" id=\"3ldDl3LMHFB\" role=\"3uHU7B\">\n<property role=\"Xl_RC\" value=\"Generation failed <pre>\" />\n<node concept=\"2YIFZM\" id=\"3ldDl3LMMI$\" role=\"3uHU7w\">\n<ref role=\"37wK5l\" to=\"btm1:~StringEscapeUtils.escapeHtml4(java.lang.String)\" resolve=\"escapeHtml4\" />\n<ref role=\"1Pybhc\" to=\"btm1:~StringEscapeUtils\" resolve=\"StringEscapeUtils\" />\n- <node concept=\"2OqwBi\" id=\"3ldDl3LMPMq\" role=\"37wK5m\">\n- <node concept=\"37vLTw\" id=\"3ldDl3LMOw$\" role=\"2Oq$k0\">\n+ <node concept=\"1rXfSq\" id=\"jv9NKuJ1Bh\" role=\"37wK5m\">\n+ <ref role=\"37wK5l\" node=\"22Fk$FCCF8z\" resolve=\"exceptionToText\" />\n+ <node concept=\"37vLTw\" id=\"jv9NKuJ3NU\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"3$1OzWlnE2m\" resolve=\"e\" />\n</node>\n- <node concept=\"liA8E\" id=\"3ldDl3LMRKs\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"wyt6:~Throwable.getMessage()\" resolve=\"getMessage\" />\n- </node>\n- </node>\n- </node>\n- </node>\n- <node concept=\"Xl_RD\" id=\"3ldDl3LMTLq\" role=\"3uHU7w\">\n- <property role=\"Xl_RC\" value=\"\\n\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n</node>\n- <node concept=\"3uVAMA\" id=\"3$1OzWlnJa8\" role=\"1zxBo5\">\n- <node concept=\"XOnhg\" id=\"3$1OzWlnJa9\" role=\"1zc67B\">\n- <property role=\"3TUv4t\" value=\"false\" />\n- <property role=\"TrG5h\" value=\"e\" />\n- <node concept=\"nSUau\" id=\"xvs04dHuje\" role=\"1tU5fm\">\n- <node concept=\"3uibUv\" id=\"3$1OzWlnJgo\" role=\"nSUat\">\n- <ref role=\"3uigEE\" to=\"5zyv:~ExecutionException\" resolve=\"ExecutionException\" />\n</node>\n</node>\n</node>\n- <node concept=\"3clFbS\" id=\"3$1OzWlnJab\" role=\"1zc67A\">\n- <node concept=\"RRSsy\" id=\"3jYQuSB35n1\" role=\"3cqZAp\">\n- <property role=\"RRSoG\" value=\"gZ5fh_4/error\" />\n- <node concept=\"Xl_RD\" id=\"6tSARFM5GNa\" role=\"RRSoy\">\n- <property role=\"Xl_RC\" value=\"Error on making temporary model\" />\n+ <node concept=\"2tJIrI\" id=\"22Fk$FCCCHe\" role=\"jymVt\" />\n+ <node concept=\"3clFb_\" id=\"22Fk$FCCF8z\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"exceptionToText\" />\n+ <node concept=\"37vLTG\" id=\"22Fk$FCCHsm\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"ex\" />\n+ <node concept=\"3uibUv\" id=\"22Fk$FCCJMq\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"wyt6:~Throwable\" resolve=\"Throwable\" />\n</node>\n- <node concept=\"37vLTw\" id=\"6tSARFM5GNc\" role=\"RRSow\">\n- <ref role=\"3cqZAo\" node=\"3$1OzWlnJa9\" resolve=\"e\" />\n</node>\n+ <node concept=\"17QB3L\" id=\"22Fk$FCCHsi\" role=\"3clF45\" />\n+ <node concept=\"3Tm1VV\" id=\"22Fk$FCCF8A\" role=\"1B3o_S\" />\n+ <node concept=\"3clFbS\" id=\"22Fk$FCCF8B\" role=\"3clF47\">\n+ <node concept=\"3cpWs8\" id=\"jv9NKuIV82\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"jv9NKuIV83\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"text\" />\n+ <node concept=\"17QB3L\" id=\"jv9NKuIV65\" role=\"1tU5fm\" />\n+ <node concept=\"3cpWs3\" id=\"jv9NKuIV84\" role=\"33vP2m\">\n+ <node concept=\"2OqwBi\" id=\"jv9NKuIV85\" role=\"3uHU7w\">\n+ <node concept=\"2OqwBi\" id=\"jv9NKuIV86\" role=\"2Oq$k0\">\n+ <node concept=\"2OqwBi\" id=\"jv9NKuIV87\" role=\"2Oq$k0\">\n+ <node concept=\"2OqwBi\" id=\"jv9NKuIV88\" role=\"2Oq$k0\">\n+ <node concept=\"37vLTw\" id=\"jv9NKuIV89\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"22Fk$FCCHsm\" resolve=\"ex\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"jv9NKuIV8a\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Throwable.getStackTrace()\" resolve=\"getStackTrace\" />\n</node>\n- <node concept=\"3cpWs6\" id=\"3ldDl3LNcGM\" role=\"3cqZAp\">\n- <node concept=\"3cpWs3\" id=\"3ldDl3M3_sv\" role=\"3cqZAk\">\n- <node concept=\"3cpWs3\" id=\"3ldDl3LNcGN\" role=\"3uHU7B\">\n- <node concept=\"3cpWs3\" id=\"3ldDl3LNcGP\" role=\"3uHU7B\">\n- <node concept=\"2OqwBi\" id=\"3ldDl3LNcGQ\" role=\"3uHU7w\">\n- <node concept=\"37vLTw\" id=\"3ldDl3LNcGR\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3$1OzWlnJa9\" resolve=\"e\" />\n</node>\n- <node concept=\"liA8E\" id=\"3ldDl3LNcGS\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"wyt6:~Throwable.getStackTrace()\" resolve=\"getStackTrace\" />\n+ <node concept=\"39bAoz\" id=\"jv9NKuIV8b\" role=\"2OqNvi\" />\n</node>\n+ <node concept=\"3$u5V9\" id=\"jv9NKuIV8c\" role=\"2OqNvi\">\n+ <node concept=\"1bVj0M\" id=\"jv9NKuIV8d\" role=\"23t8la\">\n+ <node concept=\"3clFbS\" id=\"jv9NKuIV8e\" role=\"1bW5cS\">\n+ <node concept=\"3clFbF\" id=\"jv9NKuIV8f\" role=\"3cqZAp\">\n+ <node concept=\"3cpWs3\" id=\"jv9NKuJAlu\" role=\"3clFbG\">\n+ <node concept=\"Xl_RD\" id=\"jv9NKuJAEG\" role=\"3uHU7B\">\n+ <property role=\"Xl_RC\" value=\" \" />\n</node>\n- <node concept=\"3cpWs3\" id=\"3ldDl3LNcGT\" role=\"3uHU7B\">\n- <node concept=\"3cpWs3\" id=\"3ldDl3LNcGU\" role=\"3uHU7B\">\n- <node concept=\"Xl_RD\" id=\"3ldDl3LNcGV\" role=\"3uHU7B\">\n- <property role=\"Xl_RC\" value=\"Generation failed <pre>\" />\n+ <node concept=\"2OqwBi\" id=\"jv9NKuIV8g\" role=\"3uHU7w\">\n+ <node concept=\"37vLTw\" id=\"jv9NKuIV8h\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"jv9NKuIV8j\" resolve=\"it\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"jv9NKuIV8i\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~StackTraceElement.toString()\" resolve=\"toString\" />\n</node>\n- <node concept=\"2YIFZM\" id=\"3ldDl3LNcGW\" role=\"3uHU7w\">\n- <ref role=\"37wK5l\" to=\"btm1:~StringEscapeUtils.escapeHtml4(java.lang.String)\" resolve=\"escapeHtml4\" />\n- <ref role=\"1Pybhc\" to=\"btm1:~StringEscapeUtils\" resolve=\"StringEscapeUtils\" />\n- <node concept=\"2OqwBi\" id=\"3ldDl3LNcGX\" role=\"37wK5m\">\n- <node concept=\"37vLTw\" id=\"3ldDl3LNcGY\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3$1OzWlnJa9\" resolve=\"e\" />\n</node>\n- <node concept=\"liA8E\" id=\"3ldDl3LNcGZ\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"wyt6:~Throwable.getMessage()\" resolve=\"getMessage\" />\n</node>\n</node>\n</node>\n+ <node concept=\"Rh6nW\" id=\"jv9NKuIV8j\" role=\"1bW2Oz\">\n+ <property role=\"TrG5h\" value=\"it\" />\n+ <node concept=\"2jxLKc\" id=\"jv9NKuIV8k\" role=\"1tU5fm\" />\n+ </node>\n</node>\n- <node concept=\"Xl_RD\" id=\"3ldDl3LNcH0\" role=\"3uHU7w\">\n+ </node>\n+ </node>\n+ <node concept=\"3uJxvA\" id=\"jv9NKuIV8l\" role=\"2OqNvi\">\n+ <node concept=\"Xl_RD\" id=\"jv9NKuIV8m\" role=\"3uJOhx\">\n<property role=\"Xl_RC\" value=\"\\n\" />\n</node>\n</node>\n</node>\n- <node concept=\"Xl_RD\" id=\"3ldDl3LNcGO\" role=\"3uHU7w\">\n- <property role=\"Xl_RC\" value=\"</pre>\" />\n+ <node concept=\"3cpWs3\" id=\"jv9NKuIV8n\" role=\"3uHU7B\">\n+ <node concept=\"2OqwBi\" id=\"jv9NKuIV8o\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"jv9NKuIV8p\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"22Fk$FCCHsm\" resolve=\"ex\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"jv9NKuIV8q\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Throwable.getMessage()\" resolve=\"getMessage\" />\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"jv9NKuIV8r\" role=\"3uHU7w\">\n+ <property role=\"Xl_RC\" value=\"\\n\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbJ\" id=\"jv9NKuIVPs\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"jv9NKuIVPu\" role=\"3clFbx\">\n+ <node concept=\"3clFbF\" id=\"jv9NKuIXjZ\" role=\"3cqZAp\">\n+ <node concept=\"d57v9\" id=\"jv9NKuIXOj\" role=\"3clFbG\">\n+ <node concept=\"3cpWs3\" id=\"jv9NKuIY8S\" role=\"37vLTx\">\n+ <node concept=\"1rXfSq\" id=\"jv9NKuIYsu\" role=\"3uHU7w\">\n+ <ref role=\"37wK5l\" node=\"22Fk$FCCF8z\" resolve=\"exceptionToText\" />\n+ <node concept=\"2OqwBi\" id=\"jv9NKuIYVf\" role=\"37wK5m\">\n+ <node concept=\"37vLTw\" id=\"jv9NKuIYNu\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"22Fk$FCCHsm\" resolve=\"ex\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"jv9NKuIZ5d\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Throwable.getCause()\" resolve=\"getCause\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"jv9NKuIXYP\" role=\"3uHU7B\">\n+ <property role=\"Xl_RC\" value=\"Caused by: \" />\n+ </node>\n+ </node>\n+ <node concept=\"37vLTw\" id=\"jv9NKuIXjX\" role=\"37vLTJ\">\n+ <ref role=\"3cqZAo\" node=\"jv9NKuIV83\" resolve=\"text\" />\n</node>\n</node>\n- <node concept=\"1rXfSq\" id=\"3ldDl3M3AGs\" role=\"3uHU7w\">\n- <ref role=\"37wK5l\" node=\"3ldDl3M2HhQ\" resolve=\"messagesToHtml\" />\n- <node concept=\"2OqwBi\" id=\"3ldDl3M3AGt\" role=\"37wK5m\">\n- <node concept=\"37vLTw\" id=\"3ldDl3M3AGu\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"7VNTBiFGNDQ\" resolve=\"messageHandler\" />\n</node>\n- <node concept=\"2OwXpG\" id=\"3ldDl3M3AGv\" role=\"2OqNvi\">\n- <ref role=\"2Oxat5\" node=\"3ldDl3LL8hg\" resolve=\"messages\" />\n</node>\n+ <node concept=\"3y3z36\" id=\"jv9NKuIWC0\" role=\"3clFbw\">\n+ <node concept=\"10Nm6u\" id=\"jv9NKuIX5I\" role=\"3uHU7w\" />\n+ <node concept=\"2OqwBi\" id=\"jv9NKuIWhM\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"jv9NKuIW4U\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"22Fk$FCCHsm\" resolve=\"ex\" />\n</node>\n+ <node concept=\"liA8E\" id=\"jv9NKuIWxG\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Throwable.getCause()\" resolve=\"getCause\" />\n</node>\n</node>\n</node>\n</node>\n+ <node concept=\"3clFbF\" id=\"22Fk$FCCIny\" role=\"3cqZAp\">\n+ <node concept=\"37vLTw\" id=\"jv9NKuIV8s\" role=\"3clFbG\">\n+ <ref role=\"3cqZAo\" node=\"jv9NKuIV83\" resolve=\"text\" />\n</node>\n</node>\n</node>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Catch exception during generation (/generatorOutput) |
426,496 | 27.01.2022 12:46:08 | -3,600 | 31931bac9f06706534225c8fca8cb499b071de55 | Projector was not using the memory limit configured in kubernetes | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile-projector-base",
"new_path": "Dockerfile-projector-base",
"diff": "@@ -9,6 +9,10 @@ RUN apt-get update \\\n&& rm -rf /var/lib/apt/lists/* \\\n&& rm -rf /var/cache/apt\n+RUN echo \"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5071\" >> /projector/ide/bin/mps64.vmoptions\n+RUN sed -i.bak '/-Xmx/d' /projector/ide/bin/mps64.vmoptions\n+RUN echo \"-XX:MaxRAMPercentage=85\" >> /projector/ide/bin/mps64.vmoptions\n+\nRUN mkdir -p /mps-plugins\nRUN mkdir -p /mps-languages\nRUN chown -R projector-user:projector-user /home/projector-user\n"
},
{
"change_type": "MODIFY",
"old_path": "doc/running-modelix.md",
"new_path": "doc/running-modelix.md",
"diff": "@@ -2,6 +2,11 @@ In production Modelix uses docker images running in a kubernetes cluster.\nDuring development you can run the different components without docker/kubernetes.\nYou need a PostgreSQL database, the model server and the MPS plugin for the UI server.\n+## Docker Desktop\n+If you use Docker Desktop >= 4.2.0 you have to add the option `\"deprecatedCgroupv1\": true`\n+to the file `~/Library/Group Containers/group.com.docker/settings.json`.\n+Otherwise, MPS (the JBR) will not use the correct memory limit.\n+\n## Model Server\n- Option 1: Install your own PostgreSQL database and start the model server from the command line.\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Projector was not using the memory limit configured in kubernetes |
426,504 | 27.01.2022 13:40:32 | -3,600 | af62eac6d79eee615aec9365b9d3736133d775be | disable automatic checkout of transient modules during export | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.build/models/org.modelix.build.mps",
"new_path": "mps/org.modelix.build/models/org.modelix.build.mps",
"diff": "<node concept=\"m$_yC\" id=\"7MZ_dOGM_WR\" role=\"m$_yJ\">\n<ref role=\"m$_y1\" to=\"ffeo:ymnOULATpW\" resolve=\"jetbrains.mps.testing\" />\n</node>\n+ <node concept=\"m$_yC\" id=\"7KeeG8vthoq\" role=\"m$_yJ\">\n+ <ref role=\"m$_y1\" to=\"ffeo:6EN03E8oSte\" resolve=\"jetbrains.mps.ide.make\" />\n+ </node>\n</node>\n<node concept=\"m$_wf\" id=\"7gF2HTviNPW\" role=\"3989C9\">\n<property role=\"m$_wk\" value=\"org.modelix.model\" />\n<node concept=\"m$_yC\" id=\"1WL5L9NoGLz\" role=\"m$_yJ\">\n<ref role=\"m$_y1\" to=\"90a9:5U8hsWC762L\" resolve=\"org.modelix.model.api\" />\n</node>\n+ <node concept=\"m$_yC\" id=\"7KeeG8vti0M\" role=\"m$_yJ\">\n+ <ref role=\"m$_y1\" to=\"ffeo:6EN03E8oSte\" resolve=\"jetbrains.mps.ide.make\" />\n+ </node>\n</node>\n<node concept=\"m$_wf\" id=\"6HlxtAUTj2a\" role=\"3989C9\">\n<property role=\"m$_wk\" value=\"org.modelix.langdev\" />\n<node concept=\"3LEDTy\" id=\"7BujJjYSJ9v\" role=\"3LEDUa\">\n<ref role=\"3LEDTV\" node=\"7gF2HTviNPn\" resolve=\"org.modelix.ui.sm\" />\n</node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjpS\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6L2l\" resolve=\"jetbrains.mps.baseLanguage.logging\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjpT\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6L2F\" resolve=\"jetbrains.mps.baseLanguage.tuples\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjpU\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"90a9:4iIKqJTZ5HO\" resolve=\"de.q60.mps.shadowmodels.transformation\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjpV\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6L0h\" resolve=\"jetbrains.mps.baseLanguage.collections\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjpW\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:14x5$qAUbkb\" resolve=\"jetbrains.mps.lang.access\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjpX\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6L9O\" resolve=\"jetbrains.mps.lang.smodel\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjpY\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"90a9:4iIKqJTZ5Hg\" resolve=\"de.q60.mps.shadowmodels.gen.afterPF\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjpZ\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"90a9:4iIKqJTZ5Hs\" resolve=\"de.q60.mps.polymorphicfunctions\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjq0\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"90a9:2$QnGbtLXzL\" resolve=\"de.q60.mps.shadowmodels.gen.desugar\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjq1\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6L4j\" resolve=\"jetbrains.mps.lang.actions\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjq2\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6KZG\" resolve=\"jetbrains.mps.baseLanguage.closures\" />\n- </node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjq3\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6KYb\" resolve=\"jetbrains.mps.baseLanguage\" />\n+ <node concept=\"3LEDTy\" id=\"7KeeG8vtgJx\" role=\"3LEDUa\">\n+ <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6KXW\" resolve=\"jetbrains.mps.lang.core\" />\n</node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjq4\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"90a9:7c10t$7lQIA\" resolve=\"de.q60.mps.shadowmodels.gen.typesystem\" />\n+ <node concept=\"3LEDTy\" id=\"7KeeG8vtgJy\" role=\"3LEDUa\">\n+ <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6L9c\" resolve=\"jetbrains.mps.lang.quotation\" />\n</node>\n- <node concept=\"3LEDTy\" id=\"25JjLrsFjq5\" role=\"3LEDUa\">\n- <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6KZ0\" resolve=\"jetbrains.mps.baseLanguageInternal\" />\n+ <node concept=\"3LEDTy\" id=\"7KeeG8vtgJz\" role=\"3LEDUa\">\n+ <ref role=\"3LEDTV\" to=\"ffeo:7Kfy9QB6KZc\" resolve=\"jetbrains.mps.baseLanguage.checkedDots\" />\n</node>\n</node>\n<node concept=\"1E1JtD\" id=\"7BujJjXYVmv\" role=\"2G$12L\">\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "<import index=\"fn29\" ref=\"r:6ba2667b-185e-45cd-ac65-e4b9d66da28e(jetbrains.mps.smodel.resources)\" />\n<import index=\"et5u\" ref=\"6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)\" />\n<import index=\"i9so\" ref=\"r:9e5578e0-37f0-4c9b-a301-771bcb453678(jetbrains.mps.make.script)\" />\n+ <import index=\"z1c5\" ref=\"86441d7a-e194-42da-81a5-2161ec62a379/java:jetbrains.mps.project(MPS.Workbench/)\" />\n+ <import index=\"1ctc\" ref=\"6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)\" />\n<import index=\"guwi\" ref=\"6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)\" implicit=\"true\" />\n<import index=\"71xd\" ref=\"742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)\" implicit=\"true\" />\n<import index=\"hvt5\" ref=\"0a2651ab-f212-45c2-a2f0-343e76cbc26b/java:org.modelix.model(org.modelix.model.client/)\" implicit=\"true\" />\n<concept id=\"1169194658468\" name=\"jetbrains.mps.lang.core.structure.INamedConcept\" flags=\"ng\" index=\"TrEIO\">\n<property id=\"1169194664001\" name=\"name\" index=\"TrG5h\" />\n</concept>\n+ <concept id=\"709746936026466394\" name=\"jetbrains.mps.lang.core.structure.ChildAttribute\" flags=\"ng\" index=\"3VBwX9\">\n+ <property id=\"709746936026609031\" name=\"linkId\" index=\"3V$3ak\" />\n+ <property id=\"709746936026609029\" name=\"role_DebugInfo\" index=\"3V$3am\" />\n+ </concept>\n+ <concept id=\"4452961908202556907\" name=\"jetbrains.mps.lang.core.structure.BaseCommentAttribute\" flags=\"ng\" index=\"1X3_iC\">\n+ <child id=\"3078666699043039389\" name=\"commentedNode\" index=\"8Wnug\" />\n+ </concept>\n</language>\n<language id=\"c7fb639f-be78-4307-89b0-b5959c3fa8c8\" name=\"jetbrains.mps.lang.text\">\n<concept id=\"155656958578482948\" name=\"jetbrains.mps.lang.text.structure.Word\" flags=\"nn\" index=\"3oM_SD\">\n<node concept=\"3Tm1VV\" id=\"25JjLrsCDh_\" role=\"1B3o_S\" />\n<node concept=\"3cqZAl\" id=\"25JjLrsCDhB\" role=\"3clF45\" />\n<node concept=\"3clFbS\" id=\"25JjLrsCDhC\" role=\"3clF47\">\n+ <node concept=\"3clFbF\" id=\"7eq8Np3gdBX\" role=\"3cqZAp\">\n+ <node concept=\"2YIFZM\" id=\"7eq8Np3ge8d\" role=\"3clFbG\">\n+ <ref role=\"37wK5l\" to=\"dxuu:~SwingUtilities.invokeLater(java.lang.Runnable)\" resolve=\"invokeLater\" />\n+ <ref role=\"1Pybhc\" to=\"dxuu:~SwingUtilities\" resolve=\"SwingUtilities\" />\n+ <node concept=\"2ShNRf\" id=\"7eq8Np3gfff\" role=\"37wK5m\">\n+ <node concept=\"YeOm9\" id=\"7eq8Np3gyYb\" role=\"2ShVmc\">\n+ <node concept=\"1Y3b0j\" id=\"7eq8Np3gyYe\" role=\"YeSDq\">\n+ <property role=\"2bfB8j\" value=\"true\" />\n+ <ref role=\"1Y3XeK\" to=\"wyt6:~Runnable\" resolve=\"Runnable\" />\n+ <ref role=\"37wK5l\" to=\"wyt6:~Object.<init>()\" resolve=\"Object\" />\n+ <node concept=\"3Tm1VV\" id=\"7eq8Np3gyYf\" role=\"1B3o_S\" />\n+ <node concept=\"3clFb_\" id=\"7eq8Np3gyYk\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"run\" />\n+ <node concept=\"3Tm1VV\" id=\"7eq8Np3gyYl\" role=\"1B3o_S\" />\n+ <node concept=\"3cqZAl\" id=\"7eq8Np3gyYn\" role=\"3clF45\" />\n+ <node concept=\"3clFbS\" id=\"7eq8Np3gyYo\" role=\"3clF47\">\n<node concept=\"1QHqEO\" id=\"2pMrK1SmBa1\" role=\"3cqZAp\">\n<node concept=\"1QHqEC\" id=\"2pMrK1SmBa3\" role=\"1QHqEI\">\n<node concept=\"3clFbS\" id=\"2pMrK1SmBa5\" role=\"1bW5cS\">\n</node>\n</node>\n</node>\n+ <node concept=\"2AHcQZ\" id=\"7eq8Np3gyYq\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"wyt6:~Override\" resolve=\"Override\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"2AHcQZ\" id=\"25JjLrsCDhE\" role=\"2AJF6D\">\n<ref role=\"2AI5Lk\" to=\"wyt6:~Override\" resolve=\"Override\" />\n</node>\n<property role=\"3GE5qa\" value=\"init\" />\n<node concept=\"2uRRBT\" id=\"115Xaa3ZjO5\" role=\"2uRRB$\">\n<node concept=\"3clFbS\" id=\"115Xaa3ZjO6\" role=\"2VODD2\">\n+ <node concept=\"3cpWs8\" id=\"7eq8Np3gIEP\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"7eq8Np3gIEQ\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"executionMode\" />\n+ <node concept=\"3uibUv\" id=\"7eq8Np3gIER\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" node=\"5Le8ZRJdWor\" resolve=\"EModelixExecutionMode\" />\n+ </node>\n+ <node concept=\"2YIFZM\" id=\"7eq8Np3gIES\" role=\"33vP2m\">\n+ <ref role=\"37wK5l\" node=\"54meraTAO3V\" resolve=\"getExecutionMode\" />\n+ <ref role=\"1Pybhc\" node=\"7Qo$o7gTdFI\" resolve=\"ModelixConfigurationSystemProperties\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbJ\" id=\"7eq8Np3gIPc\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"7eq8Np3gIPe\" role=\"3clFbx\">\n+ <node concept=\"3cpWs6\" id=\"7eq8Np3gJY5\" role=\"3cqZAp\" />\n+ </node>\n+ <node concept=\"3clFbC\" id=\"7eq8Np3gJoj\" role=\"3clFbw\">\n+ <node concept=\"Rm8GO\" id=\"7eq8Np3gJSR\" role=\"3uHU7w\">\n+ <ref role=\"Rm8GQ\" node=\"5Le8ZRJe0YA\" resolve=\"MODEL_EXPORT\" />\n+ <ref role=\"1Px2BO\" node=\"5Le8ZRJdWor\" resolve=\"EModelixExecutionMode\" />\n+ </node>\n+ <node concept=\"37vLTw\" id=\"7eq8Np3gIVc\" role=\"3uHU7B\">\n+ <ref role=\"3cqZAo\" node=\"7eq8Np3gIEQ\" resolve=\"executionMode\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbH\" id=\"7eq8Np3gI_u\" role=\"3cqZAp\" />\n<node concept=\"3clFbF\" id=\"115Xaa3ZjUM\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"115Xaa3Zmcd\" role=\"3clFbG\">\n<node concept=\"2YIFZM\" id=\"wa_gCmsPr2\" role=\"2Oq$k0\">\n</node>\n<node concept=\"2uRRBN\" id=\"115Xaa3ZjOv\" role=\"2uRRB_\">\n<node concept=\"3clFbS\" id=\"115Xaa3ZjOw\" role=\"2VODD2\">\n+ <node concept=\"3cpWs8\" id=\"7eq8Np3gJYo\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"7eq8Np3gJYp\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"executionMode\" />\n+ <node concept=\"3uibUv\" id=\"7eq8Np3gJYq\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" node=\"5Le8ZRJdWor\" resolve=\"EModelixExecutionMode\" />\n+ </node>\n+ <node concept=\"2YIFZM\" id=\"7eq8Np3gJYr\" role=\"33vP2m\">\n+ <ref role=\"37wK5l\" node=\"54meraTAO3V\" resolve=\"getExecutionMode\" />\n+ <ref role=\"1Pybhc\" node=\"7Qo$o7gTdFI\" resolve=\"ModelixConfigurationSystemProperties\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbJ\" id=\"7eq8Np3gJYs\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"7eq8Np3gJYt\" role=\"3clFbx\">\n+ <node concept=\"3cpWs6\" id=\"7eq8Np3gJYu\" role=\"3cqZAp\" />\n+ </node>\n+ <node concept=\"3clFbC\" id=\"7eq8Np3gJYv\" role=\"3clFbw\">\n+ <node concept=\"Rm8GO\" id=\"7eq8Np3gJYw\" role=\"3uHU7w\">\n+ <ref role=\"1Px2BO\" node=\"5Le8ZRJdWor\" resolve=\"EModelixExecutionMode\" />\n+ <ref role=\"Rm8GQ\" node=\"5Le8ZRJe0YA\" resolve=\"MODEL_EXPORT\" />\n+ </node>\n+ <node concept=\"37vLTw\" id=\"7eq8Np3gJYx\" role=\"3uHU7B\">\n+ <ref role=\"3cqZAo\" node=\"7eq8Np3gJYp\" resolve=\"executionMode\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbH\" id=\"7eq8Np3gKe7\" role=\"3cqZAp\" />\n<node concept=\"3clFbF\" id=\"115Xaa3ZmMp\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"115Xaa3ZmMq\" role=\"3clFbG\">\n<node concept=\"2YIFZM\" id=\"wa_gCmsPr3\" role=\"2Oq$k0\">\n<ref role=\"3uigEE\" to=\"lui2:~SModule\" resolve=\"SModule\" />\n</node>\n</node>\n- <node concept=\"2OqwBi\" id=\"4O9Oe_ftaAf\" role=\"10QFUP\">\n+ <node concept=\"2OqwBi\" id=\"7KeeG8vw0wU\" role=\"10QFUP\">\n+ <node concept=\"2OqwBi\" id=\"7KeeG8vvG7q\" role=\"2Oq$k0\">\n+ <node concept=\"2OqwBi\" id=\"7KeeG8vvBS5\" role=\"2Oq$k0\">\n+ <node concept=\"2OqwBi\" id=\"4O9Oe_ftaAf\" role=\"2Oq$k0\">\n<node concept=\"liA8E\" id=\"4O9Oe_ftaAg\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"z1c4:~IProject.getProjectModules()\" resolve=\"getProjectModules\" />\n</node>\n<ref role=\"3cqZAo\" node=\"5wf7OU9pd92\" resolve=\"mpsProject\" />\n</node>\n</node>\n+ <node concept=\"liA8E\" id=\"7KeeG8vvFnE\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"33ny:~Collection.stream()\" resolve=\"stream\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"7KeeG8vvHvA\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"1ctc:~Stream.filter(java.util.function.Predicate)\" resolve=\"filter\" />\n+ <node concept=\"2ShNRf\" id=\"7KeeG8vvH_m\" role=\"37wK5m\">\n+ <node concept=\"YeOm9\" id=\"7KeeG8vvJNp\" role=\"2ShVmc\">\n+ <node concept=\"1Y3b0j\" id=\"7KeeG8vvJNs\" role=\"YeSDq\">\n+ <property role=\"2bfB8j\" value=\"true\" />\n+ <ref role=\"1Y3XeK\" to=\"82uw:~Predicate\" resolve=\"Predicate\" />\n+ <ref role=\"37wK5l\" to=\"wyt6:~Object.<init>()\" resolve=\"Object\" />\n+ <node concept=\"3Tm1VV\" id=\"7KeeG8vvJNt\" role=\"1B3o_S\" />\n+ <node concept=\"3clFb_\" id=\"7KeeG8vvJNz\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"test\" />\n+ <node concept=\"3Tm1VV\" id=\"7KeeG8vvJN$\" role=\"1B3o_S\" />\n+ <node concept=\"10P_77\" id=\"7KeeG8vvJNA\" role=\"3clF45\" />\n+ <node concept=\"37vLTG\" id=\"7KeeG8vvJNB\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"module\" />\n+ <node concept=\"3uibUv\" id=\"7KeeG8vvJNO\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"lui2:~SModule\" resolve=\"SModule\" />\n+ </node>\n+ </node>\n+ <node concept=\"3clFbS\" id=\"7KeeG8vvJND\" role=\"3clF47\">\n+ <node concept=\"3cpWs8\" id=\"7KeeG8vvQ7Z\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"7KeeG8vvQ82\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"virtualFolder\" />\n+ <node concept=\"17QB3L\" id=\"7KeeG8vvQ7X\" role=\"1tU5fm\" />\n+ <node concept=\"2OqwBi\" id=\"7KeeG8vvNGs\" role=\"33vP2m\">\n+ <node concept=\"1eOMI4\" id=\"7KeeG8vvLlt\" role=\"2Oq$k0\">\n+ <node concept=\"10QFUN\" id=\"7KeeG8vvLlq\" role=\"1eOMHV\">\n+ <node concept=\"3uibUv\" id=\"7KeeG8vvLW8\" role=\"10QFUM\">\n+ <ref role=\"3uigEE\" to=\"z1c5:~StandaloneMPSProject\" resolve=\"StandaloneMPSProject\" />\n+ </node>\n+ <node concept=\"37vLTw\" id=\"7KeeG8vvMQP\" role=\"10QFUP\">\n+ <ref role=\"3cqZAo\" node=\"5wf7OU9pd92\" resolve=\"mpsProject\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"7KeeG8vvOH$\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"z1c5:~StandaloneMPSProject.getFolderFor(org.jetbrains.mps.openapi.module.SModule)\" resolve=\"getFolderFor\" />\n+ <node concept=\"37vLTw\" id=\"7KeeG8vvPxR\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"7KeeG8vvJNB\" resolve=\"module\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"abc8K\" id=\"7KeeG8vvRUk\" role=\"3cqZAp\">\n+ <node concept=\"Xl_RD\" id=\"7KeeG8vvSpP\" role=\"abp_N\">\n+ <property role=\"Xl_RC\" value=\"MODULE \" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"7KeeG8vvTIa\" role=\"abp_N\">\n+ <node concept=\"37vLTw\" id=\"7KeeG8vvTcm\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"7KeeG8vvJNB\" resolve=\"module\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"7KeeG8vvTUy\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"lui2:~SModule.getModuleName()\" resolve=\"getModuleName\" />\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"7KeeG8vvUmV\" role=\"abp_N\">\n+ <property role=\"Xl_RC\" value=\" IS IN FOLDER \" />\n+ </node>\n+ <node concept=\"37vLTw\" id=\"7KeeG8vvVtD\" role=\"abp_N\">\n+ <ref role=\"3cqZAo\" node=\"7KeeG8vvQ82\" resolve=\"virtualFolder\" />\n+ </node>\n+ </node>\n+ <node concept=\"abc8K\" id=\"7KeeG8vvWvE\" role=\"3cqZAp\" />\n+ <node concept=\"abc8K\" id=\"7KeeG8vvWCI\" role=\"3cqZAp\" />\n+ <node concept=\"abc8K\" id=\"7KeeG8vvWD2\" role=\"3cqZAp\" />\n+ <node concept=\"3clFbF\" id=\"7KeeG8vvXAl\" role=\"3cqZAp\">\n+ <node concept=\"17R0WA\" id=\"7KeeG8vvZDV\" role=\"3clFbG\">\n+ <node concept=\"Xl_RD\" id=\"7KeeG8vw05V\" role=\"3uHU7w\">\n+ <property role=\"Xl_RC\" value=\"languages\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"7KeeG8vvYa7\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"7KeeG8vvXAj\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"7KeeG8vvQ82\" resolve=\"virtualFolder\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"7KeeG8vvZhR\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~String.toLowerCase()\" resolve=\"toLowerCase\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"7KeeG8vvJNF\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"wyt6:~Override\" resolve=\"Override\" />\n+ </node>\n+ </node>\n+ <node concept=\"3uibUv\" id=\"7KeeG8vvJNN\" role=\"2Ghqu4\">\n+ <ref role=\"3uigEE\" to=\"lui2:~SModule\" resolve=\"SModule\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"7KeeG8vw2xi\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"1ctc:~Stream.collect(java.util.stream.Collector)\" resolve=\"collect\" />\n+ <node concept=\"2YIFZM\" id=\"7KeeG8vw5pt\" role=\"37wK5m\">\n+ <ref role=\"37wK5l\" to=\"1ctc:~Collectors.toList()\" resolve=\"toList\" />\n+ <ref role=\"1Pybhc\" to=\"1ctc:~Collectors\" resolve=\"Collectors\" />\n+ </node>\n+ </node>\n+ </node>\n</node>\n</node>\n</node>\n</node>\n</node>\n</node>\n- <node concept=\"3clFbJ\" id=\"5wf7OU9pdj3\" role=\"3cqZAp\">\n+ <node concept=\"1X3_iC\" id=\"7KeeG8vvn9b\" role=\"lGtFl\">\n+ <property role=\"3V$3am\" value=\"statement\" />\n+ <property role=\"3V$3ak\" value=\"f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665\" />\n+ <node concept=\"3clFbJ\" id=\"5wf7OU9pdj3\" role=\"8Wnug\">\n<node concept=\"3clFbS\" id=\"5wf7OU9pdj4\" role=\"3clFbx\">\n<node concept=\"3clFbF\" id=\"5wf7OU9pdj5\" role=\"3cqZAp\">\n<node concept=\"37vLTI\" id=\"5wf7OU9pdj6\" role=\"3clFbG\">\n</node>\n</node>\n</node>\n+ </node>\n<node concept=\"3clFbH\" id=\"5wf7OU9pdjn\" role=\"3cqZAp\" />\n</node>\n</node>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | disable automatic checkout of transient modules during export |
426,496 | 27.01.2022 16:01:07 | -3,600 | cd1f315dde79d6d3aba0be6be3779b19b72c1342 | On the generator output page only show the first 100000 characters | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.ui.server/models/org.modelix.ui.server.plugin.mps",
"new_path": "mps/org.modelix.ui.server/models/org.modelix.ui.server.plugin.mps",
"diff": "<concept id=\"1079359253375\" name=\"jetbrains.mps.baseLanguage.structure.ParenthesizedExpression\" flags=\"nn\" index=\"1eOMI4\">\n<child id=\"1079359253376\" name=\"expression\" index=\"1eOMHV\" />\n</concept>\n+ <concept id=\"1081506762703\" name=\"jetbrains.mps.baseLanguage.structure.GreaterThanExpression\" flags=\"nn\" index=\"3eOSWO\" />\n<concept id=\"1081516740877\" name=\"jetbrains.mps.baseLanguage.structure.NotExpression\" flags=\"nn\" index=\"3fqX7Q\">\n<child id=\"1081516765348\" name=\"expression\" index=\"3fr31v\" />\n</concept>\n<ref role=\"3cqZAo\" node=\"3ldDl3LJ$f3\" resolve=\"generatedFiles\" />\n</node>\n<node concept=\"3clFbS\" id=\"3ldDl3Mc7CK\" role=\"2LFqv$\">\n+ <node concept=\"3cpWs8\" id=\"79X8G8y_2Yq\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"79X8G8y_2Yr\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"fileText\" />\n+ <node concept=\"17QB3L\" id=\"79X8G8y_0je\" role=\"1tU5fm\" />\n+ <node concept=\"2OqwBi\" id=\"79X8G8y_2Ys\" role=\"33vP2m\">\n+ <node concept=\"2GrUjf\" id=\"79X8G8y_2Yt\" role=\"2Oq$k0\">\n+ <ref role=\"2Gs0qQ\" node=\"3ldDl3Mc7CG\" resolve=\"file\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"79X8G8y_2Yu\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" node=\"3ldDl3M6e2I\" resolve=\"getText\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbJ\" id=\"79X8G8y_405\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"79X8G8y_407\" role=\"3clFbx\">\n+ <node concept=\"3clFbF\" id=\"79X8G8y_76V\" role=\"3cqZAp\">\n+ <node concept=\"37vLTI\" id=\"79X8G8y_7Jx\" role=\"3clFbG\">\n+ <node concept=\"3cpWs3\" id=\"79X8G8y_98y\" role=\"37vLTx\">\n+ <node concept=\"Xl_RD\" id=\"79X8G8y_8KD\" role=\"3uHU7w\">\n+ <property role=\"Xl_RC\" value=\" more characters)\" />\n+ </node>\n+ <node concept=\"3cpWs3\" id=\"79X8G8y_8B0\" role=\"3uHU7B\">\n+ <node concept=\"3cpWs3\" id=\"79X8G8y_g4N\" role=\"3uHU7B\">\n+ <node concept=\"2OqwBi\" id=\"79X8G8y_h9X\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"79X8G8y_g$f\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8y_2Yr\" resolve=\"fileText\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"79X8G8y_hMV\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~String.substring(int,int)\" resolve=\"substring\" />\n+ <node concept=\"3cmrfG\" id=\"79X8G8y_iGg\" role=\"37wK5m\">\n+ <property role=\"3cmrfH\" value=\"0\" />\n+ </node>\n+ <node concept=\"3cmrfG\" id=\"79X8G8y_jtQ\" role=\"37wK5m\">\n+ <property role=\"3cmrfH\" value=\"100000\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"79X8G8y_82q\" role=\"3uHU7w\">\n+ <property role=\"Xl_RC\" value=\"... (\" />\n+ </node>\n+ </node>\n+ <node concept=\"1eOMI4\" id=\"79X8G8y_d2E\" role=\"3uHU7w\">\n+ <node concept=\"3cpWsd\" id=\"79X8G8y_f9O\" role=\"1eOMHV\">\n+ <node concept=\"3cmrfG\" id=\"79X8G8y_fjt\" role=\"3uHU7w\">\n+ <property role=\"3cmrfH\" value=\"100000\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"79X8G8y_dZR\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"79X8G8y_dv7\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8y_2Yr\" resolve=\"fileText\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"79X8G8y_enu\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~String.length()\" resolve=\"length\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"37vLTw\" id=\"79X8G8y_76T\" role=\"37vLTJ\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8y_2Yr\" resolve=\"fileText\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3eOSWO\" id=\"79X8G8y_695\" role=\"3clFbw\">\n+ <node concept=\"3cmrfG\" id=\"79X8G8y_6iI\" role=\"3uHU7w\">\n+ <property role=\"3cmrfH\" value=\"100000\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"79X8G8y_4LL\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"79X8G8y_4ib\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8y_2Yr\" resolve=\"fileText\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"79X8G8y_5eP\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~String.length()\" resolve=\"length\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"3clFbF\" id=\"3ldDl3MbZXq\" role=\"3cqZAp\">\n<node concept=\"d57v9\" id=\"3ldDl3Mc2zw\" role=\"3clFbG\">\n<node concept=\"3cpWs3\" id=\"3ldDl3Mc4I9\" role=\"37vLTx\">\n<node concept=\"2YIFZM\" id=\"3ldDl3MchDm\" role=\"3uHU7w\">\n<ref role=\"37wK5l\" to=\"btm1:~StringEscapeUtils.escapeHtml4(java.lang.String)\" resolve=\"escapeHtml4\" />\n<ref role=\"1Pybhc\" to=\"btm1:~StringEscapeUtils\" resolve=\"StringEscapeUtils\" />\n- <node concept=\"2OqwBi\" id=\"3ldDl3Mci2B\" role=\"37wK5m\">\n- <node concept=\"2GrUjf\" id=\"3ldDl3MchPU\" role=\"2Oq$k0\">\n- <ref role=\"2Gs0qQ\" node=\"3ldDl3Mc7CG\" resolve=\"file\" />\n- </node>\n- <node concept=\"liA8E\" id=\"3ldDl3McirT\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" node=\"3ldDl3M6e2I\" resolve=\"getText\" />\n- </node>\n+ <node concept=\"37vLTw\" id=\"79X8G8y_2Yv\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8y_2Yr\" resolve=\"fileText\" />\n</node>\n</node>\n<node concept=\"3cpWs3\" id=\"3ldDl3Mc4XB\" role=\"3uHU7B\">\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | On the generator output page only show the first 100000 characters |
426,496 | 27.01.2022 17:24:28 | -3,600 | fbbb33a03f6231130d2d5a4ed1f075aa21e0dd58 | Wrong links were generated. They didn't work behind the reverse proxy.
/generatorOutput?... was generated which works locally in MPS, but not
when deployed in kubernetes. | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.ui.server/models/org.modelix.ui.server.plugin.mps",
"new_path": "mps/org.modelix.ui.server/models/org.modelix.ui.server.plugin.mps",
"diff": "</node>\n<node concept=\"9aQIb\" id=\"1iUVXryolqX\" role=\"9aQIa\">\n<node concept=\"3clFbS\" id=\"1iUVXryolqY\" role=\"9aQI4\">\n+ <node concept=\"3cpWs8\" id=\"79X8G8zhWhJ\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"79X8G8zhWhK\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"url\" />\n+ <node concept=\"17QB3L\" id=\"79X8G8zhY6U\" role=\"1tU5fm\" />\n+ <node concept=\"2OqwBi\" id=\"79X8G8zhWhL\" role=\"33vP2m\">\n+ <node concept=\"37vLTw\" id=\"79X8G8zhWhM\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"72Dzx1UmG1_\" resolve=\"baseRequest\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"79X8G8zhWhN\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"m2xw:~Request.getOriginalURI()\" resolve=\"getOriginalURI\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbF\" id=\"79X8G8zig51\" role=\"3cqZAp\">\n+ <node concept=\"37vLTI\" id=\"79X8G8zih8g\" role=\"3clFbG\">\n+ <node concept=\"3K4zz7\" id=\"79X8G8zim_S\" role=\"37vLTx\">\n+ <node concept=\"3cpWs3\" id=\"79X8G8zioqB\" role=\"3K4E3e\">\n+ <node concept=\"37vLTw\" id=\"79X8G8zio$k\" role=\"3uHU7w\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8zhWhK\" resolve=\"url\" />\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"79X8G8zin_r\" role=\"3uHU7B\">\n+ <property role=\"Xl_RC\" value=\".\" />\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs3\" id=\"79X8G8zirdW\" role=\"3K4GZi\">\n+ <node concept=\"37vLTw\" id=\"79X8G8zirnD\" role=\"3uHU7w\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8zhWhK\" resolve=\"url\" />\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"79X8G8zipz3\" role=\"3uHU7B\">\n+ <property role=\"Xl_RC\" value=\"./\" />\n+ </node>\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"79X8G8ziiSs\" role=\"3K4Cdx\">\n+ <node concept=\"37vLTw\" id=\"79X8G8zihR$\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8zhWhK\" resolve=\"url\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"79X8G8zik08\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~String.startsWith(java.lang.String)\" resolve=\"startsWith\" />\n+ <node concept=\"Xl_RD\" id=\"79X8G8zil3r\" role=\"37wK5m\">\n+ <property role=\"Xl_RC\" value=\"/\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"37vLTw\" id=\"79X8G8zig4Z\" role=\"37vLTJ\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8zhWhK\" resolve=\"url\" />\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"3cpWs8\" id=\"7VNTBiFFmfz\" role=\"3cqZAp\">\n<node concept=\"3cpWsn\" id=\"7VNTBiFFmfA\" role=\"3cpWs9\">\n<property role=\"TrG5h\" value=\"text\" />\n<node concept=\"37vLTw\" id=\"1iUVXryoL1$\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"1iUVXrym2bA\" resolve=\"generatorOutput\" />\n</node>\n- <node concept=\"2OqwBi\" id=\"1iUVXryoL1_\" role=\"37wK5m\">\n- <node concept=\"37vLTw\" id=\"1iUVXryoL1A\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"72Dzx1UmG1_\" resolve=\"baseRequest\" />\n- </node>\n- <node concept=\"liA8E\" id=\"1iUVXryoL1B\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"m2xw:~Request.getOriginalURI()\" resolve=\"getOriginalURI\" />\n- </node>\n+ <node concept=\"37vLTw\" id=\"79X8G8zhWhO\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"79X8G8zhWhK\" resolve=\"url\" />\n</node>\n</node>\n</node>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Wrong links were generated. They didn't work behind the reverse proxy.
/generatorOutput?... was generated which works locally in MPS, but not
when deployed in kubernetes. |
426,496 | 30.01.2022 11:16:10 | -3,600 | 67b3a5f7d267eecb0522112f0354d684018485af | build script generator (1) | [
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "**/.mps/workspace.xml\n.gradle\n-artifacts\n-build\n-mps/build\n+/artifacts\n+.idea/artifacts\n+/build\n+/*/build\ntest_gen\ntest_gen.caches\n@@ -11,11 +12,11 @@ classes_gen\nsource_gen\nsource_gen.caches\n-kubernetes/secrets\n-ssl/cert\n-mps/org.modelix.ui.server/lib/ui-client.jar\n-mps/org.modelix.model.client/lib\n-mps/org.modelix.model.api/lib\n+/kubernetes/secrets\n+/ssl/cert\n+/mps/org.modelix.ui.server/lib/ui-client.jar\n+/mps/org.modelix.model.client/lib\n+/mps/org.modelix.model.api/lib\n# modules are configured by gradle\n.idea/modules\n"
},
{
"change_type": "MODIFY",
"old_path": "graphql-server/src/main/kotlin/org/modelix/graphql/server/ModelixSchemaGenerator.kt",
"new_path": "graphql-server/src/main/kotlin/org/modelix/graphql/server/ModelixSchemaGenerator.kt",
"diff": "/*\n- * Copyright 2003-2021 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n"
},
{
"change_type": "MODIFY",
"old_path": "instances-manager/src/main/java/org/modelix/instancesmanager/DeploymentManager.java",
"new_path": "instances-manager/src/main/java/org/modelix/instancesmanager/DeploymentManager.java",
"diff": "/*\n- * Copyright 2003-2021 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n"
},
{
"change_type": "DELETE",
"old_path": "mps/org.modelix.aspect.devkit/de.q60.mps.web.aspect.devkit.devkit",
"new_path": null,
"diff": "-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n-<dev-kit name=\"de.q60.mps.web.aspect.devkit\" uuid=\"df4512e0-2de7-456b-8e87-16e2011a3e91\">\n- <exported-language name=\"375af171-bd4b-4bfb-bc9f-418fb996740b(de.q60.mps.web.aspect)\" />\n- <exported-language name=\"25fcb6ab-d05a-4950-8cdf-251526bdf513(de.q60.mps.web.notation)\" />\n- <exported-language name=\"78874af2-5dd2-42a7-a21d-42fab3737d1d(de.q60.mps.web.ui.sm)\" />\n- <exported-solutions>\n- <exported-solution>a35af0cf-8051-4b27-9686-59193edda5fc(de.q60.mps.web.aspect.genplan)</exported-solution>\n- </exported-solutions>\n- <generation-plan model=\"r:b1e92551-f846-4668-9f66-61b263fc8f5c(de.q60.mps.web.aspect.genplan)\" />\n-</dev-kit>\n-\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/build.gradle.kts",
"new_path": "workspace-manager/build.gradle.kts",
"diff": "@@ -27,4 +27,10 @@ dependencies {\nimplementation(\"org.zeroturnaround:zt-zip:1.14\")\nimplementation(\"org.apache.commons:commons-text:1.9\")\nimplementation(project(\":model-client\"))\n+ testImplementation(\"org.junit.jupiter:junit-jupiter-api:5.6.0\")\n+ testRuntimeOnly(\"org.junit.jupiter:junit-jupiter-engine\")\n+}\n+\n+tasks.getByName<Test>(\"test\") {\n+ useJUnitPlatform()\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+import org.w3c.dom.Element\n+import org.w3c.dom.Node\n+import org.w3c.dom.Text\n+import java.io.File\n+import javax.xml.XMLConstants\n+import javax.xml.parsers.DocumentBuilderFactory\n+\n+class BuildScriptGenerator(val inputFolders: List<File>) {\n+\n+ private val modules: MutableMap<String, FoundModule> = LinkedHashMap()\n+\n+ fun getGenerationOrder(): List<FoundModule> {\n+ val result = LinkedHashMap<String, FoundModule>()\n+ for (module in modules.values) {\n+ collectGenerationOrder(module, result)\n+ }\n+ return result.values.toList()\n+ }\n+\n+ private fun collectGenerationOrder(module: FoundModule, result: MutableMap<String, FoundModule>) {\n+ if (result.containsKey(module.moduleId)) return\n+\n+ // just add it to prevent processing the same module again\n+ result[module.moduleId] = module\n+\n+ for (dep in module.dependsOnModuleId) {\n+ val depModule = modules[dep] ?: continue\n+ collectGenerationOrder(depModule, result)\n+ }\n+\n+ // move the module itself to the end after all its dependencies\n+ result.remove(module.moduleId)\n+ result[module.moduleId] = module\n+ }\n+\n+ fun getModules(): List<FoundModule> = modules.values.toList()\n+\n+ fun collectModules() {\n+ inputFolders.forEach { collectModules(it)}\n+ }\n+\n+ fun collectModules(parent: File) {\n+ if (parent.isFile) {\n+ when (parent.extension.lowercase()) {\n+ // see jetbrains.mps.project.MPSExtentions\n+ \"msd\", \"mpl\", \"devkit\" -> {\n+ val module = readModule(parent)\n+ if (module.moduleId.isNotEmpty()) {\n+ modules[module.moduleId] = module\n+ }\n+ }\n+ }\n+ } else if (parent.isDirectory) {\n+ parent.listFiles()?.forEach { child ->\n+ collectModules(child)\n+ }\n+ }\n+ }\n+\n+ private fun readModule(file: File): FoundModule {\n+ val dbf = DocumentBuilderFactory.newInstance()\n+ dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)\n+ val db = dbf.newDocumentBuilder()\n+ val xml = db.parse(file)\n+ val doc: Element = xml.documentElement\n+ val uuid = doc.getAttribute(\"uuid\")\n+ var name = doc.getAttribute(\"name\")\n+ if (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\n+ val module = FoundModule(file, uuid, name)\n+ doc.visitAll { node ->\n+ if (node is Element) {\n+ when (node.tagName) {\n+ \"dependency\", \"extendedLanguage\" -> {\n+ val text = node.children().filterIsInstance<Text>().first().wholeText\n+ module.addDependency(moduleIdFromReference(text))\n+ }\n+ \"module\" -> {\n+ if (node.parentTagName() == \"dependencyVersions\") {\n+ module.addDependency(moduleIdFromReference(node.getAttribute(\"reference\")))\n+ }\n+ }\n+ \"language\" -> {\n+ if (node.parentTagName() == \"languageVersion\") {\n+ module.addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")))\n+ }\n+ }\n+ }\n+ }\n+ }\n+ return module\n+ }\n+\n+ private fun moduleIdFromReference(text: String): String {\n+ // 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)\n+ val matchResult = Regex(\"\"\"~?(.+)\\(.+\\)\"\"\").matchEntire(text)\n+ return if (matchResult != null) matchResult.groupValues[1] else text\n+ }\n+\n+ private fun moduleIdFromLanguageRef(text: String): String {\n+ // l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage\n+ val matchResult = Regex(\"\"\"l:(.+):.+\"\"\").matchEntire(text)\n+ return if (matchResult != null) matchResult.groupValues[1] else text\n+ }\n+\n+ class FoundModule(val path: File, val moduleId: String, val name: String) {\n+ val dependsOnModuleId: MutableSet<String> = LinkedHashSet()\n+\n+ fun addDependency(moduleId: String) {\n+ if (moduleId.isNotEmpty()) {\n+ dependsOnModuleId += moduleId\n+ }\n+ }\n+ }\n+}\n+\n+private fun Node.visitAll(visitor: (Node)->Unit) {\n+ visitor(this)\n+ val childNodes = this.childNodes\n+ for (i in 0 until childNodes.length) childNodes.item(i).visitAll(visitor)\n+}\n+\n+private fun Node.parentTagName(): String? {\n+ return if (this is Element) this.tagName else null\n+}\n+\n+private fun Node.children(): List<Node> {\n+ val children = childNodes\n+ val result = ArrayList<Node>(children.length)\n+ for (i in 0 until children.length) result += children.item(i)\n+ return result\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+import org.junit.jupiter.api.Assertions.*\n+import org.junit.jupiter.api.Test\n+import java.io.File\n+\n+internal class BuildScriptGeneratorTest {\n+\n+ @Test\n+ fun test() {\n+ val generator = BuildScriptGenerator(listOf(File(\"../mps\")))\n+ generator.collectModules()\n+ val modules = generator.getModules()\n+ println(\"${modules.size} modules found\")\n+ assertTrue(modules.size > 10)\n+\n+ val generationOrder = generator.getGenerationOrder().map { \"${it.name} - ${it.moduleId}\" }\n+ generationOrder.forEach(::println)\n+ }\n+\n+}\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | build script generator (1) |
426,496 | 30.01.2022 11:16:29 | -3,600 | 2fa108a0c3e2b9e52957ab0d826c24050da8f16f | build script generator (2) | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -24,9 +24,15 @@ class BuildScriptGenerator(val inputFolders: List<File>) {\nprivate val modules: MutableMap<String, FoundModule> = LinkedHashMap()\n- fun getGenerationOrder(): List<FoundModule> {\n+ fun getGenerationOrder(modulesIdsToGenerate: List<String> = modules.keys.toList()): List<FoundModule> {\n+ val modulesToGenerate = modulesIdsToGenerate\n+ .map { modules[it] ?: throw IllegalArgumentException(\"module $it not found\") }\n+ return getGenerationOrder_(modulesToGenerate)\n+ }\n+\n+ private fun getGenerationOrder_(modulesToGenerate: List<FoundModule>): List<FoundModule> {\nval result = LinkedHashMap<String, FoundModule>()\n- for (module in modules.values) {\n+ for (module in modulesToGenerate) {\ncollectGenerationOrder(module, result)\n}\nreturn result.values.toList()\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"new_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"diff": "@@ -27,7 +27,8 @@ internal class BuildScriptGeneratorTest {\nprintln(\"${modules.size} modules found\")\nassertTrue(modules.size > 10)\n- val generationOrder = generator.getGenerationOrder().map { \"${it.name} - ${it.moduleId}\" }\n+ val org_modelix_ui_server = \"39aab22b-473f-4e44-b037-0c602964897d\"\n+ val generationOrder = generator.getGenerationOrder(listOf(org_modelix_ui_server)).map { \"${it.name} - ${it.moduleId}\" }\ngenerationOrder.forEach(::println)\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | build script generator (2) |
426,496 | 31.01.2022 11:53:47 | -3,600 | f0f8a96784bd5a502a801422f75857775baab377 | First step on generating the XML file | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "*/\npackage org.modelix.workspace.build\n+import org.w3c.dom.Document\nimport org.w3c.dom.Element\nimport org.w3c.dom.Node\nimport org.w3c.dom.Text\n+import java.io.ByteArrayOutputStream\nimport java.io.File\n+import java.io.StringWriter\n+import java.nio.charset.StandardCharsets\nimport javax.xml.XMLConstants\nimport javax.xml.parsers.DocumentBuilderFactory\n+import javax.xml.transform.OutputKeys\n+import javax.xml.transform.Transformer\n+import javax.xml.transform.TransformerFactory\n+import javax.xml.transform.dom.DOMSource\n+import javax.xml.transform.stream.StreamResult\n-class BuildScriptGenerator(val inputFolders: List<File>) {\n+class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate: List<ModuleId>? = null) {\nprivate val modules: MutableMap<ModuleId, FoundModule> = LinkedHashMap()\n- fun generate(modulesToGenerate: List<ModuleId>): GenerationPlan {\n+ fun generateXML(): String {\n+ val doc = generateAnt()\n+ val transformerFactory: TransformerFactory = TransformerFactory.newInstance()\n+ val transformer: Transformer = transformerFactory.newTransformer()\n+ transformer.setOutputProperty(OutputKeys.INDENT, \"yes\")\n+ val source = DOMSource(doc)\n+ val out = StringWriter()\n+ val result = StreamResult(out)\n+ transformer.transform(source, result)\n+ return out.toString()\n+ }\n+\n+ fun generateAnt(): Document {\n+ val plan = generatePlan(modulesToGenerate ?: modules.keys.toList())\n+\n+ val dbf = DocumentBuilderFactory.newInstance()\n+ val db = dbf.newDocumentBuilder()\n+ val doc = db.newDocument()\n+\n+ doc.createElement(\"project\").apply {\n+ doc.appendChild(this)\n+\n+ newChild(\"property\") {\n+ setAttribute(\"name\", \"mps_home\")\n+ setAttribute(\"location\", \"\\${mps.home}\")\n+ }\n+\n+ newChild(\"path\") {\n+ setAttribute(\"id\", \"path.mps.ant.path\")\n+ newChild(\"pathelement\") {\n+ setAttribute(\"location\", \"\\${mps.home}/lib/ant/lib/ant-mps.jar\")\n+ }\n+ newChild(\"pathelement\") {\n+ setAttribute(\"location\", \"\\${mps.home}/lib/log4j.jar\")\n+ }\n+ newChild(\"pathelement\") {\n+ setAttribute(\"location\", \"\\${mps.home}/lib/jdom.jar\")\n+ }\n+ }\n+\n+ newChild(\"target\") {\n+ setAttribute(\"name\", \"generate\")\n+ setAttribute(\"depends\", \"declare-mps-tasks\")\n+ newChild(\"echo\") {\n+ setAttribute(\"message\", \"generating\")\n+ }\n+ newChild(\"generate\") {\n+ setAttribute(\"strictMode\", \"false\")\n+ setAttribute(\"parallelMode\", \"false\")\n+ setAttribute(\"useInplaceTransform\", \"false\")\n+ setAttribute(\"hideWarnings\", \"false\")\n+ setAttribute(\"createStaticRefs\", \"false\")\n+ setAttribute(\"fork\", \"true\")\n+ setAttribute(\"targetJavaVersion\", \"11\")\n+ setAttribute(\"skipUnmodifiedModels\", \"true\")\n+ setAttribute(\"logLevel\", \"ERROR\")\n+ newChild(\"plugin\") {\n+ setAttribute(\"path\", \"\")\n+ }\n+ newChild(\"library\") {\n+ setAttribute(\"file\", \"\")\n+ }\n+ for (chunk in plan.chunks) {\n+ newChild(\"chunk\") {\n+ for (module in chunk.modules) {\n+ newChild(\"module\") {\n+ setAttribute(\"file\", module.path.canonicalPath)\n+ }\n+ }\n+ }\n+ }\n+ newChild(\"jvmargs\") {\n+ newChild(\"arg\") {\n+ setAttribute(\"value\", \"-ea\")\n+ }\n+ newChild(\"arg\") {\n+ setAttribute(\"value\", \"-Xmx1024m\")\n+ }\n+ }\n+ newChild(\"macro\") {\n+ setAttribute(\"name\", \"\")\n+ setAttribute(\"path\", \"\")\n+ }\n+ }\n+ }\n+\n+ newChild(\"target\") {\n+ setAttribute(\"name\", \"declare-mps-tasks\")\n+ newChild(\"taskdef\") {\n+ setAttribute(\"resource\", \"jetbrains/mps/build/ant/antlib.xml\")\n+ setAttribute(\"classpathref\", \"path.mps.ant.path\")\n+\n+ }\n+ }\n+ }\n+\n+ doc.createElement(\"target\")\n+\n+ return doc\n+ }\n+\n+ fun generatePlan(modulesToGenerate: List<ModuleId>): GenerationPlan {\ncollectModules()\nval planBuilder = GenerationPlanBuilder(modules)\nplanBuilder.build(modulesToGenerate.mapNotNull { modules[it] })\n@@ -118,3 +228,10 @@ private fun Node.children(): List<Node> {\nfor (i in 0 until children.length) result += children.item(i)\nreturn result\n}\n+\n+private fun Element.newChild(tag: String, body: Element.()->Unit): Element {\n+ val child = ownerDocument.createElement(tag)\n+ appendChild(child)\n+ child.apply(body)\n+ return child\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"new_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"diff": "@@ -28,13 +28,15 @@ internal class BuildScriptGeneratorTest {\nassertTrue(modules.size > 10)\nval org_modelix_ui_server = ModuleId(\"39aab22b-473f-4e44-b037-0c602964897d\")\n- val plan = generator.generate(listOf(org_modelix_ui_server))\n+ val plan = generator.generatePlan(listOf(org_modelix_ui_server))\nfor (chunk in plan.chunks) {\nprintln(\"--- Chunk ---\")\nfor (module in chunk.modules) {\nprintln(\"${module.moduleId} - ${module.name}\")\n}\n}\n+\n+ println(generator.generateXML())\n}\n}\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | First step on generating the XML file |
426,496 | 31.01.2022 15:21:39 | -3,600 | 9640bc5ae0c8e6fcb9a44ec67c07175f938499f3 | Add paths to packaged dependencies to the build script | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -17,10 +17,12 @@ import org.w3c.dom.Document\nimport org.w3c.dom.Element\nimport org.w3c.dom.Node\nimport org.w3c.dom.Text\n-import java.io.ByteArrayOutputStream\n+import org.zeroturnaround.zip.ZipUtil\nimport java.io.File\n+import java.io.FileInputStream\n+import java.io.InputStream\nimport java.io.StringWriter\n-import java.nio.charset.StandardCharsets\n+import java.util.zip.ZipEntry\nimport javax.xml.XMLConstants\nimport javax.xml.parsers.DocumentBuilderFactory\nimport javax.xml.transform.OutputKeys\n@@ -31,7 +33,7 @@ import javax.xml.transform.stream.StreamResult\nclass BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate: List<ModuleId>? = null) {\n- private val modules: MutableMap<ModuleId, FoundModule> = LinkedHashMap()\n+ private val modules: FoundModules = FoundModules()\nfun generateXML(): String {\nval doc = generateAnt()\n@@ -46,7 +48,7 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\n}\nfun generateAnt(): Document {\n- val plan = generatePlan(modulesToGenerate ?: modules.keys.toList())\n+ val plan = generatePlan(modulesToGenerate ?: modules.modules.keys.toList())\nval dbf = DocumentBuilderFactory.newInstance()\nval db = dbf.newDocumentBuilder()\n@@ -89,17 +91,21 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nsetAttribute(\"targetJavaVersion\", \"11\")\nsetAttribute(\"skipUnmodifiedModels\", \"true\")\nsetAttribute(\"logLevel\", \"ERROR\")\n+ for (plugin in plan.plugins) {\nnewChild(\"plugin\") {\n- setAttribute(\"path\", \"\")\n+ setAttribute(\"path\", plugin.path.canonicalPath)\n+ }\n}\n+ for (library in plan.libraries) {\nnewChild(\"library\") {\n- setAttribute(\"file\", \"\")\n+ setAttribute(\"file\", library.path.canonicalPath)\n+ }\n}\nfor (chunk in plan.chunks) {\nnewChild(\"chunk\") {\nfor (module in chunk.modules) {\nnewChild(\"module\") {\n- setAttribute(\"file\", module.path.canonicalPath)\n+ setAttribute(\"file\", module.owner.path.canonicalPath)\n}\n}\n}\n@@ -137,35 +143,43 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nfun generatePlan(modulesToGenerate: List<ModuleId>): GenerationPlan {\ncollectModules()\nval planBuilder = GenerationPlanBuilder(modules)\n- planBuilder.build(modulesToGenerate.mapNotNull { modules[it] })\n+ planBuilder.build(modulesToGenerate.mapNotNull { modules.modules[it] })\nreturn planBuilder.plan\n}\n- fun getModules(): List<FoundModule> = modules.values.toList()\n+ fun getModules(): List<FoundModule> = modules.modules.values.toList()\nfun collectModules() {\ninputFolders.forEach { collectModules(it)}\n}\n- fun collectModules(parent: File) {\n- if (parent.isFile) {\n- when (parent.extension.lowercase()) {\n+ fun collectModules(file: File) {\n+ if (file.isFile) {\n+ when (file.extension.lowercase()) {\n// see jetbrains.mps.project.MPSExtentions\n\"msd\", \"mpl\", \"devkit\" -> {\n- val module = readModule(parent)\n- if (module.moduleId.id.isNotEmpty()) {\n- modules[module.moduleId] = module\n+ modules.addModule(readSourceModule(file))\n+ }\n+ \"jar\" -> {\n+ ZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\n+ if (entry.name == \"META-INF/module.xml\") {\n+ modules.addModule(readModule(stream, LibraryModuleOwner(file)))\n}\n}\n}\n- } else if (parent.isDirectory) {\n- parent.listFiles()?.forEach { child ->\n+ }\n+ } else if (file.isDirectory) {\n+ file.listFiles()?.forEach { child ->\ncollectModules(child)\n}\n}\n}\n- private fun readModule(file: File): FoundModule {\n+ private fun readSourceModule(file: File): FoundModule {\n+ return FileInputStream(file).use { readModule(it, SourceModuleOwner(file)) }\n+ }\n+\n+ private fun readModule(file: InputStream, owner: ModuleOwner): FoundModule {\nval dbf = DocumentBuilderFactory.newInstance()\ndbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)\nval db = dbf.newDocumentBuilder()\n@@ -174,7 +188,7 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nval uuid = ModuleId(doc.getAttribute(\"uuid\"))\nvar name = doc.getAttribute(\"name\")\nif (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\n- val module = FoundModule(file, uuid, name)\n+ val module = FoundModule(uuid, name, owner)\ndoc.visitAll { node ->\nif (node is Element) {\nwhen (node.tagName) {\n@@ -185,11 +199,15 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\n\"module\" -> {\nif (node.parentTagName() == \"dependencyVersions\") {\nmodule.addDependency(moduleIdFromReference(node.getAttribute(\"reference\")))\n+ } else if (node.parentTagName() == \"dependencies\") {\n+ module.addDependency(moduleIdFromReference(node.getAttribute(\"ref\")))\n}\n}\n\"language\" -> {\nif (node.parentTagName() == \"languageVersion\") {\nmodule.addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")))\n+ } else if (node.parentTagName() == \"uses\") {\n+ module.addDependency(moduleIdFromLanguageRef(node.getAttribute(\"id\")))\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModule.kt",
"diff": "@@ -17,9 +17,13 @@ package org.modelix.workspace.build\nimport java.io.File\n-class FoundModule(val path: File, val moduleId: ModuleId, val name: String) {\n+class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwner) {\nval dependsOnModuleId: MutableSet<ModuleId> = LinkedHashSet()\n+ init {\n+ owner.modules += this\n+ }\n+\nfun addDependency(moduleId: ModuleId) {\nif (moduleId.id.isNotEmpty()) {\ndependsOnModuleId += moduleId\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+class FoundModules {\n+ val modules: MutableMap<ModuleId, FoundModule> = LinkedHashMap()\n+\n+ fun addModule(module: FoundModule) {\n+ if (module.moduleId.id.isNotEmpty()) {\n+ modules[module.moduleId] = module\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlan.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlan.kt",
"diff": "package org.modelix.workspace.build\nclass GenerationPlan {\n+ val plugins: MutableSet<PluginModuleOwner> = LinkedHashSet()\n+ val libraries: MutableSet<LibraryModuleOwner> = LinkedHashSet()\nval chunks: MutableList<GenerationChunk> = ArrayList()\nfun getHighestChunkIndex(moduleIds: Iterable<ModuleId>): Int {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"diff": "*/\npackage org.modelix.workspace.build\n-class GenerationPlanBuilder(val availableModules: Map<ModuleId, FoundModule>) {\n+class GenerationPlanBuilder(val availableModules: FoundModules) {\nval plan: GenerationPlan = GenerationPlan()\nval processedModules: MutableSet<ModuleId> = HashSet()\n@@ -27,8 +27,18 @@ class GenerationPlanBuilder(val availableModules: Map<ModuleId, FoundModule>) {\nif (processedModules.contains(module.moduleId)) return\nprocessedModules += module.moduleId\n- module.dependsOnModuleId.mapNotNull { availableModules[it] }.forEach { build(it) }\n+ for (dependency in module.dependsOnModuleId.mapNotNull { availableModules.modules[it] }) {\n+ build(dependency)\n+ }\n+\n+ when (val moduleOwner = module.owner) {\n+ is SourceModuleOwner -> {\nval index = plan.getHighestChunkIndex(module.dependsOnModuleId) + 1\nplan.insertAt(index, module)\n}\n+ is LibraryModuleOwner -> plan.libraries += moduleOwner\n+ is PluginModuleOwner -> plan.plugins += moduleOwner\n+ else -> throw RuntimeException(\"Unknown owner: $moduleOwner\")\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/LibraryModuleOwner.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+import java.io.File\n+\n+/**\n+ * Modules packaged as .jar-Files but without an IDEA plugin such as the ones in the MPS.HOME/languages folder\n+ */\n+class LibraryModuleOwner(path: File) : ModuleOwner(path) {\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModuleOwner.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+import java.io.File\n+\n+abstract class ModuleOwner(val path: File) {\n+ val modules: MutableList<FoundModule> = ArrayList()\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/PluginModuleOwner.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+import java.io.File\n+\n+/**\n+ * Modules packaged as an IDEA plugin containing a META-INF/plugin.xml file.\n+ */\n+class PluginModuleOwner(path: File) : ModuleOwner(path) {\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/SourceModuleOwner.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+import java.io.File\n+\n+/**\n+ * A module that needs to be built.\n+ */\n+class SourceModuleOwner(path: File) : ModuleOwner(path) {\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"new_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"diff": "@@ -21,21 +21,11 @@ internal class BuildScriptGeneratorTest {\n@Test\nfun test() {\n- val generator = BuildScriptGenerator(listOf(File(\"../mps\")))\n- generator.collectModules()\n- val modules = generator.getModules()\n- println(\"${modules.size} modules found\")\n- assertTrue(modules.size > 10)\n-\nval org_modelix_ui_server = ModuleId(\"39aab22b-473f-4e44-b037-0c602964897d\")\n- val plan = generator.generatePlan(listOf(org_modelix_ui_server))\n- for (chunk in plan.chunks) {\n- println(\"--- Chunk ---\")\n- for (module in chunk.modules) {\n- println(\"${module.moduleId} - ${module.name}\")\n- }\n- }\n-\n+ val generator = BuildScriptGenerator(\n+ inputFolders = listOf(File(\"../mps\"), File(\"../artifacts\")),\n+ modulesToGenerate = listOf(org_modelix_ui_server)\n+ )\nprintln(generator.generateXML())\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Add paths to packaged dependencies to the build script |
426,496 | 31.01.2022 16:04:35 | -3,600 | 9e070fb370e45ad868dbb7d54c8235f834f7e97c | First runnable build script generated (MPS generator still fails) | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -22,6 +22,7 @@ import java.io.File\nimport java.io.FileInputStream\nimport java.io.InputStream\nimport java.io.StringWriter\n+import java.util.*\nimport java.util.zip.ZipEntry\nimport javax.xml.XMLConstants\nimport javax.xml.parsers.DocumentBuilderFactory\n@@ -30,6 +31,7 @@ import javax.xml.transform.Transformer\nimport javax.xml.transform.TransformerFactory\nimport javax.xml.transform.dom.DOMSource\nimport javax.xml.transform.stream.StreamResult\n+import kotlin.collections.ArrayList\nclass BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate: List<ModuleId>? = null) {\n@@ -56,11 +58,23 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\ndoc.createElement(\"project\").apply {\ndoc.appendChild(this)\n+ setAttribute(\"default\", \"generate\")\n+ val mpsHome = modules.mpsHome\n+ if (mpsHome != null) {\n+ newChild(\"property\") {\n+ setAttribute(\"name\", \"mps.home\")\n+ setAttribute(\"location\", mpsHome.canonicalPath)\n+ }\n+ }\nnewChild(\"property\") {\nsetAttribute(\"name\", \"mps_home\")\nsetAttribute(\"location\", \"\\${mps.home}\")\n}\n+ newChild(\"property\") {\n+ setAttribute(\"name\", \"artifacts.mps\")\n+ setAttribute(\"location\", \"\\${mps.home}\")\n+ }\nnewChild(\"path\") {\nsetAttribute(\"id\", \"path.mps.ant.path\")\n@@ -89,8 +103,8 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nsetAttribute(\"createStaticRefs\", \"false\")\nsetAttribute(\"fork\", \"true\")\nsetAttribute(\"targetJavaVersion\", \"11\")\n- setAttribute(\"skipUnmodifiedModels\", \"true\")\n- setAttribute(\"logLevel\", \"ERROR\")\n+ setAttribute(\"skipUnmodifiedModels\", \"false\")\n+ setAttribute(\"logLevel\", \"warn\")\nfor (plugin in plan.plugins) {\nnewChild(\"plugin\") {\nsetAttribute(\"path\", plugin.path.canonicalPath)\n@@ -167,6 +181,11 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\n}\n}\n}\n+ \"vmoptions\" -> {\n+ if (file.nameWithoutExtension == \"mps\" || file.nameWithoutExtension == \"mps64\") {\n+ modules.mpsHome = file.parentFile.parentFile\n+ }\n+ }\n}\n} else if (file.isDirectory) {\nfile.listFiles()?.forEach { child ->\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"diff": "*/\npackage org.modelix.workspace.build\n+import java.io.File\n+\nclass FoundModules {\nval modules: MutableMap<ModuleId, FoundModule> = LinkedHashMap()\n+ var mpsHome: File? = null\nfun addModule(module: FoundModule) {\nif (module.moduleId.id.isNotEmpty()) {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"new_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"diff": "*/\npackage org.modelix.workspace.build\n+import org.apache.commons.io.FileUtils\nimport org.junit.jupiter.api.Assertions.*\nimport org.junit.jupiter.api.Test\nimport java.io.File\n+import java.nio.charset.StandardCharsets\ninternal class BuildScriptGeneratorTest {\n@@ -26,7 +28,9 @@ internal class BuildScriptGeneratorTest {\ninputFolders = listOf(File(\"../mps\"), File(\"../artifacts\")),\nmodulesToGenerate = listOf(org_modelix_ui_server)\n)\n- println(generator.generateXML())\n+ val xml = generator.generateXML()\n+ println(xml)\n+ FileUtils.writeStringToFile(File(\"auto-generated-build.xml\"), xml, StandardCharsets.UTF_8)\n}\n}\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | First runnable build script generated (MPS generator still fails) |
426,496 | 31.01.2022 20:34:04 | -3,600 | 1d06143512c95ee2e5b5be08bc9bb5ce862a0962 | A jar can contain multiple modules inside a modules/ folder | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -22,7 +22,6 @@ import java.io.File\nimport java.io.FileInputStream\nimport java.io.InputStream\nimport java.io.StringWriter\n-import java.util.*\nimport java.util.zip.ZipEntry\nimport javax.xml.XMLConstants\nimport javax.xml.parsers.DocumentBuilderFactory\n@@ -39,6 +38,10 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nfun generateXML(): String {\nval doc = generateAnt()\n+ return xmlToString(doc)\n+ }\n+\n+ private fun xmlToString(doc: Document): String {\nval transformerFactory: TransformerFactory = TransformerFactory.newInstance()\nval transformer: Transformer = transformerFactory.newTransformer()\ntransformer.setOutputProperty(OutputKeys.INDENT, \"yes\")\n@@ -175,9 +178,15 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nmodules.addModule(readSourceModule(file))\n}\n\"jar\" -> {\n+ val libraryModuleOwner = LibraryModuleOwner(file)\nZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\nif (entry.name == \"META-INF/module.xml\") {\n- modules.addModule(readModule(stream, LibraryModuleOwner(file)))\n+ modules.addModule(readModule(stream, libraryModuleOwner))\n+ }\n+ when (entry.name.substringAfterLast('.', \"\").lowercase()) {\n+ \"msd\", \"mpl\", \"devkit\" -> {\n+ modules.addModule(readModule(stream, libraryModuleOwner))\n+ }\n}\n}\n}\n@@ -203,38 +212,65 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\ndbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)\nval db = dbf.newDocumentBuilder()\nval xml = db.parse(file)\n+ val missedUUIDs = extractModuleUUIDs(xmlToString(xml)).toMutableSet()\nval doc: Element = xml.documentElement\nval uuid = ModuleId(doc.getAttribute(\"uuid\"))\n+ missedUUIDs -= uuid.id\nvar name = doc.getAttribute(\"name\")\nif (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\nval module = FoundModule(uuid, name, owner)\n+ val addDependency = { moduleId: ModuleId ->\n+ missedUUIDs -= moduleId.id\n+ module.addDependency(moduleId)\n+ }\ndoc.visitAll { node ->\nif (node is Element) {\n+ // Why not just use the extracted UUIDs? Because there are also foreign IDs that are not UUIDs.\nwhen (node.tagName) {\n- \"dependency\", \"extendedLanguage\" -> {\n+ \"dependency\", \"extendedLanguage\", \"extendedDevKit\", \"usedLanguage\", \"exported-solution\" -> {\nval text = node.children().filterIsInstance<Text>().first().wholeText\n- module.addDependency(moduleIdFromReference(text))\n+ addDependency(moduleIdFromReference(text))\n}\n\"module\" -> {\nif (node.parentTagName() == \"dependencyVersions\") {\n- module.addDependency(moduleIdFromReference(node.getAttribute(\"reference\")))\n+ // The dependencyVersions section often contains old modules that not actually used anymore\n+ //addDependency(moduleIdFromReference(node.getAttribute(\"reference\")))\n+ missedUUIDs -= moduleIdFromReference(node.getAttribute(\"reference\")).id\n} else if (node.parentTagName() == \"dependencies\") {\n- module.addDependency(moduleIdFromReference(node.getAttribute(\"ref\")))\n+ addDependency(moduleIdFromReference(node.getAttribute(\"ref\")))\n}\n}\n\"language\" -> {\n- if (node.parentTagName() == \"languageVersion\") {\n- module.addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")))\n+ if (node.parentTagName() == \"languageVersions\") {\n+ addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")))\n} else if (node.parentTagName() == \"uses\") {\n- module.addDependency(moduleIdFromLanguageRef(node.getAttribute(\"id\")))\n+ addDependency(moduleIdFromLanguageRef(node.getAttribute(\"id\")))\n}\n}\n+ \"exported-language\" -> {\n+ addDependency(moduleIdFromReference(node.getAttribute(\"name\")))\n}\n+ \"generator\" -> {\n+ missedUUIDs -= moduleIdFromReference(node.getAttribute(\"generatorUID\")).id\n}\n}\n+ }\n+ }\n+ if (missedUUIDs.isNotEmpty()) {\n+ throw RuntimeException(\"More dependencies found for module $name: $missedUUIDs\")\n+ }\nreturn module\n}\n+ private fun extractModuleUUIDs(text: String): Set<String> {\n+ return Regex(\"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\")\n+ .findAll(text).filter {\n+ // ignore model IDs\n+ val first = it.range.first\n+ first < 2 || text.substring(first - 2, first) != \"r:\"\n+ }.map { it.value }.toSet()\n+ }\n+\nprivate fun moduleIdFromReference(text: String): ModuleId {\n// 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)\nval matchResult = Regex(\"\"\"~?(.+)\\(.+\\)\"\"\").matchEntire(text)\n@@ -256,7 +292,10 @@ private fun Node.visitAll(visitor: (Node)->Unit) {\n}\nprivate fun Node.parentTagName(): String? {\n- return if (this is Element) this.tagName else null\n+ if (this !is Element) return null\n+ val parentNode = this.parentNode\n+ if (parentNode !is Element) return null\n+ return parentNode.tagName\n}\nprivate fun Node.children(): List<Node> {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"diff": "@@ -21,6 +21,9 @@ class FoundModules {\nfun addModule(module: FoundModule) {\nif (module.moduleId.id.isNotEmpty()) {\n+ if (modules.containsKey(module.moduleId)) {\n+// throw RuntimeException(\"Module ${module.moduleId} (${module.name}) already exists\")\n+ }\nmodules[module.moduleId] = module\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"diff": "@@ -27,7 +27,7 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\nif (processedModules.contains(module.moduleId)) return\nprocessedModules += module.moduleId\n- for (dependency in module.dependsOnModuleId.mapNotNull { availableModules.modules[it] }) {\n+ for (dependency in module.dependsOnModuleId.mapNotNull { resolveModule(it, module) }) {\nbuild(dependency)\n}\n@@ -41,4 +41,11 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\nelse -> throw RuntimeException(\"Unknown owner: $moduleOwner\")\n}\n}\n+\n+ fun resolveModule(id: ModuleId, usedBy: FoundModule): FoundModule? {\n+ // jetbrains.mps.lang.docComment doesn't exist (referenced in jetbrains.mps.lang.text)\n+ if (id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\n+ return availableModules.modules[id] ?:\n+ throw RuntimeException(\"Dependency $id not found (used by ${usedBy.name})\")\n+ }\n}\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | A jar can contain multiple modules inside a modules/ folder |
426,496 | 01.02.2022 09:41:19 | -3,600 | f802ec0779846b63558df0e47252d58c1a0defb4 | Ignore -src.jar files | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -178,6 +178,7 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nmodules.addModule(readSourceModule(file))\n}\n\"jar\" -> {\n+ if (!file.nameWithoutExtension.endsWith(\"-src\")) {\nval libraryModuleOwner = LibraryModuleOwner(file)\nZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\nif (entry.name == \"META-INF/module.xml\") {\n@@ -190,6 +191,7 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\n}\n}\n}\n+ }\n\"vmoptions\" -> {\nif (file.nameWithoutExtension == \"mps\" || file.nameWithoutExtension == \"mps64\") {\nmodules.mpsHome = file.parentFile.parentFile\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModule.kt",
"diff": "/*\n- * Copyright 2003-2022 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n*/\npackage org.modelix.workspace.build\n-import java.io.File\n-\nclass FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwner) {\nval dependsOnModuleId: MutableSet<ModuleId> = LinkedHashSet()\n@@ -29,4 +25,28 @@ class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwn\ndependsOnModuleId += moduleId\n}\n}\n+\n+ override fun equals(other: Any?): Boolean {\n+ if (this === other) return true\n+ if (javaClass != other?.javaClass) return false\n+\n+ other as FoundModule\n+\n+ if (moduleId != other.moduleId) return false\n+ if (name != other.name) return false\n+ if (owner != other.owner) return false\n+ if (dependsOnModuleId != other.dependsOnModuleId) return false\n+\n+ return true\n+ }\n+\n+ override fun hashCode(): Int {\n+ var result = moduleId.hashCode()\n+ result = 31 * result + name.hashCode()\n+ result = 31 * result + owner.hashCode()\n+ result = 31 * result + dependsOnModuleId.hashCode()\n+ return result\n+ }\n+\n+\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"diff": "@@ -21,10 +21,17 @@ class FoundModules {\nfun addModule(module: FoundModule) {\nif (module.moduleId.id.isNotEmpty()) {\n- if (modules.containsKey(module.moduleId)) {\n+ val existing = modules[module.moduleId]\n+ if (existing != null) {\n+ if (existing.owner != module.owner) {\n+ println(\"Duplicate module ${module.moduleId} in ${module.owner.path.canonicalPath} and ${existing.owner.path.canonicalPath}\")\n// throw RuntimeException(\"Module ${module.moduleId} (${module.name}) already exists\")\n}\n+ existing.dependsOnModuleId += module.dependsOnModuleId\n+ } else {\nmodules[module.moduleId] = module\n}\n+\n+ }\n}\n}\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Ignore -src.jar files |
426,496 | 01.02.2022 15:24:19 | -3,600 | 56da87ceb299f2cae94308fc5d6861633a786d04 | Generated build script successfully builds modelix modules | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -34,7 +34,7 @@ import kotlin.collections.ArrayList\nclass BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate: List<ModuleId>? = null) {\n- private val modules: FoundModules = FoundModules()\n+ private var modules: FoundModules? = null\nfun generateXML(): String {\nval doc = generateAnt()\n@@ -53,7 +53,7 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\n}\nfun generateAnt(): Document {\n- val plan = generatePlan(modulesToGenerate ?: modules.modules.keys.toList())\n+ val plan = generatePlan(modulesToGenerate ?: collectModules().modules.values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toList())\nval dbf = DocumentBuilderFactory.newInstance()\nval db = dbf.newDocumentBuilder()\n@@ -63,7 +63,7 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\ndoc.appendChild(this)\nsetAttribute(\"default\", \"generate\")\n- val mpsHome = modules.mpsHome\n+ val mpsHome = collectModules().mpsHome\nif (mpsHome != null) {\nnewChild(\"property\") {\nsetAttribute(\"name\", \"mps.home\")\n@@ -158,35 +158,38 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\n}\nfun generatePlan(modulesToGenerate: List<ModuleId>): GenerationPlan {\n- collectModules()\n- val planBuilder = GenerationPlanBuilder(modules)\n- planBuilder.build(modulesToGenerate.mapNotNull { modules.modules[it] })\n+ val planBuilder = GenerationPlanBuilder(collectModules())\n+ planBuilder.build(modulesToGenerate.mapNotNull { collectModules().modules[it] })\nreturn planBuilder.plan\n}\n- fun getModules(): List<FoundModule> = modules.modules.values.toList()\n+ fun getModules(): List<FoundModule> = collectModules().modules.values.toList()\n- fun collectModules() {\n- inputFolders.forEach { collectModules(it)}\n+ fun collectModules(): FoundModules {\n+ if (modules == null) {\n+ modules = FoundModules()\n+ inputFolders.forEach { collectModules(it, null)}\n+ }\n+ return modules!!\n}\n- fun collectModules(file: File) {\n+ fun collectModules(file: File, owner: ModuleOwner?) {\nif (file.isFile) {\nwhen (file.extension.lowercase()) {\n// see jetbrains.mps.project.MPSExtentions\n\"msd\", \"mpl\", \"devkit\" -> {\n- modules.addModule(readSourceModule(file))\n+ collectModules().addModule(readModule(file, owner ?: SourceModuleOwner(file)))\n}\n\"jar\" -> {\nif (!file.nameWithoutExtension.endsWith(\"-src\")) {\n- val libraryModuleOwner = LibraryModuleOwner(file)\n+ val libraryModuleOwner = owner ?: LibraryModuleOwner(file)\nZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\nif (entry.name == \"META-INF/module.xml\") {\n- modules.addModule(readModule(stream, libraryModuleOwner))\n+ collectModules().addModule(readModule(stream, libraryModuleOwner))\n}\nwhen (entry.name.substringAfterLast('.', \"\").lowercase()) {\n\"msd\", \"mpl\", \"devkit\" -> {\n- modules.addModule(readModule(stream, libraryModuleOwner))\n+ collectModules().addModule(readModule(stream, libraryModuleOwner))\n}\n}\n}\n@@ -194,19 +197,21 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\n}\n\"vmoptions\" -> {\nif (file.nameWithoutExtension == \"mps\" || file.nameWithoutExtension == \"mps64\") {\n- modules.mpsHome = file.parentFile.parentFile\n+ collectModules().mpsHome = file.parentFile.parentFile\n}\n}\n}\n} else if (file.isDirectory) {\n+ val isPluginDir = File(File(file, \"META-INF\"), \"plugin.xml\").exists()\n+ val pluginOwner = if (isPluginDir) PluginModuleOwner(file) else null\nfile.listFiles()?.forEach { child ->\n- collectModules(child)\n+ collectModules(child, owner ?: pluginOwner)\n}\n}\n}\n- private fun readSourceModule(file: File): FoundModule {\n- return FileInputStream(file).use { readModule(it, SourceModuleOwner(file)) }\n+ private fun readModule(file: File, owner: ModuleOwner): FoundModule {\n+ return FileInputStream(file).use { readModule(it, owner) }\n}\nprivate fun readModule(file: InputStream, owner: ModuleOwner): FoundModule {\n@@ -221,9 +226,9 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nvar name = doc.getAttribute(\"name\")\nif (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\nval module = FoundModule(uuid, name, owner)\n- val addDependency = { moduleId: ModuleId ->\n+ val addDependency = { moduleId: ModuleId, type: DependencyType, ignoreIfMissing: Boolean ->\nmissedUUIDs -= moduleId.id\n- module.addDependency(moduleId)\n+ module.addDependency(ModuleDependency(moduleId, type, ignoreIfMissing))\n}\ndoc.visitAll { node ->\nif (node is Element) {\n@@ -231,26 +236,25 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nwhen (node.tagName) {\n\"dependency\", \"extendedLanguage\", \"extendedDevKit\", \"usedLanguage\", \"exported-solution\" -> {\nval text = node.children().filterIsInstance<Text>().first().wholeText\n- addDependency(moduleIdFromReference(text))\n+ addDependency(moduleIdFromReference(text), DependencyType.Classpath, false)\n}\n\"module\" -> {\nif (node.parentTagName() == \"dependencyVersions\") {\n- // The dependencyVersions section often contains old modules that not actually used anymore\n- //addDependency(moduleIdFromReference(node.getAttribute(\"reference\")))\n+ //addDependency(moduleIdFromReference(node.getAttribute(\"reference\")), DependencyType.Model, true)\nmissedUUIDs -= moduleIdFromReference(node.getAttribute(\"reference\")).id\n} else if (node.parentTagName() == \"dependencies\") {\n- addDependency(moduleIdFromReference(node.getAttribute(\"ref\")))\n+ addDependency(moduleIdFromReference(node.getAttribute(\"ref\")), DependencyType.Model, false)\n}\n}\n\"language\" -> {\nif (node.parentTagName() == \"languageVersions\") {\n- addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")))\n+ addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")), DependencyType.Generator, true)\n} else if (node.parentTagName() == \"uses\") {\n- addDependency(moduleIdFromLanguageRef(node.getAttribute(\"id\")))\n+ addDependency(moduleIdFromLanguageRef(node.getAttribute(\"id\")), DependencyType.Generator, false)\n}\n}\n\"exported-language\" -> {\n- addDependency(moduleIdFromReference(node.getAttribute(\"name\")))\n+ addDependency(moduleIdFromReference(node.getAttribute(\"name\")), DependencyType.Classpath, false)\n}\n\"generator\" -> {\nmissedUUIDs -= moduleIdFromReference(node.getAttribute(\"generatorUID\")).id\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModule.kt",
"diff": "package org.modelix.workspace.build\nclass FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwner) {\n- val dependsOnModuleId: MutableSet<ModuleId> = LinkedHashSet()\n+ val dependencies: MutableSet<ModuleDependency> = LinkedHashSet()\ninit {\n- owner.modules += this\n+ owner.modules[moduleId] = this\n}\n- fun addDependency(moduleId: ModuleId) {\n- if (moduleId.id.isNotEmpty()) {\n- dependsOnModuleId += moduleId\n+ fun addDependency(dep: ModuleDependency) {\n+ if (dep.id.id.isNotEmpty()) {\n+ dependencies += dep\n}\n}\n@@ -35,7 +35,7 @@ class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwn\nif (moduleId != other.moduleId) return false\nif (name != other.name) return false\nif (owner != other.owner) return false\n- if (dependsOnModuleId != other.dependsOnModuleId) return false\n+ if (dependencies != other.dependencies) return false\nreturn true\n}\n@@ -44,7 +44,7 @@ class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwn\nvar result = moduleId.hashCode()\nresult = 31 * result + name.hashCode()\nresult = 31 * result + owner.hashCode()\n- result = 31 * result + dependsOnModuleId.hashCode()\n+ result = 31 * result + dependencies.hashCode()\nreturn result\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"diff": "@@ -27,7 +27,7 @@ class FoundModules {\nprintln(\"Duplicate module ${module.moduleId} in ${module.owner.path.canonicalPath} and ${existing.owner.path.canonicalPath}\")\n// throw RuntimeException(\"Module ${module.moduleId} (${module.name}) already exists\")\n}\n- existing.dependsOnModuleId += module.dependsOnModuleId\n+ existing.dependencies += module.dependencies\n} else {\nmodules[module.moduleId] = module\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlan.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlan.kt",
"diff": "@@ -19,6 +19,17 @@ class GenerationPlan {\nval plugins: MutableSet<PluginModuleOwner> = LinkedHashSet()\nval libraries: MutableSet<LibraryModuleOwner> = LinkedHashSet()\nval chunks: MutableList<GenerationChunk> = ArrayList()\n+ val allModuleIds: MutableSet<ModuleId> = HashSet()\n+\n+ fun addPlugin(plugin: PluginModuleOwner) {\n+ plugins += plugin\n+ allModuleIds += plugin.modules.keys\n+ }\n+\n+ fun addLibrary(lib: LibraryModuleOwner) {\n+ libraries += lib\n+ allModuleIds += lib.modules.keys\n+ }\nfun getHighestChunkIndex(moduleIds: Iterable<ModuleId>): Int {\nfor (i in (0 until chunks.size).reversed()) {\n@@ -32,5 +43,8 @@ class GenerationPlan {\nfun insertAt(chunkIndex: Int, module: FoundModule) {\nwhile (chunks.size <= chunkIndex) chunks += GenerationChunk()\nchunks[chunkIndex].modules += module\n+ allModuleIds += module.moduleId\n}\n+\n+ fun contains(id: ModuleId) = allModuleIds.contains(id)\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"diff": "@@ -17,7 +17,9 @@ package org.modelix.workspace.build\nclass GenerationPlanBuilder(val availableModules: FoundModules) {\nval plan: GenerationPlan = GenerationPlan()\n- val processedModules: MutableSet<ModuleId> = HashSet()\n+ private val processedModules: MutableSet<ModuleId> = HashSet()\n+ private val currentProcessingModules: MutableList<ModuleId> = ArrayList()\n+ private val forcedChunkIndex: MutableMap<ModuleId, Int> = HashMap()\nfun build(modules: Iterable<FoundModule>) {\nmodules.forEach { build(it) }\n@@ -27,25 +29,45 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\nif (processedModules.contains(module.moduleId)) return\nprocessedModules += module.moduleId\n- for (dependency in module.dependsOnModuleId.mapNotNull { resolveModule(it, module) }) {\n+ currentProcessingModules += module.moduleId\n+ try {\n+ var cycleIds: List<ModuleId>? = null\n+ for (dependency in module.dependencies.mapNotNull { resolveModule(it, module) }) {\n+ if (module.owner is SourceModuleOwner) {\n+ val cycleStart = currentProcessingModules.indexOf(dependency.moduleId)\n+ if (cycleStart != -1) {\n+ cycleIds = currentProcessingModules.drop(cycleStart) + dependency.moduleId\n+ println(\"Dependency cycle detected: \" + cycleIds.map { availableModules.modules[it]?.name }.joinToString(\" -> \"))\n+ val chunkIndex = plan.getHighestChunkIndex(cycleIds).coerceAtLeast(0)\n+ cycleIds.forEach { forcedChunkIndex[it] = chunkIndex }\n+ }\n+ }\nbuild(dependency)\n}\nwhen (val moduleOwner = module.owner) {\nis SourceModuleOwner -> {\n- val index = plan.getHighestChunkIndex(module.dependsOnModuleId) + 1\n+ val index = currentProcessingModules.firstNotNullOfOrNull { forcedChunkIndex[module.moduleId] }\n+ ?: (plan.getHighestChunkIndex(module.dependencies.filter { it.type == DependencyType.Generator }.map { it.id }) + 1)\n+ cycleIds?.forEach { forcedChunkIndex[it] = index }\nplan.insertAt(index, module)\n}\nis LibraryModuleOwner -> plan.libraries += moduleOwner\nis PluginModuleOwner -> plan.plugins += moduleOwner\nelse -> throw RuntimeException(\"Unknown owner: $moduleOwner\")\n}\n+ } finally {\n+ currentProcessingModules.removeLast()\n+ }\n}\n- fun resolveModule(id: ModuleId, usedBy: FoundModule): FoundModule? {\n+ fun resolveModule(dep: ModuleDependency, usedBy: FoundModule): FoundModule? {\n// jetbrains.mps.lang.docComment doesn't exist (referenced in jetbrains.mps.lang.text)\n- if (id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\n- return availableModules.modules[id] ?:\n- throw RuntimeException(\"Dependency $id not found (used by ${usedBy.name})\")\n+// if (dep.id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\n+ val resolved = availableModules.modules[dep.id]\n+ if (resolved == null && !dep.ignoreIfMissing) {\n+ throw RuntimeException(\"Dependency ${dep.id} not found (used by ${usedBy.name})\")\n+ }\n+ return resolved\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModuleDependency.kt",
"diff": "+/*\n+ * Copyright 2003-2022 JetBrains s.r.o.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+data class ModuleDependency(val id: ModuleId, val type: DependencyType, val ignoreIfMissing: Boolean) {\n+}\n+\n+enum class DependencyType {\n+ Classpath,\n+ Model,\n+ Generator\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModuleOwner.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModuleOwner.kt",
"diff": "@@ -16,5 +16,5 @@ package org.modelix.workspace.build\nimport java.io.File\nabstract class ModuleOwner(val path: File) {\n- val modules: MutableList<FoundModule> = ArrayList()\n+ val modules: MutableMap<ModuleId, FoundModule> = HashMap()\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"new_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"diff": "@@ -24,9 +24,10 @@ internal class BuildScriptGeneratorTest {\n@Test\nfun test() {\nval org_modelix_ui_server = ModuleId(\"39aab22b-473f-4e44-b037-0c602964897d\")\n+ val org_modelix_notation_impl_baseLanguage = ModuleId(\"2db6cf34-1ef5-4ea9-ab56-6511aab61960\")\nval generator = BuildScriptGenerator(\ninputFolders = listOf(File(\"../mps\"), File(\"../artifacts\")),\n- modulesToGenerate = listOf(org_modelix_ui_server)\n+// modulesToGenerate = listOf(org_modelix_ui_server, org_modelix_notation_impl_baseLanguage)\n)\nval xml = generator.generateXML()\nprintln(xml)\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Generated build script successfully builds modelix modules |
426,496 | 02.02.2022 15:45:13 | -3,600 | 4b612340361cebc7a59a98c00d2607d61f54e02e | Modules in a workspace are built async. before zipping them | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "*/\npackage org.modelix.workspace.build\n+import org.apache.commons.io.FileUtils\n+import org.apache.commons.io.IOUtils\nimport org.w3c.dom.Document\nimport org.w3c.dom.Element\nimport org.w3c.dom.Node\n@@ -22,6 +24,7 @@ import java.io.File\nimport java.io.FileInputStream\nimport java.io.InputStream\nimport java.io.StringWriter\n+import java.nio.charset.StandardCharsets\nimport java.util.zip.ZipEntry\nimport javax.xml.XMLConstants\nimport javax.xml.parsers.DocumentBuilderFactory\n@@ -36,6 +39,17 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nprivate var modules: FoundModules? = null\n+ fun buildModules(antScriptFolder: File = File(\".\")) {\n+ val xml = generateXML()\n+ val antScriptFile = File.createTempFile(\"mps-build-script\", \".xml\", antScriptFolder)\n+ FileUtils.writeStringToFile(antScriptFile, xml, StandardCharsets.UTF_8)\n+\n+ val ant = ProcessBuilder(\"ant\", \"-f\", antScriptFile.canonicalPath).start()\n+ IOUtils.copy(ant.inputStream, System.out)\n+ val exitValue = ant.waitFor()\n+ if (exitValue != 0) throw RuntimeException(\"Generating MPS modules failed with exit value $exitValue\")\n+ }\n+\nfun generateXML(): String {\nval doc = generateAnt()\nreturn xmlToString(doc)\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/GitRepositoryManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/GitRepositoryManager.kt",
"diff": "@@ -16,13 +16,10 @@ package org.modelix.workspace.manager\nimport org.eclipse.jgit.api.Git\nimport org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider\nimport org.modelix.model.persistent.HashUtil\n+import org.modelix.workspace.build.BuildScriptGenerator\nimport java.io.*\nimport java.lang.IllegalArgumentException\n-import java.nio.file.Files\n-import java.nio.file.Path\n-import java.util.zip.ZipEntry\nimport java.util.zip.ZipOutputStream\n-import kotlin.io.path.isDirectory\nclass GitRepositoryManager(val config: GitRepository, val credentials: Credentials?, val workspaceDirectory: File) {\nprivate val repoDirectory = File(workspaceDirectory, \"git-\" + HashUtil.sha256(\"${config.url} ${config.branch}\").replace(\"*\", \"\"))\n@@ -63,13 +60,10 @@ class GitRepositoryManager(val config: GitRepository, val credentials: Credentia\n}\n}\n+\nfun zip(subfolders: List<String>?, output: ZipOutputStream) {\nupdateRepo()\n- val roots: List<File> = if (subfolders == null || subfolders.isEmpty()) {\n- listOf(repoDirectory)\n- } else {\n- subfolders.map { File(repoDirectory, it) }\n- }\n+ val roots: List<File> = getRootFolders(subfolders)\nval gitDir = File(repoDirectory, \".git\").toPath()\nroots.filter { it.exists() }.forEach { root ->\noutput.copyFiles(\n@@ -80,4 +74,11 @@ class GitRepositoryManager(val config: GitRepository, val credentials: Credentia\n)\n}\n}\n+\n+ fun getRootFolders(subfolders: List<String>?) =\n+ if (subfolders == null || subfolders.isEmpty()) {\n+ listOf(repoDirectory)\n+ } else {\n+ subfolders.map { File(repoDirectory, it) }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"diff": "*/\npackage org.modelix.workspace.manager\n+import org.apache.commons.io.FileUtils\nimport org.apache.maven.shared.invoker.DefaultInvocationRequest\nimport org.apache.maven.shared.invoker.DefaultInvoker\n+import org.zeroturnaround.zip.ZipUtil\nimport java.io.File\nimport java.util.*\n@@ -24,6 +26,7 @@ class MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\nval request = DefaultInvocationRequest()\nrequest.goals = listOf(\"dependency:get\")\nval outputDir = File(workspaceDir, \"maven-\" + coordinates.replace(Regex(\"[^a-zA-Z0-9.]\"), \"_\"))\n+ if (outputDir.exists()) FileUtils.deleteDirectory(outputDir)\noutputDir.mkdirs()\nval properties = Properties()\nproperties[\"remoteRepositories\"] = workspace.mavenRepositories.joinToString(\",\") { it.url }\n@@ -32,6 +35,12 @@ class MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\nrequest.properties = properties\ninvokeMaven(request)\n+ outputDir.listFiles()?.forEach { child ->\n+ if (child.isFile && child.extension.lowercase() == \"zip\") {\n+ ZipUtil.unpack(child, outputDir)\n+ FileUtils.deleteQuietly(child)\n+ }\n+ }\nreturn outputDir\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "*/\npackage org.modelix.workspace.manager\n+import kotlinx.coroutines.MainScope\n+import kotlinx.coroutines.launch\nimport kotlinx.serialization.decodeFromString\nimport kotlinx.serialization.encodeToString\nimport kotlinx.serialization.json.Json\nimport org.modelix.model.client.RestWebModelClient\nimport org.modelix.model.persistent.SerializationUtil\n+import org.modelix.workspace.build.BuildScriptGenerator\nimport java.io.File\n+import java.io.FileOutputStream\nimport java.io.OutputStream\n+import java.util.*\n+import java.util.concurrent.Executors\nimport java.util.zip.ZipOutputStream\nimport kotlin.collections.HashMap\n@@ -34,6 +40,8 @@ class WorkspaceManager {\nval workspacesDir = if (parentRepoDir != null) File(parentRepoDir.parent, \"modelix-workspaces\") else File(\"modelix-workspaces\")\nworkspacesDir.absoluteFile\n}\n+ private val buildingWorkspaces: MutableList<String> = Collections.synchronizedList(ArrayList())\n+ private val executor = Executors.newSingleThreadExecutor()\ninit {\nprintln(\"workspaces directory: $directory\")\n@@ -87,20 +95,48 @@ class WorkspaceManager {\nfun getWorkspaceDirectory(workspace: Workspace) = File(directory, workspace.id)\n@Synchronized\n- fun downloadModules(workspaceId: String, stream: OutputStream) {\n+ fun buildWorkspaceDownloadFile(workspaceId: String): File {\nval workspace = getWorkspace(workspaceId)!!\n- ZipOutputStream(stream).use { zipStream ->\n- workspace.mavenDependencies.forEach { coordinates ->\n- val downloadFolder = MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadFromMaven(coordinates)\n- zipStream.copyFiles(downloadFolder, mapPath = {getWorkspaceDirectory(workspace).toPath().relativize(it)})\n- }\n+ val downloadFile = getDownloadFile(workspace)\n+ if (downloadFile.exists()) return downloadFile\n- workspace.gitRepositories.forEach { repo ->\n- val repoManager = GitRepositoryManager(repo, null, getWorkspaceDirectory(workspace))\n- repoManager.zip(repo.paths, zipStream)\n+ val mavenFolders = workspace.mavenDependencies.map { MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadFromMaven(it) }\n+ val gitManagers = workspace.gitRepositories.map { it to GitRepositoryManager(it, null, getWorkspaceDirectory(workspace)) }\n+ gitManagers.forEach { it.second.updateRepo() }\n+ val moduleFolders = mavenFolders + gitManagers.flatMap { it.second.getRootFolders(it.first.paths) }\n+ BuildScriptGenerator(moduleFolders).buildModules(getWorkspaceDirectory(workspace))\n+ FileOutputStream(downloadFile).use { fileStream ->\n+ ZipOutputStream(fileStream).use { zipStream ->\n+ mavenFolders.forEach {\n+ zipStream.copyFiles(it, mapPath = {getWorkspaceDirectory(workspace).toPath().relativize(it)})\n+ }\n+ gitManagers.forEach { repo ->\n+ repo.second.zip(repo.first.paths, zipStream)\n+ }\n+ }\n}\n+ return downloadFile\n+ }\n+\n+ private fun getDownloadFile(workspace: Workspace) =\n+ File(getWorkspaceDirectory(workspace), \"workspace.zip\")\n+\n+ fun buildWorkspaceDownloadFileAsync(workspaceId: String): File? {\n+ if (buildingWorkspaces.contains(workspaceId)) return null\n+ val workspace = getWorkspace(workspaceId) ?: throw RuntimeException(\"Workspace $workspaceId not found\")\n+ val downloadFile = getDownloadFile(workspace)\n+ if (downloadFile.exists()) return downloadFile\n+\n+ buildingWorkspaces += workspaceId\n+ executor.execute {\n+ try {\n+ buildWorkspaceDownloadFile(workspaceId)\n+ } finally {\n+ buildingWorkspaces -= workspaceId\n}\n}\n+ return null\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -83,8 +83,12 @@ fun Application.workspaceManagerModule() {\n}\nget(\"download-modules/{workspaceId}\") {\n- call.respondOutputStream(ContentType.Application.Zip, HttpStatusCode.OK) {\n- manager.downloadModules(call.parameters[\"workspaceId\"]!!, this)\n+ val workspaceId = call.parameters[\"workspaceId\"]!!\n+ val downloadFile = manager.buildWorkspaceDownloadFileAsync(workspaceId)\n+ if (downloadFile == null) {\n+ call.respondText(\"Downloading and building modules ...\", ContentType.Text.Plain, HttpStatusCode.OK)\n+ } else {\n+ call.respondFile(downloadFile)\n}\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Modules in a workspace are built async. before zipping them |
426,496 | 02.02.2022 16:26:52 | -3,600 | 47bd7a53ed24127e271bf4fa837a23b09fb71ad9 | Add the packaged mps version to the dependencies so that it does have to be downloaded from maven
It doesn't make sense to build for an MPS version other than the one
used inside the cluster. | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -39,9 +39,8 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nprivate var modules: FoundModules? = null\n- fun buildModules(antScriptFolder: File = File(\".\")) {\n+ fun buildModules(antScriptFile: File = File.createTempFile(\"mps-build-script\", \".xml\", File(\".\"))) {\nval xml = generateXML()\n- val antScriptFile = File.createTempFile(\"mps-build-script\", \".xml\", antScriptFolder)\nFileUtils.writeStringToFile(antScriptFile, xml, StandardCharsets.UTF_8)\nval ant = ProcessBuilder(\"ant\", \"-f\", antScriptFile.canonicalPath).start()\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationChunk.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationChunk.kt",
"diff": "/*\n- * Copyright 2003-2022 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlan.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlan.kt",
"diff": "/*\n- * Copyright 2003-2022 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"diff": "/*\n- * Copyright 2003-2022 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModuleDependency.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModuleDependency.kt",
"diff": "/*\n- * Copyright 2003-2022 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModuleId.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModuleId.kt",
"diff": "/*\n- * Copyright 2003-2022 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "*/\npackage org.modelix.workspace.manager\n-import kotlinx.coroutines.MainScope\n-import kotlinx.coroutines.launch\nimport kotlinx.serialization.decodeFromString\nimport kotlinx.serialization.encodeToString\nimport kotlinx.serialization.json.Json\n+import org.apache.commons.io.FileUtils\nimport org.modelix.model.client.RestWebModelClient\nimport org.modelix.model.persistent.SerializationUtil\nimport org.modelix.workspace.build.BuildScriptGenerator\nimport java.io.File\nimport java.io.FileOutputStream\n-import java.io.OutputStream\nimport java.util.*\nimport java.util.concurrent.Executors\nimport java.util.zip.ZipOutputStream\nimport kotlin.collections.HashMap\nclass WorkspaceManager {\n+ private val mpsHome: File = findMpsHome()\nprivate val modelClient: RestWebModelClient = RestWebModelClient(\"http://localhost:31963/model/\")\nprivate val activeWorkspaces: MutableMap<String, Workspace> = HashMap()\nprivate val directory: File = run {\n@@ -47,6 +46,21 @@ class WorkspaceManager {\nprintln(\"workspaces directory: $directory\")\n}\n+ private fun findMpsHome(): File {\n+ val path = listOf(\"mps.home\", \"mps_home\")\n+ .flatMap { listOf(System.getProperty(it), System.getenv(it)) }\n+ .firstOrNull { !it.isNullOrEmpty() }\n+ if (!path.isNullOrEmpty()) {\n+ val file = File(path)\n+ if (!file.exists()) throw RuntimeException(\"${file.canonicalPath} doesn't exist\")\n+ return file\n+ }\n+\n+ val file = File(\"../artifacts/mps\")\n+ if (!file.exists()) throw RuntimeException(\"MPS not found at ${file.canonicalPath}\")\n+ return file\n+ }\n+\n@Synchronized\nfun newWorkspace(): Workspace {\nval workspace = Workspace(\n@@ -74,10 +88,11 @@ class WorkspaceManager {\n@Synchronized\nfun update(workspace: Workspace) {\n- loadCommitHashes(workspace)\n+ //loadCommitHashes(workspace)\nval id = workspace.id\nmodelClient.put(key(id), Json.encodeToString(workspace))\nactiveWorkspaces[workspace.id] = workspace\n+ FileUtils.deleteQuietly(getDownloadFile(workspace))\n}\n@Synchronized\n@@ -103,8 +118,8 @@ class WorkspaceManager {\nval mavenFolders = workspace.mavenDependencies.map { MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadFromMaven(it) }\nval gitManagers = workspace.gitRepositories.map { it to GitRepositoryManager(it, null, getWorkspaceDirectory(workspace)) }\ngitManagers.forEach { it.second.updateRepo() }\n- val moduleFolders = mavenFolders + gitManagers.flatMap { it.second.getRootFolders(it.first.paths) }\n- BuildScriptGenerator(moduleFolders).buildModules(getWorkspaceDirectory(workspace))\n+ val moduleFolders = mavenFolders + gitManagers.flatMap { it.second.getRootFolders(it.first.paths) } + mpsHome\n+ BuildScriptGenerator(moduleFolders).buildModules(File(getWorkspaceDirectory(workspace), \"mps-build-script.xml\"))\nFileOutputStream(downloadFile).use { fileStream ->\nZipOutputStream(fileStream).use { zipStream ->\nmavenFolders.forEach {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Add the packaged mps version to the dependencies so that it does have to be downloaded from maven
It doesn't make sense to build for an MPS version other than the one
used inside the cluster. |
426,504 | 03.02.2022 09:52:14 | -3,600 | caf86de21bfd66aed8e8c7405881e8ec99b36bbf | correct how we check output lines | [
{
"change_type": "MODIFY",
"old_path": "gradle-plugin/src/main/java/org/modelix/gradle/model/ModelPlugin.java",
"new_path": "gradle-plugin/src/main/java/org/modelix/gradle/model/ModelPlugin.java",
"diff": "@@ -140,7 +140,7 @@ public class ModelPlugin implements Plugin<Project> {\n}\nif (!success) {\nSystem.err.println(\"Execution of ExportMain does not indicate success\");\n- throw new RuntimeException();\n+ throw new RuntimeException(\"We could not find the output lines indicating successful completion\");\n}\nif (exitValue != 0) {\nSystem.err.println(\"Execution of ExportMain failed. Exit code: \" + exitValue);\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-plugin/src/main/java/org/modelix/gradle/model/StreamContentCapture.java",
"new_path": "gradle-plugin/src/main/java/org/modelix/gradle/model/StreamContentCapture.java",
"diff": "@@ -43,7 +43,7 @@ class StreamContentCapture {\nBufferedReader bufferedReader = new BufferedReader(new InputStreamReader(bais));\nString line;\nwhile ((line = bufferedReader.readLine()) != null) {\n- lines.add(line);\n+ lines.add(line.strip());\n}\n}\nreturn this.lines;\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | correct how we check output lines |
426,504 | 03.02.2022 09:55:04 | -3,600 | 433002efcdf2beb10da5a1731b59b3ca6938e432 | printing captured lines | [
{
"change_type": "MODIFY",
"old_path": "gradle-plugin/src/main/java/org/modelix/gradle/model/ModelPlugin.java",
"new_path": "gradle-plugin/src/main/java/org/modelix/gradle/model/ModelPlugin.java",
"diff": "@@ -140,7 +140,7 @@ public class ModelPlugin implements Plugin<Project> {\n}\nif (!success) {\nSystem.err.println(\"Execution of ExportMain does not indicate success\");\n- throw new RuntimeException(\"We could not find the output lines indicating successful completion\");\n+ throw new RuntimeException(\"We could not find the output lines indicating successful completion. Lines found: \" + outputLines);\n}\nif (exitValue != 0) {\nSystem.err.println(\"Execution of ExportMain failed. Exit code: \" + exitValue);\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | printing captured lines |
426,496 | 03.02.2022 10:28:16 | -3,600 | 03f57db37f098b37641c8a8b98bd0a5dc71c9e0b | Show status while waiting for the workspace to download and build the modules | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildJob.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.manager\n+\n+import java.io.File\n+\n+class WorkspaceBuildJob(val workspace: Workspace, val downloadFile: File) {\n+ var status: Status = Status.New\n+}\n+\n+enum class Status {\n+ New,\n+ Queued,\n+ Running,\n+ Failed,\n+ Successful\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -39,7 +39,7 @@ class WorkspaceManager {\nval workspacesDir = if (parentRepoDir != null) File(parentRepoDir.parent, \"modelix-workspaces\") else File(\"modelix-workspaces\")\nworkspacesDir.absoluteFile\n}\n- private val buildingWorkspaces: MutableList<String> = Collections.synchronizedList(ArrayList())\n+ private val buildJobs: MutableMap<String, WorkspaceBuildJob> = Collections.synchronizedMap(HashMap())\nprivate val executor = Executors.newSingleThreadExecutor()\ninit {\n@@ -92,8 +92,11 @@ class WorkspaceManager {\nval id = workspace.id\nmodelClient.put(key(id), Json.encodeToString(workspace))\nactiveWorkspaces[workspace.id] = workspace\n+ synchronized(buildJobs) {\n+ buildJobs.remove(id)\nFileUtils.deleteQuietly(getDownloadFile(workspace))\n}\n+ }\n@Synchronized\nprivate fun loadCommitHashes(workspace: Workspace) {\n@@ -109,8 +112,7 @@ class WorkspaceManager {\nfun getWorkspaceDirectory(workspace: Workspace) = File(directory, workspace.id)\n- @Synchronized\n- fun buildWorkspaceDownloadFile(workspaceId: String): File {\n+ private fun buildWorkspaceDownloadFile(workspaceId: String): File {\nval workspace = getWorkspace(workspaceId)!!\nval downloadFile = getDownloadFile(workspace)\nif (downloadFile.exists()) return downloadFile\n@@ -133,25 +135,32 @@ class WorkspaceManager {\nreturn downloadFile\n}\n- private fun getDownloadFile(workspace: Workspace) =\n+ fun getDownloadFile(workspace: Workspace) =\nFile(getWorkspaceDirectory(workspace), \"workspace.zip\")\n- fun buildWorkspaceDownloadFileAsync(workspaceId: String): File? {\n- if (buildingWorkspaces.contains(workspaceId)) return null\n+ fun buildWorkspaceDownloadFileAsync(workspaceId: String): WorkspaceBuildJob {\nval workspace = getWorkspace(workspaceId) ?: throw RuntimeException(\"Workspace $workspaceId not found\")\n- val downloadFile = getDownloadFile(workspace)\n- if (downloadFile.exists()) return downloadFile\n- buildingWorkspaces += workspaceId\n+ val job: WorkspaceBuildJob\n+ synchronized(buildJobs) {\n+ job = buildJobs.getOrPut(workspace.id) { WorkspaceBuildJob(workspace, getDownloadFile(workspace)) }\n+ }\n+ synchronized(job) {\n+ if (job.status == Status.New) {\n+ job.status = Status.Queued\nexecutor.execute {\ntry {\n+ job.status = Status.Running\nbuildWorkspaceDownloadFile(workspaceId)\n- } finally {\n- buildingWorkspaces -= workspaceId\n+ job.status = Status.Successful\n+ } catch (e: Exception) {\n+ job.status = Status.Failed\n+ }\n+ }\n}\n}\n- return null\n+ return job\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -27,6 +27,7 @@ import io.ktor.routing.*\nimport kotlinx.serialization.decodeFromString\nimport kotlinx.serialization.encodeToString\nimport org.apache.commons.text.StringEscapeUtils\n+import java.awt.SystemColor.text\nfun Application.workspaceManagerModule() {\n@@ -82,13 +83,50 @@ fun Application.workspaceManagerModule() {\nthis.call.respondText(html, ContentType.Text.Html, HttpStatusCode.OK)\n}\n- get(\"download-modules/{workspaceId}\") {\n+ get(\"download-modules/{workspaceId}/queue\") {\nval workspaceId = call.parameters[\"workspaceId\"]!!\n- val downloadFile = manager.buildWorkspaceDownloadFileAsync(workspaceId)\n- if (downloadFile == null) {\n- call.respondText(\"Downloading and building modules ...\", ContentType.Text.Plain, HttpStatusCode.OK)\n+ val job = manager.buildWorkspaceDownloadFileAsync(workspaceId)\n+ val respondStatus: suspend (String)->Unit = { text ->\n+ val html = \"\"\"\n+ <html>\n+ <head>\n+ <meta http-equiv=\"refresh\" content=\"3\">\n+ <head>\n+ <body>\n+ $text\n+ </body>\n+ </html>\n+ \"\"\".trimIndent()\n+ call.respondText(html, ContentType.Text.Html, HttpStatusCode.OK)\n+ }\n+ when (job.status) {\n+ Status.New, Status.Queued -> respondStatus(\"Workspace is queued for building ...\")\n+ Status.Running -> respondStatus(\"Downloading and building modules ...\")\n+ Status.Failed -> respondStatus(\"Failed to build the workspace ...\")\n+ Status.Successful -> {\n+ val fileName = \"workspace-$workspaceId.zip\"\n+ call.respondText(\"\"\"\n+ <html>\n+ <head>\n+ <meta http-equiv=\"refresh\" content=\"1; url=$fileName\">\n+ <head>\n+ <body>\n+ Downloading <a href=\"$fileName\">$fileName</a>\n+ </body>\n+ </html>\n+ \"\"\".trimIndent(), ContentType.Text.Html, HttpStatusCode.OK)\n+ }\n+ }\n+ }\n+\n+ get(\"download-modules/{workspaceId}/workspace-{workspaceId}.zip\") {\n+ val id = call.parameters[\"workspaceId\"]!!\n+ val workspace = manager.getWorkspace(id)\n+ if (workspace == null) {\n+ call.respondText(\"Workspace $id not found\", ContentType.Text.Plain, HttpStatusCode.NotFound)\n} else {\n- call.respondFile(downloadFile)\n+ val file = manager.getDownloadFile(workspace)\n+ call.respondFile(file)\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/resources/html/edit.html",
"new_path": "workspace-manager/src/main/resources/html/edit.html",
"diff": "<textarea name=\"content\" style=\"width: 800px; height: 500px\">{{content}}</textarea>\n</form>\n- <div><a href=\"../download-modules/{{workspaceId}}\">Download Modules</a></div>\n+ <div><a href=\"../download-modules/{{workspaceId}}/queue\">Download Modules</a></div>\n</body>\n</html>\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Show status while waiting for the workspace to download and build the modules |
426,496 | 03.02.2022 10:40:14 | -3,600 | d8459f184c03d442ba6db53c66df37b6a3253b81 | Allow to start a new build job if a user tries to download a workspace that is not built yet. | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -86,11 +86,11 @@ fun Application.workspaceManagerModule() {\nget(\"download-modules/{workspaceId}/queue\") {\nval workspaceId = call.parameters[\"workspaceId\"]!!\nval job = manager.buildWorkspaceDownloadFileAsync(workspaceId)\n- val respondStatus: suspend (String)->Unit = { text ->\n+ val respondStatus: suspend (String, String)->Unit = { text, refresh ->\nval html = \"\"\"\n<html>\n<head>\n- <meta http-equiv=\"refresh\" content=\"3\">\n+ <meta http-equiv=\"refresh\" content=\"$refresh\">\n<head>\n<body>\n$text\n@@ -100,21 +100,12 @@ fun Application.workspaceManagerModule() {\ncall.respondText(html, ContentType.Text.Html, HttpStatusCode.OK)\n}\nwhen (job.status) {\n- Status.New, Status.Queued -> respondStatus(\"Workspace is queued for building ...\")\n- Status.Running -> respondStatus(\"Downloading and building modules ...\")\n- Status.Failed -> respondStatus(\"Failed to build the workspace ...\")\n+ Status.New, Status.Queued -> respondStatus(\"Workspace is queued for building ...\", \"3\")\n+ Status.Running -> respondStatus(\"Downloading and building modules ...\", \"3\")\n+ Status.Failed -> respondStatus(\"Failed to build the workspace ...\", \"3\")\nStatus.Successful -> {\nval fileName = \"workspace-$workspaceId.zip\"\n- call.respondText(\"\"\"\n- <html>\n- <head>\n- <meta http-equiv=\"refresh\" content=\"1; url=$fileName\">\n- <head>\n- <body>\n- Downloading <a href=\"$fileName\">$fileName</a>\n- </body>\n- </html>\n- \"\"\".trimIndent(), ContentType.Text.Html, HttpStatusCode.OK)\n+ respondStatus(\"\"\"Downloading <a href=\"$fileName\">$fileName</a>\"\"\", \"0; url=$fileName\")\n}\n}\n}\n@@ -126,7 +117,11 @@ fun Application.workspaceManagerModule() {\ncall.respondText(\"Workspace $id not found\", ContentType.Text.Plain, HttpStatusCode.NotFound)\n} else {\nval file = manager.getDownloadFile(workspace)\n+ if (file.exists()) {\ncall.respondFile(file)\n+ } else {\n+ call.respondText(\"\"\"File doesn't exist yet. <a href=\"queue\">Start a build job for the workspace.</a>\"\"\", ContentType.Text.Html, HttpStatusCode.NotFound)\n+ }\n}\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Allow to start a new build job if a user tries to download a workspace that is not built yet. |
426,496 | 03.02.2022 11:15:23 | -3,600 | a40a9e1aa1b86256a3a3e2495f68b58a79bdbece | Show build output of the workspace | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -20,10 +20,7 @@ import org.w3c.dom.Element\nimport org.w3c.dom.Node\nimport org.w3c.dom.Text\nimport org.zeroturnaround.zip.ZipUtil\n-import java.io.File\n-import java.io.FileInputStream\n-import java.io.InputStream\n-import java.io.StringWriter\n+import java.io.*\nimport java.nio.charset.StandardCharsets\nimport java.util.zip.ZipEntry\nimport javax.xml.XMLConstants\n@@ -33,18 +30,26 @@ import javax.xml.transform.Transformer\nimport javax.xml.transform.TransformerFactory\nimport javax.xml.transform.dom.DOMSource\nimport javax.xml.transform.stream.StreamResult\n-import kotlin.collections.ArrayList\nclass BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate: List<ModuleId>? = null) {\nprivate var modules: FoundModules? = null\n- fun buildModules(antScriptFile: File = File.createTempFile(\"mps-build-script\", \".xml\", File(\".\"))) {\n+ fun buildModules(antScriptFile: File = File.createTempFile(\"mps-build-script\", \".xml\", File(\".\")), outputHandler: ((String)->Unit)? = null) {\nval xml = generateXML()\nFileUtils.writeStringToFile(antScriptFile, xml, StandardCharsets.UTF_8)\nval ant = ProcessBuilder(\"ant\", \"-f\", antScriptFile.canonicalPath).start()\n+ if (outputHandler != null) {\n+ val reader = BufferedReader(InputStreamReader(ant.inputStream))\n+ var line = reader.readLine()\n+ while (line != null) {\n+ outputHandler(line)\n+ line = reader.readLine()\n+ }\n+ } else {\nIOUtils.copy(ant.inputStream, System.out)\n+ }\nval exitValue = ant.waitFor()\nif (exitValue != 0) throw RuntimeException(\"Generating MPS modules failed with exit value $exitValue\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"diff": "@@ -16,15 +16,17 @@ package org.modelix.workspace.manager\nimport org.apache.commons.io.FileUtils\nimport org.apache.maven.shared.invoker.DefaultInvocationRequest\nimport org.apache.maven.shared.invoker.DefaultInvoker\n+import org.apache.maven.shared.invoker.InvocationOutputHandler\nimport org.zeroturnaround.zip.ZipUtil\nimport java.io.File\nimport java.util.*\nclass MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\n- fun downloadFromMaven(coordinates: String): File {\n+ fun downloadFromMaven(coordinates: String, outputHandler: ((String)->Unit)? = null): File {\nval request = DefaultInvocationRequest()\nrequest.goals = listOf(\"dependency:get\")\n+ request.isBatchMode = true\nval outputDir = File(workspaceDir, \"maven-\" + coordinates.replace(Regex(\"[^a-zA-Z0-9.]\"), \"_\"))\nif (outputDir.exists()) FileUtils.deleteDirectory(outputDir)\noutputDir.mkdirs()\n@@ -34,7 +36,7 @@ class MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\nproperties[\"artifact\"] = addPackagingIfMissing(coordinates)\nrequest.properties = properties\n- invokeMaven(request)\n+ invokeMaven(request, outputHandler?.let { { outputHandler(it) } })\noutputDir.listFiles()?.forEach { child ->\nif (child.isFile && child.extension.lowercase() == \"zip\") {\nZipUtil.unpack(child, outputDir)\n@@ -44,9 +46,10 @@ class MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\nreturn outputDir\n}\n- private fun invokeMaven(request: DefaultInvocationRequest) {\n+ private fun invokeMaven(request: DefaultInvocationRequest, outputHandler: InvocationOutputHandler?) {\nval invoker = DefaultInvoker()\ninvoker.mavenHome = File(\"/usr/local/Cellar/maven/3.6.3_1/\")\n+ if (outputHandler != null) invoker.setOutputHandler(outputHandler)\ninvoker.execute(request)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildJob.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildJob.kt",
"diff": "@@ -17,6 +17,8 @@ import java.io.File\nclass WorkspaceBuildJob(val workspace: Workspace, val downloadFile: File) {\nvar status: Status = Status.New\n+ val output: MutableList<String> = ArrayList()\n+ val outputHandler: (String)->Unit = { output += it }\n}\nenum class Status {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -112,16 +112,15 @@ class WorkspaceManager {\nfun getWorkspaceDirectory(workspace: Workspace) = File(directory, workspace.id)\n- private fun buildWorkspaceDownloadFile(workspaceId: String): File {\n- val workspace = getWorkspace(workspaceId)!!\n- val downloadFile = getDownloadFile(workspace)\n- if (downloadFile.exists()) return downloadFile\n+ private fun buildWorkspaceDownloadFile(job: WorkspaceBuildJob): File {\n+ val workspace = job.workspace\n+ val downloadFile = job.downloadFile\n- val mavenFolders = workspace.mavenDependencies.map { MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadFromMaven(it) }\n+ val mavenFolders = workspace.mavenDependencies.map { MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadFromMaven(it, job.outputHandler) }\nval gitManagers = workspace.gitRepositories.map { it to GitRepositoryManager(it, null, getWorkspaceDirectory(workspace)) }\ngitManagers.forEach { it.second.updateRepo() }\nval moduleFolders = mavenFolders + gitManagers.flatMap { it.second.getRootFolders(it.first.paths) } + mpsHome\n- BuildScriptGenerator(moduleFolders).buildModules(File(getWorkspaceDirectory(workspace), \"mps-build-script.xml\"))\n+ BuildScriptGenerator(moduleFolders).buildModules(File(getWorkspaceDirectory(workspace), \"mps-build-script.xml\"), job.outputHandler)\nFileOutputStream(downloadFile).use { fileStream ->\nZipOutputStream(fileStream).use { zipStream ->\nmavenFolders.forEach {\n@@ -151,7 +150,7 @@ class WorkspaceManager {\nexecutor.execute {\ntry {\njob.status = Status.Running\n- buildWorkspaceDownloadFile(workspaceId)\n+ buildWorkspaceDownloadFile(job)\njob.status = Status.Successful\n} catch (e: Exception) {\njob.status = Status.Failed\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -94,6 +94,9 @@ fun Application.workspaceManagerModule() {\n<head>\n<body>\n$text\n+ <br/>\n+ <br/>\n+ <pre>${StringEscapeUtils.escapeHtml4(job.output.joinToString(\"\\n\"))}</pre>\n</body>\n</html>\n\"\"\".trimIndent()\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Show build output of the workspace |
426,496 | 03.02.2022 12:50:11 | -3,600 | 0555f21467ebf8c453eca1c73835758fee6d008b | Provide workspace status for REST clients | [
{
"change_type": "DELETE",
"old_path": "graphql-server/gradle.properties",
"new_path": null,
"diff": "-logbackVersion=1.2.1\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -113,6 +113,12 @@ fun Application.workspaceManagerModule() {\n}\n}\n+ get(\"download-modules/{workspaceId}/status\") {\n+ val workspaceId = call.parameters[\"workspaceId\"]!!\n+ val job = manager.buildWorkspaceDownloadFileAsync(workspaceId)\n+ call.respondText(job.status.toString(), ContentType.Text.Plain, HttpStatusCode.OK)\n+ }\n+\nget(\"download-modules/{workspaceId}/workspace-{workspaceId}.zip\") {\nval id = call.parameters[\"workspaceId\"]!!\nval workspace = manager.getWorkspace(id)\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Provide workspace status for REST clients |
426,496 | 03.02.2022 14:10:49 | -3,600 | 92e09ec2efaf550079e134e922328b5d79974b68 | shadow jar for the workspace manager | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/build.gradle.kts",
"new_path": "workspace-manager/build.gradle.kts",
"diff": "@@ -9,10 +9,12 @@ plugins {\nkotlin(\"jvm\") version \"1.5.31\"\nkotlin(\"plugin.serialization\") version \"1.5.31\"\nid(\"application\")\n+ id(\"com.github.johnrengelman.shadow\") version \"6.1.0\"\n}\napplication {\nmainClass.set(\"io.ktor.server.netty.EngineMain\")\n+ mainClassName = \"io.ktor.server.netty.EngineMain\"\n}\ndependencies {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | shadow jar for the workspace manager |
426,496 | 03.02.2022 16:59:36 | -3,600 | 77606a94f9fb38ee5efd955f137b4c0ae13ca98f | workspace manager runs in kubernetes | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "Dockerfile-workspace-manager",
"diff": "+FROM openjdk:11\n+WORKDIR /workspace-manager/\n+EXPOSE 28104\n+COPY workspace-manager/build/libs/workspace-manager-latest-all.jar /workspace-manager/workspace-manager.jar\n+COPY artifacts/mps /mps\n+CMD [\"java\", \"-Dmps.home=/mps\", \"-XX:MaxRAMPercentage=75\",\"-jar\", \"/workspace-manager/workspace-manager.jar\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "docker-build-all.sh",
"new_path": "docker-build-all.sh",
"diff": "./docker-build-proxy.sh\n./docker-build-uiproxy.sh\n./docker-build-instances-manager.sh\n+./docker-build-workspace-manager.sh\n"
},
{
"change_type": "MODIFY",
"old_path": "docker-build-proxy.sh",
"new_path": "docker-build-proxy.sh",
"diff": "#!/bin/sh\n+set -e\n+\nTAG=$( ./modelix-version.sh )\n+(\ncd proxy\ndocker build --no-cache -t modelix/modelix-proxy .\n+)\n-cd ..\ndocker tag modelix/modelix-proxy:latest \"modelix/modelix-proxy:${TAG}\"\nsed -i.bak -E \"s/(image:.*:).*/\\1${TAG}/\" kubernetes/common/proxy-deployment.yaml\nrm kubernetes/common/proxy-deployment.yaml.bak\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker-build-workspace-manager.sh",
"diff": "+#!/bin/sh\n+\n+set -e\n+\n+TAG=$( ./modelix-version.sh )\n+\n+docker build -f Dockerfile-workspace-manager --no-cache -t modelix/modelix-workspace-manager .\n+\n+docker tag modelix/modelix-workspace-manager:latest \"modelix/modelix-workspace-manager:${TAG}\"\n+sed -i.bak -E \"s/(image:.*:).*/\\1${TAG}/\" kubernetes/common/workspace-manager-deployment.yaml\n+rm kubernetes/common/workspace-manager-deployment.yaml.bak\n"
},
{
"change_type": "MODIFY",
"old_path": "docker-ci.sh",
"new_path": "docker-ci.sh",
"diff": "@@ -24,13 +24,14 @@ docker login -u \"$DOCKER_HUB_USER\" -p \"$DOCKER_HUB_KEY\"\n./docker-build-proxy.sh\n./docker-build-uiproxy.sh\n./docker-build-instances-manager.sh\n+./docker-build-workspace-manager.sh\nMODELIX_VERSION=$( ./modelix-version.sh )\nTAGS=\"$MODELIX_VERSION mps-$mpsVersion\"\nif [ \"$mpsVersion\" != \"$mpsMajorVersion\" ]; then\nTAGS=\"$TAGS mps-$mpsMajorVersion\"\nfi\n-IMAGE_NAMES=\"db model mps base ui projector proxy uiproxy instances-manager\"\n+IMAGE_NAMES=\"db model mps base ui projector proxy uiproxy instances-manager workspace-manager\"\nfor TAG in $TAGS ; do\necho \"Pushing Tag $TAG\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "kubernetes/common/workspace-manager-deployment.yaml",
"diff": "+apiVersion: apps/v1\n+kind: Deployment\n+metadata:\n+ annotations:\n+ labels:\n+ app: workspace-manager\n+ name: workspace-manager\n+spec:\n+ revisionHistoryLimit: 5\n+ replicas: 1\n+ strategy:\n+ type: RollingUpdate\n+ rollingUpdate:\n+ maxUnavailable: 1\n+ maxSurge: 0\n+ selector:\n+ matchLabels:\n+ app: workspace-manager\n+ template:\n+ metadata:\n+ labels:\n+ app: workspace-manager\n+ spec:\n+ containers:\n+ - env:\n+ - name: model_server_url\n+ value: http://model:28101/\n+ image: modelix/modelix-workspace-manager:2020.3.5-202202031506-SNAPSHOT\n+ imagePullPolicy: IfNotPresent\n+ name: workspace-manager\n+ ports:\n+ - containerPort: 28104\n+ - containerPort: 5071\n+ name: \"jvm-debug\"\n+ resources:\n+ requests:\n+ memory: \"800Mi\"\n+ cpu: \"0.1\"\n+ limits:\n+ memory: \"800Mi\"\n+ cpu: \"1.0\"\n+ readinessProbe:\n+ httpGet:\n+ path: /health\n+ port: 28104\n+ initialDelaySeconds: 5\n+ periodSeconds: 5\n+ timeoutSeconds: 3\n+ livenessProbe:\n+ httpGet:\n+ path: /health\n+ port: 28104\n+ initialDelaySeconds: 60\n+ periodSeconds: 15\n+ timeoutSeconds: 10\n+ restartPolicy: Always\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "kubernetes/common/workspace-manager-service.yaml",
"diff": "+apiVersion: v1\n+kind: Service\n+metadata:\n+ annotations:\n+ labels:\n+ app: workspace-manager\n+ name: workspace-manager\n+spec:\n+ type: NodePort\n+ ports:\n+ - name: \"28104\"\n+ port: 28104\n+ targetPort: 28104\n+ selector:\n+ app: workspace-manager\n"
},
{
"change_type": "MODIFY",
"old_path": "proxy/nginx.conf",
"new_path": "proxy/nginx.conf",
"diff": "events {}\nhttp {\n+ proxy_read_timeout 300;\n+ proxy_connect_timeout 300;\n+ proxy_send_timeout 300;\n+\nserver {\nclient_max_body_size 50M;\n@@ -46,6 +50,13 @@ http {\n# proxy_pass http://$1.default.svc.cluster.local:33333/ws/$2$is_args$args;\n# }\n+ location ~ ^/workspace/(.*)$ {\n+ proxy_http_version 1.1;\n+ proxy_set_header Upgrade $http_upgrade;\n+ proxy_set_header Connection \"upgrade\";\n+ proxy_pass http://workspace-manager.default.svc.cluster.local:28104/$1$is_args$args;\n+ }\n+\nlocation ~ ^/([\\w-]+/.*)$ {\nproxy_http_version 1.1;\nproxy_set_header Upgrade $http_upgrade;\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/build.gradle.kts",
"new_path": "workspace-manager/build.gradle.kts",
"diff": "-description = \"Allows multiple clients to work on the same set of modules from different sources\"\n+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar\n+description = \"Allows multiple clients to work on the same set of modules from different sources\"\nval ktorVersion = \"1.6.5\"\nval kotlinCoroutinesVersion = \"1.5.2\"\nval kotlinVersion = \"1.5.31\"\n@@ -17,6 +18,10 @@ application {\nmainClassName = \"io.ktor.server.netty.EngineMain\"\n}\n+tasks.withType<ShadowJar> {\n+ archiveVersion.set(\"latest\")\n+}\n+\ndependencies {\nimplementation(\"io.ktor\", \"ktor-server-core\", ktorVersion)\nimplementation(\"io.ktor\", \"ktor-server-netty\", ktorVersion)\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -29,7 +29,7 @@ import kotlin.collections.HashMap\nclass WorkspaceManager {\nprivate val mpsHome: File = findMpsHome()\n- private val modelClient: RestWebModelClient = RestWebModelClient(\"http://localhost:31963/model/\")\n+ private val modelClient: RestWebModelClient = RestWebModelClient(getModelServerUrl())\nprivate val activeWorkspaces: MutableMap<String, Workspace> = HashMap()\nprivate val directory: File = run {\n// The workspace will contain git repositories. Avoid cloning them into an existing repository.\n@@ -47,6 +47,8 @@ class WorkspaceManager {\n}\nprivate fun findMpsHome(): File {\n+ println(\"env: \" + System.getenv())\n+ println(\"properties: \" + System.getProperties())\nval path = listOf(\"mps.home\", \"mps_home\")\n.flatMap { listOf(System.getProperty(it), System.getenv(it)) }\n.firstOrNull { !it.isNullOrEmpty() }\n@@ -61,6 +63,13 @@ class WorkspaceManager {\nreturn file\n}\n+ private fun getModelServerUrl(): String {\n+ return listOf(\"model.server.url\", \"model_server_url\")\n+ .flatMap { listOf(System.getProperty(it), System.getenv(it)) }\n+ .filterNotNull()\n+ .firstOrNull() ?: \"http://localhost:31963/model/\"\n+ }\n+\n@Synchronized\nfun newWorkspace(): Workspace {\nval workspace = Workspace(\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -60,6 +60,10 @@ fun Application.workspaceManagerModule() {\ncall.respondRedirect(\"edit/${workspace.id}\")\n}\n+ get(\"/health\") {\n+ call.respondText(\"healthy\", ContentType.Text.Plain, HttpStatusCode.OK)\n+ }\n+\nget(\"edit/{workspaceId}\") {\nval id = call.parameters[\"workspaceId\"]\nif (id == null) {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | workspace manager runs in kubernetes |
426,496 | 03.02.2022 17:25:08 | -3,600 | 4ca8b29ebd8658b3eebcb9c5a28b6b067d853964 | Add exception to the output of a build job if it failed | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -162,6 +162,8 @@ class WorkspaceManager {\nbuildWorkspaceDownloadFile(job)\njob.status = Status.Successful\n} catch (e: Exception) {\n+ job.output += e::class.qualifiedName + \": \" + e.message\n+ job.output += e.stackTrace.map { \" $it\" }\njob.status = Status.Failed\n}\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Add exception to the output of a build job if it failed |
426,496 | 03.02.2022 19:05:20 | -3,600 | b63c84b1220570e525ff5caa154282f6c6a71a36 | Install maven, git, ant in the workspace manager image | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile-workspace-manager",
"new_path": "Dockerfile-workspace-manager",
"diff": "FROM openjdk:11\n+\n+RUN apt update\n+RUN apt install maven -y\n+RUN apt install git -y\n+RUN apt install ant -y\n+\nWORKDIR /workspace-manager/\nEXPOSE 28104\nCOPY workspace-manager/build/libs/workspace-manager-latest-all.jar /workspace-manager/workspace-manager.jar\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"diff": "@@ -48,7 +48,9 @@ class MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\nprivate fun invokeMaven(request: DefaultInvocationRequest, outputHandler: InvocationOutputHandler?) {\nval invoker = DefaultInvoker()\n- invoker.mavenHome = File(\"/usr/local/Cellar/maven/3.6.3_1/\")\n+ val candidates = mutableListOf(File(\"/usr/share/maven\"))\n+ File(\"/usr/local/Cellar/maven/\").listFiles()?.let { candidates += it }\n+ invoker.mavenHome = candidates.firstOrNull { it.exists() } ?: throw RuntimeException(\"maven not found in $candidates\")\nif (outputHandler != null) invoker.setOutputHandler(outputHandler)\ninvoker.execute(request)\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Install maven, git, ant in the workspace manager image |
426,496 | 07.02.2022 09:08:21 | -3,600 | e5762235bf0dcb4254bb28dc2c41573312bb3156 | Install plugins from a workspace into the MPS plugins folder | [
{
"change_type": "MODIFY",
"old_path": "install-plugins.sh",
"new_path": "install-plugins.sh",
"diff": "TARGET_FOLDER=\"${1:-/usr/modelix-ui/mps/plugins/}\"\nSOURCE_FOLDER=\"${2:-/mps-plugins/}\"\n+DELETE_INPUT_FOLDER=\"${3:-1}\"\n#SOURCE_FOLDER=../test_input\n#TARGET_FOLDER=../test_output/\n@@ -26,4 +27,6 @@ while IFS= read -r line; do\necho \"Installed plugin from $PLUGIN_DIR\"\ndone\n+if [ $DELETE_INPUT_FOLDER -eq \"1\" ]; then\nrm -rf \"${SOURCE_FOLDER:?}\"/*\n+fi\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-client/download-workspace-and-start-projector.sh",
"new_path": "workspace-client/download-workspace-and-start-projector.sh",
"diff": "set -e\n/projector/ide/jbr/bin/java -jar /home/projector-user/workspace-client.jar\n+/install-plugins.sh /projector/ide/plugins/ /home/projector-user/workspace.zip/ 0\n/run.sh\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Install plugins from a workspace into the MPS plugins folder |
426,496 | 07.02.2022 10:10:56 | -3,600 | 3fa4fbc0048d084d407489213921b716072f3330 | reorganized the URL path structure on the workspace server | [
{
"change_type": "MODIFY",
"old_path": "workspace-client/src/main/kotlin/org/modelix/workspace/client/Main.kt",
"new_path": "workspace-client/src/main/kotlin/org/modelix/workspace/client/Main.kt",
"diff": "@@ -45,7 +45,7 @@ fun main(args: Array<String>) {\nval outputFile = File(\"workspace.zip\").absoluteFile\nrunBlocking {\nwhile (true) {\n- val statusString = httpClient.get<String>(serverUrl + \"download-modules/$workspaceId/status\")\n+ val statusString = httpClient.get<String>(serverUrl + \"$workspaceId/status\")\nval status = WorkspaceBuildStatus.valueOf(statusString.trim())\nwhen (status) {\nWorkspaceBuildStatus.Failed -> throw RuntimeException(\"Workspace $workspaceId failed to build. Can't download modules.\")\n@@ -54,7 +54,7 @@ fun main(args: Array<String>) {\n}\n}\n- httpClient.downloadFile(outputFile, \"${serverUrl}download-modules/$workspaceId/workspace-$workspaceId.zip\")\n+ httpClient.downloadFile(outputFile, \"${serverUrl}$workspaceId/download-modules/workspace.zip\")\n}\nZipUtil.explode(outputFile)\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"diff": "@@ -16,7 +16,7 @@ package org.modelix.workspace.manager\nimport kotlinx.serialization.Serializable\n@Serializable\n-data class Workspace(val id: String,\n+data class Workspace(var id: String,\nval mpsVersion: String? = null,\nval modelRepositories: List<ModelRepository> = listOf(),\nval gitRepositories: List<GitRepository> = listOf(),\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -39,11 +39,12 @@ fun Application.workspaceManagerModule() {\npost(\"new\") {\nval workspace = manager.newWorkspace()\n- call.respondRedirect(\"edit/${workspace.id}\")\n+ call.respondRedirect(\"${workspace.id}/edit\")\n}\n- post(\"update\") {\n+ post(\"{workspaceId}/update\") {\nval yamlText = call.receiveParameters()[\"content\"]\n+ val id = call.parameters[\"workspaceId\"] ?: throw IllegalArgumentException(\"workspaceId missing\")\nif (yamlText == null) {\ncall.respond(HttpStatusCode.BadRequest, \"Content missing\")\nreturn@post\n@@ -55,15 +56,17 @@ fun Application.workspaceManagerModule() {\ncall.respond(HttpStatusCode.BadRequest, e.message ?: \"Parse error\")\nreturn@post\n}\n+ // just in case the user copy-pastes a workspace and forgets to change the ID\n+ workspace.id = id\nmanager.update(workspace)\n- call.respondRedirect(\"edit/${workspace.id}\")\n+ call.respondRedirect(\"./edit\")\n}\nget(\"/health\") {\ncall.respondText(\"healthy\", ContentType.Text.Plain, HttpStatusCode.OK)\n}\n- get(\"edit/{workspaceId}\") {\n+ get(\"{workspaceId}/edit\") {\nval id = call.parameters[\"workspaceId\"]\nif (id == null) {\ncall.respond(HttpStatusCode.BadRequest, \"Workspace ID is missing\")\n@@ -86,7 +89,7 @@ fun Application.workspaceManagerModule() {\nthis.call.respondText(html, ContentType.Text.Html, HttpStatusCode.OK)\n}\n- get(\"download-modules/{workspaceId}/queue\") {\n+ get(\"{workspaceId}/download-modules/queue\") {\nval workspaceId = call.parameters[\"workspaceId\"]!!\nval job = manager.buildWorkspaceDownloadFileAsync(workspaceId)\nval respondStatus: suspend (String, String)->Unit = { text, refresh ->\n@@ -116,13 +119,13 @@ fun Application.workspaceManagerModule() {\n}\n}\n- get(\"download-modules/{workspaceId}/status\") {\n+ get(\"{workspaceId}/status\") {\nval workspaceId = call.parameters[\"workspaceId\"]!!\nval job = manager.buildWorkspaceDownloadFileAsync(workspaceId)\ncall.respondText(job.status.toString(), ContentType.Text.Plain, HttpStatusCode.OK)\n}\n- get(\"download-modules/{workspaceId}/workspace-{workspaceId}.zip\") {\n+ get(\"{workspaceId}/download-modules/workspace.zip\") {\nval id = call.parameters[\"workspaceId\"]!!\nval workspace = manager.getWorkspace(id)\nif (workspace == null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/resources/html/edit.html",
"new_path": "workspace-manager/src/main/resources/html/edit.html",
"diff": "<title>Edit Workspace</title>\n</head>\n<body>\n- <form action=\"../update\" method=\"post\">\n+ <form action=\"./update\" method=\"post\">\n<input type=\"submit\" value=\"Save\" />\n<br/>\n<textarea name=\"content\" style=\"width: 800px; height: 500px\">{{content}}</textarea>\n</form>\n- <div><a href=\"../download-modules/{{workspaceId}}/queue\">Download Modules</a></div>\n+ <div><a href=\"download-modules/queue\">Download Modules</a></div>\n+ <div><a href=\"../../workspace-{{workspaceId}}/ide/\">Open in MPS</a></div>\n</body>\n</html>\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | reorganized the URL path structure on the workspace server |
426,496 | 07.02.2022 11:07:36 | -3,600 | b0afa5bd6c6d0d0071bb6b5020a7a400b893356d | Show list of existing workspaces | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/build.gradle.kts",
"new_path": "workspace-manager/build.gradle.kts",
"diff": "@@ -34,6 +34,7 @@ dependencies {\nimplementation(\"org.zeroturnaround:zt-zip:1.14\")\nimplementation(\"org.apache.commons:commons-text:1.9\")\nimplementation(project(\":model-client\"))\n+ implementation(\"io.ktor\",\"ktor-html-builder\", ktorVersion)\ntestImplementation(\"org.junit.jupiter:junit-jupiter-api:5.6.0\")\ntestRuntimeOnly(\"org.junit.jupiter:junit-jupiter-engine\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -28,6 +28,7 @@ import java.util.zip.ZipOutputStream\nimport kotlin.collections.HashMap\nclass WorkspaceManager {\n+ private val WORKSPACE_LIST_KEY = \"workspaces\"\nprivate val mpsHome: File = findMpsHome()\nprivate val modelClient: RestWebModelClient = RestWebModelClient(getModelServerUrl())\nprivate val activeWorkspaces: MutableMap<String, Workspace> = HashMap()\n@@ -70,6 +71,18 @@ class WorkspaceManager {\n.firstOrNull() ?: \"http://localhost:31963/model/\"\n}\n+ @Synchronized\n+ fun getWorkspaceIds(): Set<String> {\n+ val idString = modelClient.get(WORKSPACE_LIST_KEY)\n+ if (idString.isNullOrEmpty()) return setOf()\n+ return idString.split(\",\").toSet()\n+ }\n+\n+ @Synchronized\n+ fun setWorkspaceIds(ids: Set<String>) {\n+ modelClient.put(WORKSPACE_LIST_KEY, ids.sorted().joinToString(\",\"))\n+ }\n+\n@Synchronized\nfun newWorkspace(): Workspace {\nval workspace = Workspace(\n@@ -79,6 +92,7 @@ class WorkspaceManager {\n)\nmodelClient.put(key(workspace.id), Json.encodeToString(workspace))\nactiveWorkspaces[workspace.id] = workspace\n+ setWorkspaceIds(getWorkspaceIds() + workspace.id)\nreturn workspace\n}\n@@ -101,6 +115,7 @@ class WorkspaceManager {\nval id = workspace.id\nmodelClient.put(key(id), Json.encodeToString(workspace))\nactiveWorkspaces[workspace.id] = workspace\n+ setWorkspaceIds(getWorkspaceIds() + workspace.id)\nsynchronized(buildJobs) {\nbuildJobs.remove(id)\nFileUtils.deleteQuietly(getDownloadFile(workspace))\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -19,11 +19,13 @@ import io.ktor.application.Application\nimport io.ktor.application.call\nimport io.ktor.application.install\nimport io.ktor.features.*\n+import io.ktor.html.*\nimport io.ktor.http.*\nimport io.ktor.http.content.*\nimport io.ktor.request.*\nimport io.ktor.response.*\nimport io.ktor.routing.*\n+import kotlinx.html.*\nimport kotlinx.serialization.decodeFromString\nimport kotlinx.serialization.encodeToString\nimport org.apache.commons.text.StringEscapeUtils\n@@ -35,7 +37,33 @@ fun Application.workspaceManagerModule() {\ninstall(Routing)\nrouting {\n- defaultResource(\"html/index.html\")\n+ get(\"/\") {\n+ call.respondHtml(HttpStatusCode.OK) {\n+ head {\n+ title(\"Workspaces\")\n+ }\n+ body {\n+ ul {\n+ manager.getWorkspaceIds().forEach {\n+ li {\n+ a {\n+ href = \"$it/edit\"\n+ text(it)\n+ }\n+ }\n+ }\n+ }\n+ form {\n+ action = \"new\"\n+ method = FormMethod.post\n+ input {\n+ type = InputType.submit\n+ value = \"Create New Workspace\"\n+ }\n+ }\n+ }\n+ }\n+ }\npost(\"new\") {\nval workspace = manager.newWorkspace()\n"
},
{
"change_type": "DELETE",
"old_path": "workspace-manager/src/main/resources/html/index.html",
"new_path": null,
"diff": "-<!DOCTYPE html>\n-<html lang=\"en\">\n-<head>\n- <meta charset=\"UTF-8\">\n- <title>Workspace Manager</title>\n-</head>\n-<body>\n- <h1>Add New Workspace</h1>\n- <form action=\"new\" method=\"post\">\n- <div>Result Format:\n- <select name=\"format\">\n- <option value=\"yaml\">YAML</option>\n- <option value=\"json\">JSON</option>\n- </select>\n- </div>\n- <input type=\"submit\" value=\"Create New Workspace\"/>\n- </form>\n-</body>\n-</html>\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Show list of existing workspaces |
426,496 | 07.02.2022 16:57:12 | -3,600 | 7dffbf8293d8241eaea5fc580f0c3566294b1e52 | File upload as an additional modules source for a workspace
Might be useful if your project is not stored in a public git
repository or you don't want to enter your credentials in Modelix. | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"diff": "@@ -21,7 +21,8 @@ data class Workspace(var id: String,\nval modelRepositories: List<ModelRepository> = listOf(),\nval gitRepositories: List<GitRepository> = listOf(),\nval mavenRepositories: List<MavenRepository> = listOf(),\n- val mavenDependencies: List<String> = listOf())\n+ val mavenDependencies: List<String> = listOf(),\n+ val uploads: MutableList<String> = ArrayList())\n@Serializable\ndata class ModelRepository(val id: String,\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -136,6 +136,15 @@ class WorkspaceManager {\nfun getWorkspaceDirectory(workspace: Workspace) = File(directory, workspace.id)\n+ fun newUploadFolder(): File {\n+ val id = SerializationUtil.longToHex(modelClient.idGenerator.generate())\n+ val folder = getUploadFolder(id)\n+ folder.mkdirs()\n+ return folder\n+ }\n+\n+ fun getUploadFolder(id: String) = File(File(directory, \"uploads\"), id)\n+\nprivate fun buildWorkspaceDownloadFile(job: WorkspaceBuildJob): File {\nval workspace = job.workspace\nval downloadFile = job.downloadFile\n@@ -143,7 +152,10 @@ class WorkspaceManager {\nval mavenFolders = workspace.mavenDependencies.map { MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadFromMaven(it, job.outputHandler) }\nval gitManagers = workspace.gitRepositories.map { it to GitRepositoryManager(it, null, getWorkspaceDirectory(workspace)) }\ngitManagers.forEach { it.second.updateRepo() }\n- val moduleFolders = mavenFolders + gitManagers.flatMap { it.second.getRootFolders(it.first.paths) } + mpsHome\n+ val moduleFolders = mavenFolders +\n+ gitManagers.flatMap { it.second.getRootFolders(it.first.paths) } +\n+ workspace.uploads.map { getUploadFolder(it) } +\n+ mpsHome\nBuildScriptGenerator(moduleFolders).buildModules(File(getWorkspaceDirectory(workspace), \"mps-build-script.xml\"), job.outputHandler)\nFileOutputStream(downloadFile).use { fileStream ->\nZipOutputStream(fileStream).use { zipStream ->\n@@ -153,6 +165,9 @@ class WorkspaceManager {\ngitManagers.forEach { repo ->\nrepo.second.zip(repo.first.paths, zipStream)\n}\n+ workspace.uploads.forEach { uploadId ->\n+ zipStream.copyFiles(getUploadFolder(uploadId), mapPath = {directory.toPath().relativize(it)})\n+ }\n}\n}\nreturn downloadFile\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -28,7 +28,10 @@ import io.ktor.routing.*\nimport kotlinx.html.*\nimport kotlinx.serialization.decodeFromString\nimport kotlinx.serialization.encodeToString\n+import org.apache.commons.io.FileUtils\nimport org.apache.commons.text.StringEscapeUtils\n+import org.zeroturnaround.zip.ZipUtil\n+import java.io.File\nfun Application.workspaceManagerModule() {\n@@ -168,6 +171,35 @@ fun Application.workspaceManagerModule() {\n}\n}\n+ post(\"{workspaceId}/upload\") {\n+ val workspaceId = call.parameters[\"workspaceId\"]!!\n+ val workspace = manager.getWorkspace(workspaceId)\n+ ?: throw IllegalArgumentException(\"Workspace $workspaceId not found\")\n+\n+ val outputFolder = manager.newUploadFolder()\n+\n+ call.receiveMultipart().forEachPart { part ->\n+ if (part is PartData.FileItem) {\n+ val name = part.originalFileName\n+ if (!name.isNullOrEmpty()) {\n+ val outputFile = File(outputFolder, name)\n+ part.streamProvider().use {\n+ FileUtils.copyToFile(it, outputFile)\n+ }\n+ if (outputFile.extension.lowercase() == \"zip\") {\n+ ZipUtil.explode(outputFile)\n+ }\n+ }\n+ }\n+ part.dispose()\n+ }\n+\n+ workspace.uploads += outputFolder.name\n+ manager.update(workspace)\n+\n+ call.respondRedirect(\"./edit\")\n+ }\n+\nstatic {\nresources(\"html\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/resources/html/edit.html",
"new_path": "workspace-manager/src/main/resources/html/edit.html",
"diff": "<br/>\n<textarea name=\"content\" style=\"width: 800px; height: 500px\">{{content}}</textarea>\n</form>\n-\n+ <div>\n+ Upload file or directory:\n+ <form action=\"./upload\" method=\"post\" enctype=\"multipart/form-data\">\n+ <input type=\"file\" name=\"file\" multiple />\n+ <input type=\"file\" name=\"folder\" webkitdirectory mozdirectory />\n+ <input type=\"submit\" value=\"Upload\" />\n+ </form>\n+ </div>\n<div><a href=\"download-modules/queue\">Download Modules</a></div>\n<div><a href=\"../../workspace-{{workspaceId}}/ide/\">Open in MPS</a></div>\n</body>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | File upload as an additional modules source for a workspace
Might be useful if your project is not stored in a public git
repository or you don't want to enter your credentials in Modelix. |
426,496 | 07.02.2022 19:12:24 | -3,600 | eea36f854f4598939b6bc79d411986f8efc0ee25 | Use absolute path to ant
For some reason it's wasn't found anymore when only `ant` was used. | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -39,7 +39,7 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nval xml = generateXML()\nFileUtils.writeStringToFile(antScriptFile, xml, StandardCharsets.UTF_8)\n- val ant = ProcessBuilder(\"ant\", \"-f\", antScriptFile.canonicalPath).start()\n+ val ant = ProcessBuilder(getAntPath(), \"-f\", antScriptFile.canonicalPath).start()\nif (outputHandler != null) {\nval reader = BufferedReader(InputStreamReader(ant.inputStream))\nvar line = reader.readLine()\n@@ -54,6 +54,10 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nif (exitValue != 0) throw RuntimeException(\"Generating MPS modules failed with exit value $exitValue\")\n}\n+ fun getAntPath(): String {\n+ return listOf(\"/usr/local/bin/ant\").firstOrNull { File(it).exists() } ?: \"ant\"\n+ }\n+\nfun generateXML(): String {\nval doc = generateAnt()\nreturn xmlToString(doc)\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Use absolute path to ant
For some reason it's wasn't found anymore when only `ant` was used. |
426,496 | 08.02.2022 09:40:04 | -3,600 | b498a32ce217920b206b0f5e46981436ef7f35f6 | Still allow opening a workspace in MPS when building the modules failed | [
{
"change_type": "MODIFY",
"old_path": "workspace-client/src/main/kotlin/org/modelix/workspace/client/Main.kt",
"new_path": "workspace-client/src/main/kotlin/org/modelix/workspace/client/Main.kt",
"diff": "@@ -48,9 +48,9 @@ fun main(args: Array<String>) {\nval statusString = httpClient.get<String>(serverUrl + \"$workspaceId/status\")\nval status = WorkspaceBuildStatus.valueOf(statusString.trim())\nwhen (status) {\n- WorkspaceBuildStatus.Failed -> throw RuntimeException(\"Workspace $workspaceId failed to build. Can't download modules.\")\n- WorkspaceBuildStatus.Successful -> break\n- WorkspaceBuildStatus.New, WorkspaceBuildStatus.Queued, WorkspaceBuildStatus.Running -> {}\n+ WorkspaceBuildStatus.FailedZip -> throw RuntimeException(\"Workspace $workspaceId failed to create the ZIP file. Can't download modules.\")\n+ WorkspaceBuildStatus.AllSuccessful, WorkspaceBuildStatus.ZipSuccessful -> break\n+ WorkspaceBuildStatus.New, WorkspaceBuildStatus.Queued, WorkspaceBuildStatus.Running, WorkspaceBuildStatus.FailedBuild -> {}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildJob.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildJob.kt",
"diff": "@@ -19,5 +19,10 @@ class WorkspaceBuildJob(val workspace: Workspace, val downloadFile: File) {\nvar status: WorkspaceBuildStatus = WorkspaceBuildStatus.New\nval output: MutableList<String> = ArrayList()\nval outputHandler: (String)->Unit = { output += it }\n+\n+ fun appendException(e: Exception) {\n+ output += e::class.qualifiedName + \": \" + e.message\n+ output += e.stackTrace.map { \" $it\" }\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildStatus.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildStatus.kt",
"diff": "package org.modelix.workspace.manager\nenum class WorkspaceBuildStatus {\n- New,\n- Queued,\n- Running,\n- Failed,\n- Successful\n+ New, // The job was created, but is not yet queued for building\n+ Queued, // The job is queued for building, but there is currently some other job running.\n+ Running, // The job is currently executed.\n+ FailedBuild, // If the build failed we still create the ZIP to let users fix the modules.\n+ FailedZip, // Failed to create the ZIP file. There is nothing to download.\n+ AllSuccessful, // The modules were built successfully and the ZIP is ready for download.\n+ ZipSuccessful // The build failed, but the ZIP is ready for download.\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -156,7 +156,12 @@ class WorkspaceManager {\ngitManagers.flatMap { it.second.getRootFolders(it.first.paths) } +\nworkspace.uploads.map { getUploadFolder(it) } +\nmpsHome\n+ try {\nBuildScriptGenerator(moduleFolders).buildModules(File(getWorkspaceDirectory(workspace), \"mps-build-script.xml\"), job.outputHandler)\n+ } catch (e: Exception) {\n+ job.appendException(e)\n+ job.status = WorkspaceBuildStatus.FailedBuild\n+ }\nFileOutputStream(downloadFile).use { fileStream ->\nZipOutputStream(fileStream).use { zipStream ->\nmavenFolders.forEach {\n@@ -190,11 +195,13 @@ class WorkspaceManager {\ntry {\njob.status = WorkspaceBuildStatus.Running\nbuildWorkspaceDownloadFile(job)\n- job.status = WorkspaceBuildStatus.Successful\n+ job.status = if (job.status == WorkspaceBuildStatus.FailedBuild)\n+ WorkspaceBuildStatus.ZipSuccessful\n+ else\n+ WorkspaceBuildStatus.AllSuccessful\n} catch (e: Exception) {\n- job.output += e::class.qualifiedName + \": \" + e.message\n- job.output += e.stackTrace.map { \" $it\" }\n- job.status = WorkspaceBuildStatus.Failed\n+ job.appendException(e)\n+ job.status = WorkspaceBuildStatus.FailedZip\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -142,10 +142,11 @@ fun Application.workspaceManagerModule() {\nwhen (job.status) {\nWorkspaceBuildStatus.New, WorkspaceBuildStatus.Queued -> respondStatus(\"Workspace is queued for building ...\", \"3\")\nWorkspaceBuildStatus.Running -> respondStatus(\"Downloading and building modules ...\", \"3\")\n- WorkspaceBuildStatus.Failed -> respondStatus(\"Failed to build the workspace ...\", \"3\")\n- WorkspaceBuildStatus.Successful -> {\n+ WorkspaceBuildStatus.FailedBuild -> respondStatus(\"Failed to build the workspace ...\", \"3\")\n+ WorkspaceBuildStatus.FailedZip -> respondStatus(\"Failed to ZIP the workspace ...\", \"3\")\n+ WorkspaceBuildStatus.AllSuccessful, WorkspaceBuildStatus.ZipSuccessful -> {\nval fileName = \"workspace-$workspaceId.zip\"\n- respondStatus(\"\"\"Downloading <a href=\"$fileName\">$fileName</a>\"\"\", \"0; url=$fileName\")\n+ respondStatus(\"\"\"Failed to build the workspace. Downloading <a href=\"$fileName\">$fileName</a>\"\"\", \"0; url=$fileName\")\n}\n}\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Still allow opening a workspace in MPS when building the modules failed |
426,496 | 08.02.2022 11:01:50 | -3,600 | a7258f6ae92cb54417e66a7cae8adec2e8baa667 | Use persistent volume for workspace upload
Otherwise, they are gone after restarting the workspace server. | [
{
"change_type": "MODIFY",
"old_path": "kubernetes/common/workspace-manager-deployment.yaml",
"new_path": "kubernetes/common/workspace-manager-deployment.yaml",
"diff": "@@ -53,4 +53,11 @@ spec:\ninitialDelaySeconds: 60\nperiodSeconds: 15\ntimeoutSeconds: 10\n+ volumeMounts:\n+ - mountPath: \"/workspace-manager/modelix-workspaces/uploads\"\n+ name: workspace-uploads\nrestartPolicy: Always\n+ volumes:\n+ - name: workspace-uploads\n+ persistentVolumeClaim:\n+ claimName: workspace-uploads\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "kubernetes/common/workspace-uploads-persistentvolumeclaim.yaml",
"diff": "+apiVersion: v1\n+kind: PersistentVolumeClaim\n+metadata:\n+ labels:\n+ app: workspace-uploads\n+ name: workspace-uploads\n+spec:\n+ accessModes:\n+ - ReadWriteOnce\n+ resources:\n+ requests:\n+ storage: 5Gi\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Use persistent volume for workspace upload
Otherwise, they are gone after restarting the workspace server. |
426,496 | 08.02.2022 11:02:54 | -3,600 | ced29da1dcb5579b7bf277c5aba391ceecca650a | Formatting in the HTML for the upload | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/resources/html/edit.html",
"new_path": "workspace-manager/src/main/resources/html/edit.html",
"diff": "<br/>\n<textarea name=\"content\" style=\"width: 800px; height: 500px\">{{content}}</textarea>\n</form>\n- <div>\n- Upload file or directory:\n+ <br/>\n+ <div style=\"border: 1px solid black; padding: 10px;\">\n+ <div>Upload file or directory (max ~200 MB):</div>\n<form action=\"./upload\" method=\"post\" enctype=\"multipart/form-data\">\n- <input type=\"file\" name=\"file\" multiple />\n- <input type=\"file\" name=\"folder\" webkitdirectory mozdirectory />\n- <input type=\"submit\" value=\"Upload\" />\n+ <div>Choose File(s): <input type=\"file\" name=\"file\" multiple /></div>\n+ <div>Choose Directory: <input type=\"file\" name=\"folder\" webkitdirectory mozdirectory /></div>\n+ <div><input type=\"submit\" value=\"Upload\" /></div>\n</form>\n</div>\n+ <br/>\n<div><a href=\"download-modules/queue\">Download Modules</a></div>\n+ <br/>\n<div><a href=\"../../workspace-{{workspaceId}}/ide/\">Open in MPS</a></div>\n</body>\n</html>\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Formatting in the HTML for the upload |
426,496 | 08.02.2022 13:57:55 | -3,600 | 53d60711aa8feca9199aee0e8c2cbe24c9dbca9e | Don't download transitive maven dependencies as they aren't copied anyway | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"diff": "@@ -32,6 +32,7 @@ class MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\noutputDir.mkdirs()\nval properties = Properties()\nproperties[\"remoteRepositories\"] = workspace.mavenRepositories.joinToString(\",\") { it.url }\n+ properties[\"transitive\"] = \"false\"\nproperties[\"dest\"] = outputDir.absolutePath\nproperties[\"artifact\"] = addPackagingIfMissing(coordinates)\nrequest.properties = properties\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Don't download transitive maven dependencies as they aren't copied anyway |
426,496 | 08.02.2022 14:00:35 | -3,600 | 94e36f3a7639f9dfb139d2479eae37f971a31762 | Cancel building MPS modules if it takes to long
Just package the modules without finishing to build them.
Languages usually don't take several minutes to build and solutions are
not important to be prebuilt. | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -22,6 +22,7 @@ import org.w3c.dom.Text\nimport org.zeroturnaround.zip.ZipUtil\nimport java.io.*\nimport java.nio.charset.StandardCharsets\n+import java.util.concurrent.TimeUnit\nimport java.util.zip.ZipEntry\nimport javax.xml.XMLConstants\nimport javax.xml.parsers.DocumentBuilderFactory\n@@ -40,17 +41,28 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nFileUtils.writeStringToFile(antScriptFile, xml, StandardCharsets.UTF_8)\nval ant = ProcessBuilder(getAntPath(), \"-f\", antScriptFile.canonicalPath).start()\n- if (outputHandler != null) {\n+ var lastOutput = System.currentTimeMillis()\n+ val outputThread = Thread() {\nval reader = BufferedReader(InputStreamReader(ant.inputStream))\nvar line = reader.readLine()\nwhile (line != null) {\n+ lastOutput = System.currentTimeMillis()\n+ if (outputHandler != null) {\noutputHandler(line)\n+ } else {\n+ println(line)\n+ }\nline = reader.readLine()\n}\n- } else {\n- IOUtils.copy(ant.inputStream, System.out)\n}\n- val exitValue = ant.waitFor()\n+ outputThread.start()\n+ while (!ant.waitFor(10, TimeUnit.SECONDS)) {\n+ if (System.currentTimeMillis() - lastOutput > 120_000) {\n+ outputThread.interrupt()\n+ throw RuntimeException(\"Generating MPS modules timed out\")\n+ }\n+ }\n+ val exitValue = ant.exitValue()\nif (exitValue != 0) throw RuntimeException(\"Generating MPS modules failed with exit value $exitValue\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildJob.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildJob.kt",
"diff": "@@ -17,12 +17,18 @@ import java.io.File\nclass WorkspaceBuildJob(val workspace: Workspace, val downloadFile: File) {\nvar status: WorkspaceBuildStatus = WorkspaceBuildStatus.New\n- val output: MutableList<String> = ArrayList()\n- val outputHandler: (String)->Unit = { output += it }\n+ var output: List<String> = ArrayList()\n+ val outputHandler: (String)->Unit = { append(it) }\n+ var lastOutput: Long = 0\n- fun appendException(e: Exception) {\n- output += e::class.qualifiedName + \": \" + e.message\n- output += e.stackTrace.map { \" $it\" }\n+ fun appendException(e: Throwable) {\n+ append(e::class.qualifiedName + \": \" + e.message)\n+ e.stackTrace.map { \" $it\" }.forEach { append(it) }\n+ }\n+\n+ fun append(text: String) {\n+ output += text\n+ lastOutput = System.currentTimeMillis()\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -159,8 +159,8 @@ class WorkspaceManager {\ntry {\nBuildScriptGenerator(moduleFolders).buildModules(File(getWorkspaceDirectory(workspace), \"mps-build-script.xml\"), job.outputHandler)\n} catch (e: Exception) {\n- job.appendException(e)\njob.status = WorkspaceBuildStatus.FailedBuild\n+ job.appendException(e)\n}\nFileOutputStream(downloadFile).use { fileStream ->\nZipOutputStream(fileStream).use { zipStream ->\n@@ -199,9 +199,9 @@ class WorkspaceManager {\nWorkspaceBuildStatus.ZipSuccessful\nelse\nWorkspaceBuildStatus.AllSuccessful\n- } catch (e: Exception) {\n- job.appendException(e)\n+ } catch (e: Throwable) {\njob.status = WorkspaceBuildStatus.FailedZip\n+ job.appendException(e)\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -145,8 +145,12 @@ fun Application.workspaceManagerModule() {\nWorkspaceBuildStatus.FailedBuild -> respondStatus(\"Failed to build the workspace ...\", \"3\")\nWorkspaceBuildStatus.FailedZip -> respondStatus(\"Failed to ZIP the workspace ...\", \"3\")\nWorkspaceBuildStatus.AllSuccessful, WorkspaceBuildStatus.ZipSuccessful -> {\n- val fileName = \"workspace-$workspaceId.zip\"\n- respondStatus(\"\"\"Failed to build the workspace. Downloading <a href=\"$fileName\">$fileName</a>\"\"\", \"0; url=$fileName\")\n+ val fileName = \"workspace.zip\"\n+ var statusText = \"\"\"Downloading <a href=\"$fileName\">$fileName</a>\"\"\"\n+ if (job.status == WorkspaceBuildStatus.ZipSuccessful) {\n+ statusText = \"Failed to build the workspace. \" + statusText\n+ }\n+ respondStatus(statusText, \"0; url=$fileName\")\n}\n}\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Cancel building MPS modules if it takes to long
Just package the modules without finishing to build them.
Languages usually don't take several minutes to build and solutions are
not important to be prebuilt. |
426,496 | 08.02.2022 15:31:13 | -3,600 | 5fe4cd125cd1982fccae53243eaf6fdba49a0224 | Forward workspace-manager debug port (2) | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile-workspace-manager",
"new_path": "Dockerfile-workspace-manager",
"diff": "@@ -9,4 +9,4 @@ WORKDIR /workspace-manager/\nEXPOSE 28104\nCOPY workspace-manager/build/libs/workspace-manager-latest-all.jar /workspace-manager/workspace-manager.jar\nCOPY artifacts/mps /mps\n-CMD [\"java\", \"-Dmps.home=/mps\", \"-XX:MaxRAMPercentage=75\",\"-jar\", \"/workspace-manager/workspace-manager.jar\"]\n+CMD [\"java\", \"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5071\", \"-Dmps.home=/mps\", \"-XX:MaxRAMPercentage=75\",\"-jar\", \"/workspace-manager/workspace-manager.jar\"]\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Forward workspace-manager debug port (2) |
426,504 | 09.02.2022 09:01:26 | -3,600 | 262100008d025abce6f2f69a7398f61bfe4f242f | introduce mavenPublicationURL configuration value | [
{
"change_type": "MODIFY",
"old_path": "gradle-plugin/build.gradle",
"new_path": "gradle-plugin/build.gradle",
"diff": "@@ -39,7 +39,7 @@ publishing {\nrepositories {\nmaven {\nname = \"GitHubPackages\"\n- url = uri(\"https://maven.pkg.github.com/modelix/modelix\")\n+ url = uri(mavenPublicationURL)\ncredentials {\nusername = System.getenv(\"GITHUB_ACTOR\")\npassword = System.getenv(\"GITHUB_TOKEN\")\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle.properties",
"new_path": "gradle.properties",
"diff": "systemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000\n+\n+mavenPublicationURL=https://maven.pkg.github.com/modelix/modelix\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "model-client/build.gradle",
"new_path": "model-client/build.gradle",
"diff": "@@ -150,7 +150,7 @@ publishing {\nrepositories {\nmaven {\nname = \"GitHubPackages\"\n- url = uri(\"https://maven.pkg.github.com/modelix/modelix\")\n+ url = uri(mavenPublicationURL)\ncredentials {\nusername = System.getenv(\"GITHUB_ACTOR\")\npassword = System.getenv(\"GITHUB_TOKEN\")\n"
},
{
"change_type": "MODIFY",
"old_path": "model-server/build.gradle",
"new_path": "model-server/build.gradle",
"diff": "@@ -102,7 +102,7 @@ publishing {\nrepositories {\nmaven {\nname = \"GitHubPackages\"\n- url = uri(\"https://maven.pkg.github.com/modelix/modelix\")\n+ url = uri(mavenPublicationURL)\ncredentials {\nusername = System.getenv(\"GITHUB_ACTOR\")\npassword = System.getenv(\"GITHUB_TOKEN\")\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/build.gradle",
"new_path": "mps/build.gradle",
"diff": "@@ -208,21 +208,12 @@ publishing {\nrepositories {\nmaven {\nname = \"GitHubPackages\"\n- url = uri(\"https://maven.pkg.github.com/modelix/modelix\")\n+ url = uri(mavenPublicationURL)\ncredentials {\nusername = System.getenv(\"GITHUB_ACTOR\")\npassword = System.getenv(\"GITHUB_TOKEN\")\n}\n}\n-/* maven {\n- url rootProject.publishingRepository\n- if (rootProject.hasProperty('nexusUsername')) {\n- credentials {\n- username rootProject.nexusUsername\n- password rootProject.nexusPassword\n- }\n- }\n- }*/\n}\npublications {\nmodelixMpsModelPlugin(MavenPublication) {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | introduce mavenPublicationURL configuration value |
426,504 | 09.02.2022 09:17:36 | -3,600 | 40d7a5e4715118be8b8c8e9a5c712b388428a139 | use publishingRepository variable across all publications | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -80,7 +80,7 @@ if (System.getenv(\"TRAVIS_TAG\") != null && !System.getenv(\"TRAVIS_TAG\").isEmpty(\nversionFile.write(ext.modelixVersion)\nprintln(\"modelix version: \" + ext.modelixVersion)\n-ext.releaseRepository = 'https://projects.itemis.de/nexus/content/repositories/mbeddr'\n+ext.releaseRepository = 'https://maven.pkg.github.com/modelix/modelix'\next.snapshotRepository = 'https://projects.itemis.de/nexus/content/repositories/mbeddr_snapshots'\next.publishingRepository = modelixVersion.endsWith(\"-SNAPSHOT\") ? snapshotRepository : releaseRepository\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-plugin/build.gradle",
"new_path": "gradle-plugin/build.gradle",
"diff": "@@ -39,21 +39,12 @@ publishing {\nrepositories {\nmaven {\nname = \"GitHubPackages\"\n- url = uri(mavenPublicationURL)\n+ url = uri(rootProject.publishingRepository)\ncredentials {\nusername = System.getenv(\"GITHUB_ACTOR\")\npassword = System.getenv(\"GITHUB_TOKEN\")\n}\n}\n-/* maven {\n- url rootProject.publishingRepository\n- if (rootProject.hasProperty('nexusUsername')) {\n- credentials {\n- username rootProject.nexusUsername\n- password rootProject.nexusPassword\n- }\n- }\n- }*/\n}\npublications {\nmodelixGradlePlugin(MavenPublication) {\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle.properties",
"new_path": "gradle.properties",
"diff": "systemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000\n-mavenPublicationURL=https://maven.pkg.github.com/modelix/modelix\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "model-client/build.gradle",
"new_path": "model-client/build.gradle",
"diff": "@@ -150,20 +150,11 @@ publishing {\nrepositories {\nmaven {\nname = \"GitHubPackages\"\n- url = uri(mavenPublicationURL)\n+ url = uri(rootProject.publishingRepository)\ncredentials {\nusername = System.getenv(\"GITHUB_ACTOR\")\npassword = System.getenv(\"GITHUB_TOKEN\")\n}\n}\n-/* maven {\n- url rootProject.publishingRepository\n- if (rootProject.hasProperty('nexusUsername')) {\n- credentials {\n- username rootProject.nexusUsername\n- password rootProject.nexusPassword\n- }\n- }\n- }*/\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "model-server/build.gradle",
"new_path": "model-server/build.gradle",
"diff": "@@ -102,21 +102,12 @@ publishing {\nrepositories {\nmaven {\nname = \"GitHubPackages\"\n- url = uri(mavenPublicationURL)\n+ url = uri(rootProject.publishingRepository)\ncredentials {\nusername = System.getenv(\"GITHUB_ACTOR\")\npassword = System.getenv(\"GITHUB_TOKEN\")\n}\n}\n-/* maven {\n- url rootProject.publishingRepository\n- if (rootProject.hasProperty('nexusUsername')) {\n- credentials {\n- username rootProject.nexusUsername\n- password rootProject.nexusPassword\n- }\n- }\n- }*/\n}\npublications {\n/* modelServer(MavenPublication) {\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/build.gradle",
"new_path": "mps/build.gradle",
"diff": "@@ -208,7 +208,7 @@ publishing {\nrepositories {\nmaven {\nname = \"GitHubPackages\"\n- url = uri(mavenPublicationURL)\n+ url = uri(rootProject.publishingRepository)\ncredentials {\nusername = System.getenv(\"GITHUB_ACTOR\")\npassword = System.getenv(\"GITHUB_TOKEN\")\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | use publishingRepository variable across all publications |
426,504 | 09.02.2022 11:25:04 | -3,600 | 993de31d68cd9e62784abf53e5e725fac92760c3 | add flag to disable loading persistent binding configuration | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "</node>\n</node>\n</node>\n+ <node concept=\"3clFbJ\" id=\"UBWFwB5k4Q\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"UBWFwB5k4S\" role=\"3clFbx\">\n<node concept=\"abc8K\" id=\"6h4an0SZKfY\" role=\"3cqZAp\">\n<node concept=\"Xl_RD\" id=\"6h4an0SZKl7\" role=\"abp_N\">\n<property role=\"Xl_RC\" value=\"APPLYING PROJECT PLUGIN - PERSISTED BINDING CONFIGURATION\" />\n</node>\n</node>\n</node>\n+ <node concept=\"2YIFZM\" id=\"UBWFwB5klS\" role=\"3clFbw\">\n+ <ref role=\"37wK5l\" node=\"UBWFwB5foA\" resolve=\"shouldLoadPersistentBinding\" />\n+ <ref role=\"1Pybhc\" node=\"7Qo$o7gTdFI\" resolve=\"ModelixConfigurationSystemProperties\" />\n+ </node>\n+ <node concept=\"9aQIb\" id=\"UBWFwB5kVN\" role=\"9aQIa\">\n+ <node concept=\"3clFbS\" id=\"UBWFwB5kVO\" role=\"9aQI4\">\n+ <node concept=\"abc8K\" id=\"UBWFwB5kYq\" role=\"3cqZAp\">\n+ <node concept=\"Xl_RD\" id=\"UBWFwB5kYr\" role=\"abp_N\">\n+ <property role=\"Xl_RC\" value=\"APPLYING PROJECT PLUGIN - PERSISTED BINDING CONFIGURATION. Loading persisted binding disabled, skipping\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n</node>\n<node concept=\"2uRRBN\" id=\"115Xaa3ZjOv\" role=\"2uRRB_\">\n<node concept=\"3clFbS\" id=\"115Xaa3ZjOw\" role=\"2VODD2\">\n<property role=\"Xl_RC\" value=\"modelix.executionMode\" />\n</node>\n</node>\n+ <node concept=\"Wx3nA\" id=\"UBWFwB5ftK\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"LOAD_PERSISTENT_BINDIND_SYSPROP\" />\n+ <node concept=\"3Tm1VV\" id=\"UBWFwB5ftL\" role=\"1B3o_S\" />\n+ <node concept=\"17QB3L\" id=\"UBWFwB5ftM\" role=\"1tU5fm\" />\n+ <node concept=\"Xl_RD\" id=\"UBWFwB5ftN\" role=\"33vP2m\">\n+ <property role=\"Xl_RC\" value=\"modelix.loadPersistentBinding\" />\n+ </node>\n+ </node>\n<node concept=\"Wx3nA\" id=\"7Qo$o7gTmKI\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"EXPORT_PATH_SYSPROP\" />\n<node concept=\"3Tm1VV\" id=\"7Qo$o7gTmKJ\" role=\"1B3o_S\" />\n<property role=\"Xl_RC\" value=\"modelix.cloud.repos\" />\n</node>\n</node>\n+ <node concept=\"2tJIrI\" id=\"UBWFwB5dtK\" role=\"jymVt\" />\n+ <node concept=\"2YIFZL\" id=\"UBWFwB5foA\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"shouldLoadPersistentBinding\" />\n+ <node concept=\"3clFbS\" id=\"UBWFwB5foD\" role=\"3clF47\">\n+ <node concept=\"3cpWs8\" id=\"UBWFwB5frM\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"UBWFwB5frN\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"flagString\" />\n+ <node concept=\"17QB3L\" id=\"UBWFwB5frO\" role=\"1tU5fm\" />\n+ <node concept=\"2YIFZM\" id=\"UBWFwB5frP\" role=\"33vP2m\">\n+ <ref role=\"37wK5l\" to=\"ia5i:3xX$Vyo0aHz\" resolve=\"get\" />\n+ <ref role=\"1Pybhc\" to=\"ia5i:3xX$Vyo038N\" resolve=\"PropertyOrEnv\" />\n+ <node concept=\"37vLTw\" id=\"UBWFwB5fFW\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"UBWFwB5ftK\" resolve=\"LOAD_PERSISTENT_BINDIND_SYSPROP\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbJ\" id=\"UBWFwB5fUy\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"UBWFwB5fU$\" role=\"3clFbx\">\n+ <node concept=\"3cpWs6\" id=\"UBWFwB5j2z\" role=\"3cqZAp\">\n+ <node concept=\"3clFbT\" id=\"UBWFwB5j8w\" role=\"3cqZAk\">\n+ <property role=\"3clFbU\" value=\"true\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"22lmx$\" id=\"UBWFwB5hb1\" role=\"3clFbw\">\n+ <node concept=\"2OqwBi\" id=\"UBWFwB5hNo\" role=\"3uHU7w\">\n+ <node concept=\"37vLTw\" id=\"UBWFwB5hne\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"UBWFwB5frN\" resolve=\"flagString\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"UBWFwB5iRh\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~String.isEmpty()\" resolve=\"isEmpty\" />\n+ </node>\n+ </node>\n+ <node concept=\"3clFbC\" id=\"UBWFwB5gLV\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"UBWFwB5gm3\" role=\"3uHU7B\">\n+ <ref role=\"3cqZAo\" node=\"UBWFwB5frN\" resolve=\"flagString\" />\n+ </node>\n+ <node concept=\"10Nm6u\" id=\"UBWFwB5h4O\" role=\"3uHU7w\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs6\" id=\"UBWFwB5jkI\" role=\"3cqZAp\">\n+ <node concept=\"2YIFZM\" id=\"UBWFwB5jux\" role=\"3cqZAk\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Boolean.valueOf(java.lang.String)\" resolve=\"valueOf\" />\n+ <ref role=\"1Pybhc\" to=\"wyt6:~Boolean\" resolve=\"Boolean\" />\n+ <node concept=\"37vLTw\" id=\"UBWFwB5jGD\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"UBWFwB5frN\" resolve=\"flagString\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3Tm1VV\" id=\"UBWFwB5dCt\" role=\"1B3o_S\" />\n+ <node concept=\"10P_77\" id=\"UBWFwB5fo7\" role=\"3clF45\" />\n+ </node>\n<node concept=\"2tJIrI\" id=\"54meraTAJhq\" role=\"jymVt\" />\n<node concept=\"2YIFZL\" id=\"54meraTAO3V\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"getExecutionMode\" />\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | add flag to disable loading persistent binding configuration |
426,504 | 09.02.2022 13:40:17 | -3,600 | e82b2720759a41848372fbe151cb6d509674bc41 | update message to show that persisted binding configuration is loaded | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "<node concept=\"3clFbS\" id=\"UBWFwB5k4S\" role=\"3clFbx\">\n<node concept=\"abc8K\" id=\"6h4an0SZKfY\" role=\"3cqZAp\">\n<node concept=\"Xl_RD\" id=\"6h4an0SZKl7\" role=\"abp_N\">\n- <property role=\"Xl_RC\" value=\"APPLYING PROJECT PLUGIN - PERSISTED BINDING CONFIGURATION\" />\n+ <property role=\"Xl_RC\" value=\"APPLYING PROJECT PLUGIN - PERSISTED BINDING CONFIGURATION. Loading persisted binding is enabled\" />\n</node>\n</node>\n<node concept=\"3clFbF\" id=\"1xehy3SpfNi\" role=\"3cqZAp\">\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | update message to show that persisted binding configuration is loaded |
426,496 | 08.02.2022 15:48:41 | -3,600 | 26de1d01e40826b2471a0ea4c7fd25cbaab22689 | Extracted code that searches for MPS modules into a separate class | [
{
"change_type": "MODIFY",
"old_path": ".idea/gradle.xml",
"new_path": ".idea/gradle.xml",
"diff": "<option value=\"$PROJECT_DIR$/ui-client\" />\n<option value=\"$PROJECT_DIR$/ui-proxy\" />\n<option value=\"$PROJECT_DIR$/ui-server\" />\n+ <option value=\"$PROJECT_DIR$/workspace-client\" />\n<option value=\"$PROJECT_DIR$/workspace-manager\" />\n</set>\n</option>\n"
},
{
"change_type": "MODIFY",
"old_path": ".idea/jarRepositories.xml",
"new_path": ".idea/jarRepositories.xml",
"diff": "<option name=\"name\" value=\"maven3\" />\n<option name=\"url\" value=\"https://projects.itemis.de/nexus/content/repositories/mbeddr\" />\n</remote-repository>\n+ <remote-repository>\n+ <option name=\"id\" value=\"maven2\" />\n+ <option name=\"name\" value=\"maven2\" />\n+ <option name=\"url\" value=\"https://maven.pkg.github.com/JetBrains/MPS-extensions\" />\n+ </remote-repository>\n+ <remote-repository>\n+ <option name=\"id\" value=\"maven3\" />\n+ <option name=\"name\" value=\"maven3\" />\n+ <option name=\"url\" value=\"https://maven.pkg.github.com/mbeddr/build.publish.mps\" />\n+ </remote-repository>\n</component>\n</project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "package org.modelix.workspace.build\nimport org.apache.commons.io.FileUtils\n-import org.apache.commons.io.IOUtils\nimport org.w3c.dom.Document\n-import org.w3c.dom.Element\n-import org.w3c.dom.Node\n-import org.w3c.dom.Text\n-import org.zeroturnaround.zip.ZipUtil\n-import java.io.*\n+import java.io.BufferedReader\n+import java.io.File\n+import java.io.InputStreamReader\nimport java.nio.charset.StandardCharsets\nimport java.util.concurrent.TimeUnit\n-import java.util.zip.ZipEntry\n-import javax.xml.XMLConstants\nimport javax.xml.parsers.DocumentBuilderFactory\n-import javax.xml.transform.OutputKeys\n-import javax.xml.transform.Transformer\n-import javax.xml.transform.TransformerFactory\n-import javax.xml.transform.dom.DOMSource\n-import javax.xml.transform.stream.StreamResult\nclass BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate: List<ModuleId>? = null) {\n- private var modules: FoundModules? = null\n+ val modulesMiner = ModulesMiner(inputFolders)\nfun buildModules(antScriptFile: File = File.createTempFile(\"mps-build-script\", \".xml\", File(\".\")), outputHandler: ((String)->Unit)? = null) {\nval xml = generateXML()\n@@ -75,19 +65,8 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\nreturn xmlToString(doc)\n}\n- private fun xmlToString(doc: Document): String {\n- val transformerFactory: TransformerFactory = TransformerFactory.newInstance()\n- val transformer: Transformer = transformerFactory.newTransformer()\n- transformer.setOutputProperty(OutputKeys.INDENT, \"yes\")\n- val source = DOMSource(doc)\n- val out = StringWriter()\n- val result = StreamResult(out)\n- transformer.transform(source, result)\n- return out.toString()\n- }\n-\nfun generateAnt(): Document {\n- val plan = generatePlan(modulesToGenerate ?: collectModules().modules.values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toList())\n+ val plan = generatePlan(modulesToGenerate ?: modulesMiner.collectModules().modules.values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toList())\nval dbf = DocumentBuilderFactory.newInstance()\nval db = dbf.newDocumentBuilder()\n@@ -97,7 +76,7 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\ndoc.appendChild(this)\nsetAttribute(\"default\", \"generate\")\n- val mpsHome = collectModules().mpsHome\n+ val mpsHome = modulesMiner.collectModules().mpsHome\nif (mpsHome != null) {\nnewChild(\"property\") {\nsetAttribute(\"name\", \"mps.home\")\n@@ -192,162 +171,8 @@ class BuildScriptGenerator(val inputFolders: List<File>, val modulesToGenerate:\n}\nfun generatePlan(modulesToGenerate: List<ModuleId>): GenerationPlan {\n- val planBuilder = GenerationPlanBuilder(collectModules())\n- planBuilder.build(modulesToGenerate.mapNotNull { collectModules().modules[it] })\n+ val planBuilder = GenerationPlanBuilder(modulesMiner.collectModules())\n+ planBuilder.build(modulesToGenerate.mapNotNull { modulesMiner.collectModules().modules[it] })\nreturn planBuilder.plan\n}\n-\n- fun getModules(): List<FoundModule> = collectModules().modules.values.toList()\n-\n- fun collectModules(): FoundModules {\n- if (modules == null) {\n- modules = FoundModules()\n- inputFolders.forEach { collectModules(it, null)}\n- }\n- return modules!!\n- }\n-\n- fun collectModules(file: File, owner: ModuleOwner?) {\n- if (file.isFile) {\n- when (file.extension.lowercase()) {\n- // see jetbrains.mps.project.MPSExtentions\n- \"msd\", \"mpl\", \"devkit\" -> {\n- collectModules().addModule(readModule(file, owner ?: SourceModuleOwner(file)))\n- }\n- \"jar\" -> {\n- if (!file.nameWithoutExtension.endsWith(\"-src\")) {\n- val libraryModuleOwner = owner ?: LibraryModuleOwner(file)\n- ZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\n- if (entry.name == \"META-INF/module.xml\") {\n- collectModules().addModule(readModule(stream, libraryModuleOwner))\n- }\n- when (entry.name.substringAfterLast('.', \"\").lowercase()) {\n- \"msd\", \"mpl\", \"devkit\" -> {\n- collectModules().addModule(readModule(stream, libraryModuleOwner))\n- }\n- }\n- }\n- }\n- }\n- \"vmoptions\" -> {\n- if (file.nameWithoutExtension == \"mps\" || file.nameWithoutExtension == \"mps64\") {\n- collectModules().mpsHome = file.parentFile.parentFile\n- }\n- }\n- }\n- } else if (file.isDirectory) {\n- val isPluginDir = File(File(file, \"META-INF\"), \"plugin.xml\").exists()\n- val pluginOwner = if (isPluginDir) PluginModuleOwner(file) else null\n- file.listFiles()?.forEach { child ->\n- collectModules(child, owner ?: pluginOwner)\n- }\n- }\n- }\n-\n- private fun readModule(file: File, owner: ModuleOwner): FoundModule {\n- return FileInputStream(file).use { readModule(it, owner) }\n- }\n-\n- private fun readModule(file: InputStream, owner: ModuleOwner): FoundModule {\n- val dbf = DocumentBuilderFactory.newInstance()\n- dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)\n- val db = dbf.newDocumentBuilder()\n- val xml = db.parse(file)\n- val missedUUIDs = extractModuleUUIDs(xmlToString(xml)).toMutableSet()\n- val doc: Element = xml.documentElement\n- val uuid = ModuleId(doc.getAttribute(\"uuid\"))\n- missedUUIDs -= uuid.id\n- var name = doc.getAttribute(\"name\")\n- if (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\n- val module = FoundModule(uuid, name, owner)\n- val addDependency = { moduleId: ModuleId, type: DependencyType, ignoreIfMissing: Boolean ->\n- missedUUIDs -= moduleId.id\n- module.addDependency(ModuleDependency(moduleId, type, ignoreIfMissing))\n- }\n- doc.visitAll { node ->\n- if (node is Element) {\n- // Why not just use the extracted UUIDs? Because there are also foreign IDs that are not UUIDs.\n- when (node.tagName) {\n- \"dependency\", \"extendedLanguage\", \"extendedDevKit\", \"usedLanguage\", \"exported-solution\" -> {\n- val text = node.children().filterIsInstance<Text>().first().wholeText\n- addDependency(moduleIdFromReference(text), DependencyType.Classpath, false)\n- }\n- \"module\" -> {\n- if (node.parentTagName() == \"dependencyVersions\") {\n- //addDependency(moduleIdFromReference(node.getAttribute(\"reference\")), DependencyType.Model, true)\n- missedUUIDs -= moduleIdFromReference(node.getAttribute(\"reference\")).id\n- } else if (node.parentTagName() == \"dependencies\") {\n- addDependency(moduleIdFromReference(node.getAttribute(\"ref\")), DependencyType.Model, false)\n- }\n- }\n- \"language\" -> {\n- if (node.parentTagName() == \"languageVersions\") {\n- addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")), DependencyType.Generator, true)\n- } else if (node.parentTagName() == \"uses\") {\n- addDependency(moduleIdFromLanguageRef(node.getAttribute(\"id\")), DependencyType.Generator, false)\n- }\n- }\n- \"exported-language\" -> {\n- addDependency(moduleIdFromReference(node.getAttribute(\"name\")), DependencyType.Classpath, false)\n- }\n- \"generator\" -> {\n- missedUUIDs -= moduleIdFromReference(node.getAttribute(\"generatorUID\")).id\n- }\n- }\n- }\n- }\n- if (missedUUIDs.isNotEmpty()) {\n- throw RuntimeException(\"More dependencies found for module $name: $missedUUIDs\")\n- }\n- return module\n- }\n-\n- private fun extractModuleUUIDs(text: String): Set<String> {\n- return Regex(\"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\")\n- .findAll(text).filter {\n- // ignore model IDs\n- val first = it.range.first\n- first < 2 || text.substring(first - 2, first) != \"r:\"\n- }.map { it.value }.toSet()\n- }\n-\n- private fun moduleIdFromReference(text: String): ModuleId {\n- // 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)\n- val matchResult = Regex(\"\"\"~?(.+)\\(.+\\)\"\"\").matchEntire(text)\n- return ModuleId(if (matchResult != null) matchResult.groupValues[1] else text)\n- }\n-\n- private fun moduleIdFromLanguageRef(text: String): ModuleId {\n- // l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage\n- val matchResult = Regex(\"\"\"l:(.+):.+\"\"\").matchEntire(text)\n- return ModuleId(if (matchResult != null) matchResult.groupValues[1] else text)\n- }\n-\n-}\n-\n-private fun Node.visitAll(visitor: (Node)->Unit) {\n- visitor(this)\n- val childNodes = this.childNodes\n- for (i in 0 until childNodes.length) childNodes.item(i).visitAll(visitor)\n-}\n-\n-private fun Node.parentTagName(): String? {\n- if (this !is Element) return null\n- val parentNode = this.parentNode\n- if (parentNode !is Element) return null\n- return parentNode.tagName\n-}\n-\n-private fun Node.children(): List<Node> {\n- val children = childNodes\n- val result = ArrayList<Node>(children.length)\n- for (i in 0 until children.length) result += children.item(i)\n- return result\n-}\n-\n-private fun Element.newChild(tag: String, body: Element.()->Unit): Element {\n- val child = ownerDocument.createElement(tag)\n- appendChild(child)\n- child.apply(body)\n- return child\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+import org.w3c.dom.Element\n+import org.w3c.dom.Text\n+import org.zeroturnaround.zip.ZipUtil\n+import java.io.File\n+import java.io.FileInputStream\n+import java.io.InputStream\n+import java.util.zip.ZipEntry\n+import javax.xml.XMLConstants\n+import javax.xml.parsers.DocumentBuilderFactory\n+\n+class ModulesMiner(val inputFolders: List<File>) {\n+\n+ private var modules: FoundModules? = null\n+\n+ fun getModules(): List<FoundModule> = collectModules().modules.values.toList()\n+\n+ fun collectModules(): FoundModules {\n+ if (modules == null) {\n+ modules = FoundModules()\n+ inputFolders.forEach { collectModules(it, null)}\n+ }\n+ return modules!!\n+ }\n+\n+ fun collectModules(file: File, owner: ModuleOwner?) {\n+ if (file.isFile) {\n+ when (file.extension.lowercase()) {\n+ // see jetbrains.mps.project.MPSExtentions\n+ \"msd\", \"mpl\", \"devkit\" -> {\n+ collectModules().addModule(readModule(file, owner ?: SourceModuleOwner(file)))\n+ }\n+ \"jar\" -> {\n+ if (!file.nameWithoutExtension.endsWith(\"-src\")) {\n+ val libraryModuleOwner = owner ?: LibraryModuleOwner(file)\n+ ZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\n+ if (entry.name == \"META-INF/module.xml\") {\n+ collectModules().addModule(readModule(stream, libraryModuleOwner))\n+ }\n+ when (entry.name.substringAfterLast('.', \"\").lowercase()) {\n+ \"msd\", \"mpl\", \"devkit\" -> {\n+ collectModules().addModule(readModule(stream, libraryModuleOwner))\n+ }\n+ }\n+ }\n+ }\n+ }\n+ \"vmoptions\" -> {\n+ if (file.nameWithoutExtension == \"mps\" || file.nameWithoutExtension == \"mps64\") {\n+ collectModules().mpsHome = file.parentFile.parentFile\n+ }\n+ }\n+ }\n+ } else if (file.isDirectory) {\n+ val isPluginDir = File(File(file, \"META-INF\"), \"plugin.xml\").exists()\n+ val pluginOwner = if (isPluginDir) PluginModuleOwner(file) else null\n+ file.listFiles()?.forEach { child ->\n+ collectModules(child, owner ?: pluginOwner)\n+ }\n+ }\n+ }\n+\n+\n+ private fun readModule(file: File, owner: ModuleOwner): FoundModule {\n+ return FileInputStream(file).use { readModule(it, owner) }\n+ }\n+\n+ private fun readModule(file: InputStream, owner: ModuleOwner): FoundModule {\n+ val dbf = DocumentBuilderFactory.newInstance()\n+ dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)\n+ val db = dbf.newDocumentBuilder()\n+ val xml = db.parse(file)\n+ val missedUUIDs = extractModuleUUIDs(xmlToString(xml)).toMutableSet()\n+ val doc: Element = xml.documentElement\n+ val uuid = ModuleId(doc.getAttribute(\"uuid\"))\n+ missedUUIDs -= uuid.id\n+ var name = doc.getAttribute(\"name\")\n+ if (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\n+ val module = FoundModule(uuid, name, owner)\n+ val addDependency = { moduleId: ModuleId, type: DependencyType, ignoreIfMissing: Boolean ->\n+ missedUUIDs -= moduleId.id\n+ module.addDependency(ModuleDependency(moduleId, type, ignoreIfMissing))\n+ }\n+ doc.visitAll { node ->\n+ if (node is Element) {\n+ // Why not just use the extracted UUIDs? Because there are also foreign IDs that are not UUIDs.\n+ when (node.tagName) {\n+ \"dependency\", \"extendedLanguage\", \"extendedDevKit\", \"usedLanguage\", \"exported-solution\" -> {\n+ val text = node.children().filterIsInstance<Text>().first().wholeText\n+ addDependency(moduleIdFromReference(text), DependencyType.Classpath, false)\n+ }\n+ \"module\" -> {\n+ if (node.parentTagName() == \"dependencyVersions\") {\n+ //addDependency(moduleIdFromReference(node.getAttribute(\"reference\")), DependencyType.Model, true)\n+ missedUUIDs -= moduleIdFromReference(node.getAttribute(\"reference\")).id\n+ } else if (node.parentTagName() == \"dependencies\") {\n+ addDependency(moduleIdFromReference(node.getAttribute(\"ref\")), DependencyType.Model, false)\n+ }\n+ }\n+ \"language\" -> {\n+ if (node.parentTagName() == \"languageVersions\") {\n+ addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")), DependencyType.Generator, true)\n+ } else if (node.parentTagName() == \"uses\") {\n+ addDependency(moduleIdFromLanguageRef(node.getAttribute(\"id\")), DependencyType.Generator, false)\n+ }\n+ }\n+ \"exported-language\" -> {\n+ addDependency(moduleIdFromReference(node.getAttribute(\"name\")), DependencyType.Classpath, false)\n+ }\n+ \"generator\" -> {\n+ missedUUIDs -= moduleIdFromReference(node.getAttribute(\"generatorUID\")).id\n+ }\n+ }\n+ }\n+ }\n+ if (missedUUIDs.isNotEmpty()) {\n+ throw RuntimeException(\"More dependencies found for module $name: $missedUUIDs\")\n+ }\n+ return module\n+ }\n+\n+ private fun extractModuleUUIDs(text: String): Set<String> {\n+ return Regex(\"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\")\n+ .findAll(text).filter {\n+ // ignore model IDs\n+ val first = it.range.first\n+ first < 2 || text.substring(first - 2, first) != \"r:\"\n+ }.map { it.value }.toSet()\n+ }\n+\n+ private fun moduleIdFromReference(text: String): ModuleId {\n+ // 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)\n+ val matchResult = Regex(\"\"\"~?(.+)\\(.+\\)\"\"\").matchEntire(text)\n+ return ModuleId(if (matchResult != null) matchResult.groupValues[1] else text)\n+ }\n+\n+ private fun moduleIdFromLanguageRef(text: String): ModuleId {\n+ // l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage\n+ val matchResult = Regex(\"\"\"l:(.+):.+\"\"\").matchEntire(text)\n+ return ModuleId(if (matchResult != null) matchResult.groupValues[1] else text)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/XmlUtils.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.build\n+\n+import org.w3c.dom.Document\n+import org.w3c.dom.Element\n+import org.w3c.dom.Node\n+import java.io.StringWriter\n+import javax.xml.transform.OutputKeys\n+import javax.xml.transform.Transformer\n+import javax.xml.transform.TransformerFactory\n+import javax.xml.transform.dom.DOMSource\n+import javax.xml.transform.stream.StreamResult\n+\n+fun Node.visitAll(visitor: (Node)->Unit) {\n+ visitor(this)\n+ val childNodes = this.childNodes\n+ for (i in 0 until childNodes.length) childNodes.item(i).visitAll(visitor)\n+}\n+\n+fun Node.parentTagName(): String? {\n+ if (this !is Element) return null\n+ val parentNode = this.parentNode\n+ if (parentNode !is Element) return null\n+ return parentNode.tagName\n+}\n+\n+fun Node.children(): List<Node> {\n+ val children = childNodes\n+ val result = ArrayList<Node>(children.length)\n+ for (i in 0 until children.length) result += children.item(i)\n+ return result\n+}\n+\n+fun Element.newChild(tag: String, body: Element.()->Unit): Element {\n+ val child = ownerDocument.createElement(tag)\n+ appendChild(child)\n+ child.apply(body)\n+ return child\n+}\n+\n+fun xmlToString(doc: Document): String {\n+ val transformerFactory: TransformerFactory = TransformerFactory.newInstance()\n+ val transformer: Transformer = transformerFactory.newTransformer()\n+ transformer.setOutputProperty(OutputKeys.INDENT, \"yes\")\n+ val source = DOMSource(doc)\n+ val out = StringWriter()\n+ val result = StreamResult(out)\n+ transformer.transform(source, result)\n+ return out.toString()\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -46,6 +46,7 @@ fun Application.workspaceManagerModule() {\ntitle(\"Workspaces\")\n}\nbody {\n+ h1 { text(\"Workspaces\") }\nul {\nmanager.getWorkspaceIds().forEach {\nli {\n@@ -61,7 +62,7 @@ fun Application.workspaceManagerModule() {\nmethod = FormMethod.post\ninput {\ntype = InputType.submit\n- value = \"Create New Workspace\"\n+ value = \"Add New Workspace\"\n}\n}\n}\n@@ -176,6 +177,10 @@ fun Application.workspaceManagerModule() {\n}\n}\n+ get(\"{workspaceId}/download-modules/modules.xml\") {\n+\n+ }\n+\npost(\"{workspaceId}/upload\") {\nval workspaceId = call.parameters[\"workspaceId\"]!!\nval workspace = manager.getWorkspace(workspaceId)\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Extracted code that searches for MPS modules into a separate class |
426,496 | 17.02.2022 09:57:36 | -3,600 | 39d07c4c69f5b3a968384b24a9b6a40efd9918ae | Moved code for starting a headless mps into a separate module to cleanup the classpath
There were conflicts with the jars used in the workspace manager and the
jars in MPS. | [
{
"change_type": "MODIFY",
"old_path": ".idea/gradle.xml",
"new_path": ".idea/gradle.xml",
"diff": "<option value=\"$PROJECT_DIR$\" />\n<option value=\"$PROJECT_DIR$/gradle-plugin\" />\n<option value=\"$PROJECT_DIR$/graphql-server\" />\n+ <option value=\"$PROJECT_DIR$/headless-mps\" />\n<option value=\"$PROJECT_DIR$/instances-manager\" />\n<option value=\"$PROJECT_DIR$/manual-tests\" />\n<option value=\"$PROJECT_DIR$/model-client\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "headless-mps/build.gradle.kts",
"diff": "+\n+description = \"Run MPS headless\"\n+\n+plugins {\n+ kotlin(\"jvm\") version \"1.5.31\"\n+ kotlin(\"plugin.serialization\") version \"1.5.31\"\n+ id(\"application\")\n+}\n+\n+application {\n+ mainClass.set(\"org.modelix.headlessmps.ModelImportMain\")\n+ mainClassName = \"org.modelix.headlessmps.ModelImportMain\"\n+}\n+\n+dependencies {\n+ compileOnly(fileTree(\"../artifacts/mps/lib\") {\n+ include(\"*.jar\")\n+ })\n+ implementation(\"org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2\")\n+ testImplementation(\"org.junit.jupiter:junit-jupiter-api:5.6.0\")\n+ testRuntimeOnly(\"org.junit.jupiter:junit-jupiter-engine\")\n+}\n+\n+tasks.getByName<Test>(\"test\") {\n+ useJUnitPlatform()\n+}\n+\n+val copyDependencies = task(\"copyDependencies\", Copy::class) {\n+ from(configurations.default)\n+ into(File(File(\"build\"), \"libs\"))\n+}\n+\n+tasks.getByName(\"assemble\") {\n+ dependsOn(copyDependencies)\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/modelimport/EnvironmentLoader.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/EnvironmentLoader.kt",
"diff": "* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n-package org.modelix.workspace.modelimport\n+package org.modelix.headlessmps\nimport com.intellij.ide.GeneralSettings\nimport com.intellij.util.ReflectionUtil\n"
},
{
"change_type": "RENAME",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/modelimport/EnvironmentSpec.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/EnvironmentSpec.kt",
"diff": "* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n-package org.modelix.workspace.modelimport\n+package org.modelix.headlessmps\nimport kotlinx.serialization.Serializable\n"
},
{
"change_type": "RENAME",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/modelimport/JavaProcess.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/JavaProcess.kt",
"diff": "* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n-package org.modelix.workspace.modelimport\n+package org.modelix.headlessmps\nimport java.io.*\nimport java.util.concurrent.TimeUnit\n"
},
{
"change_type": "RENAME",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/modelimport/ModelImportMain.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/ModelImportMain.kt",
"diff": "-package org.modelix.workspace.modelimport\n+package org.modelix.headlessmps\nimport kotlinx.serialization.decodeFromString\nimport kotlinx.serialization.json.Json\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "<node concept=\"liA8E\" id=\"6dPmVFx5Je4\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"guwi:~PrintStream.println(java.lang.String)\" resolve=\"println\" />\n<node concept=\"Xl_RD\" id=\"6dPmVFx5Je5\" role=\"37wK5m\">\n- <property role=\"Xl_RC\" value=\"<MODEL IMPORT NOT COMPLETED SUCCESSFULLY>\" />\n+ <property role=\"Xl_RC\" value=\"<MODEL IMPORT FAILED>\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n</node>\n+ <node concept=\"3clFbF\" id=\"2ti6ENSI$I3\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"2ti6ENSI_Jf\" role=\"3clFbG\">\n+ <node concept=\"2YIFZM\" id=\"2ti6ENSI_4S\" role=\"2Oq$k0\">\n+ <ref role=\"37wK5l\" to=\"bd8o:~ApplicationManager.getApplication()\" resolve=\"getApplication\" />\n+ <ref role=\"1Pybhc\" to=\"bd8o:~ApplicationManager\" resolve=\"ApplicationManager\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"2ti6ENSIAui\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"bd8o:~Application.invokeLater(java.lang.Runnable)\" resolve=\"invokeLater\" />\n+ <node concept=\"1bVj0M\" id=\"2ti6ENSIBts\" role=\"37wK5m\">\n+ <property role=\"3yWfEV\" value=\"true\" />\n+ <node concept=\"3clFbS\" id=\"2ti6ENSIBtt\" role=\"1bW5cS\">\n<node concept=\"3clFbF\" id=\"6dPmVFxck$e\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"6dPmVFxck$f\" role=\"3clFbG\">\n<node concept=\"2YIFZM\" id=\"6dPmVFxck$g\" role=\"2Oq$k0\">\n</node>\n</node>\n</node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"37vLTG\" id=\"6dPmVFx8$u9\" role=\"1bW2Oz\">\n<property role=\"TrG5h\" value=\"project\" />\n<node concept=\"3uibUv\" id=\"6dPmVFx8OOv\" role=\"1tU5fm\">\n"
},
{
"change_type": "MODIFY",
"old_path": "settings.gradle",
"new_path": "settings.gradle",
"diff": "@@ -12,3 +12,4 @@ include 'manual-tests'\ninclude 'graphql-server'\ninclude 'workspace-manager'\ninclude 'workspace-client'\n+include 'headless-mps'\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/build.gradle.kts",
"new_path": "workspace-manager/build.gradle.kts",
"diff": "@@ -42,6 +42,7 @@ dependencies {\nimplementation(\"org.zeroturnaround:zt-zip:1.14\")\nimplementation(\"org.apache.commons:commons-text:1.9\")\nimplementation(project(\":model-client\"))\n+ implementation(project(\":headless-mps\"))\nimplementation(\"io.ktor\",\"ktor-html-builder\", ktorVersion)\ntestImplementation(\"org.junit.jupiter:junit-jupiter-api:5.6.0\")\ntestRuntimeOnly(\"org.junit.jupiter:junit-jupiter-engine\")\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -20,7 +20,7 @@ import org.apache.commons.io.FileUtils\nimport org.modelix.model.client.RestWebModelClient\nimport org.modelix.model.persistent.SerializationUtil\nimport org.modelix.workspace.build.*\n-import org.modelix.workspace.modelimport.*\n+import org.modelix.headlessmps.*\nimport org.w3c.dom.Document\nimport java.io.File\nimport java.io.FileOutputStream\n@@ -54,6 +54,11 @@ class WorkspaceManager {\n}\nprivate val buildJobs: MutableMap<String, WorkspaceBuildJob> = Collections.synchronizedMap(HashMap())\nprivate val executor = Executors.newSingleThreadExecutor()\n+ private val headlessMpsFolder = run {\n+ val candidates = listOf(File(\"../headless-mps/build/libs/\"))\n+ candidates.firstOrNull { it.exists() }\n+ ?: throw RuntimeException(\"headless-mps not found in $candidates\")\n+ }\ninit {\nprintln(\"workspaces directory: $directory\")\n@@ -301,10 +306,11 @@ class WorkspaceManager {\nargs += ModelImportMain.ENVIRONMENT_ARG_KEY\nargs += envFile.canonicalPath\njvmArgs += \"-Dmodelix.executionMode=MODEL_IMPORT\"\n- jvmArgs += \"-Dmodelix.import.repositoryId=workspace-${job.workspace.id}\"\n+ jvmArgs += \"-Dmodelix.import.repositoryId=workspace_${job.workspace.id}\"\njvmArgs += \"-Dmodelix.import.serverUrl=${getModelServerUrl()}\"\n- classpath.removeAll { it.contains(\"model-client\") }\n- classpath.addAll(0, mpsClassPath)\n+ classpath.clear()\n+ classpath += mpsClassPath\n+ classpath += (headlessMpsFolder.listFiles() ?: arrayOf()).map { it.canonicalPath }\nexec()\n}\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Moved code for starting a headless mps into a separate module to cleanup the classpath
There were conflicts with the jars used in the workspace manager and the
jars in MPS. |
426,496 | 17.02.2022 10:24:22 | -3,600 | c8c066eb068fa2b007cf375ee9aac9f1efccd63f | Give the model client time to write the changes after import before closing MPS | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "</node>\n</node>\n</node>\n+ <node concept=\"3clFbF\" id=\"2ti6ENSLqjV\" role=\"3cqZAp\">\n+ <node concept=\"1rXfSq\" id=\"2ti6ENSLqjT\" role=\"3clFbG\">\n+ <ref role=\"37wK5l\" node=\"2ti6ENSKWd_\" resolve=\"waitForWriteToModelServer\" />\n+ <node concept=\"2OqwBi\" id=\"2ti6ENSLqJ3\" role=\"37wK5m\">\n+ <node concept=\"37vLTw\" id=\"2ti6ENSLqJ4\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"6dPmVFx9X_d\" resolve=\"connection\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"2ti6ENSLqJ5\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"csg2:2n9Wvfbnqym\" resolve=\"getClient\" />\n+ </node>\n+ </node>\n+ <node concept=\"1bVj0M\" id=\"2ti6ENSLrOP\" role=\"37wK5m\">\n+ <property role=\"3yWfEV\" value=\"true\" />\n+ <node concept=\"3clFbS\" id=\"2ti6ENSLrOR\" role=\"1bW5cS\">\n<node concept=\"3clFbF\" id=\"2ti6ENSI$I3\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"2ti6ENSI_Jf\" role=\"3clFbG\">\n<node concept=\"2YIFZM\" id=\"2ti6ENSI_4S\" role=\"2Oq$k0\">\n</node>\n</node>\n</node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"37vLTG\" id=\"6dPmVFx8$u9\" role=\"1bW2Oz\">\n<property role=\"TrG5h\" value=\"project\" />\n<node concept=\"3uibUv\" id=\"6dPmVFx8OOv\" role=\"1tU5fm\">\n</node>\n</node>\n</node>\n+ <node concept=\"2tJIrI\" id=\"2ti6ENSKTCd\" role=\"jymVt\" />\n+ <node concept=\"3clFb_\" id=\"2ti6ENSKWd_\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"waitForWriteToModelServer\" />\n+ <node concept=\"37vLTG\" id=\"2ti6ENSLfKm\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"client\" />\n+ <node concept=\"3uibUv\" id=\"2ti6ENSL$M0\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"5440:~IModelClient\" resolve=\"IModelClient\" />\n+ </node>\n+ </node>\n+ <node concept=\"37vLTG\" id=\"2ti6ENSLiJH\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"whenDone\" />\n+ <node concept=\"3uibUv\" id=\"2ti6ENSLl5l\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"wyt6:~Runnable\" resolve=\"Runnable\" />\n+ </node>\n+ </node>\n+ <node concept=\"3cqZAl\" id=\"2ti6ENSKWdB\" role=\"3clF45\" />\n+ <node concept=\"3Tm6S6\" id=\"2ti6ENSKXWc\" role=\"1B3o_S\" />\n+ <node concept=\"3clFbS\" id=\"2ti6ENSKWdD\" role=\"3clF47\">\n+ <node concept=\"3clFbF\" id=\"2ti6ENSL5Uh\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"2ti6ENSL6kO\" role=\"3clFbG\">\n+ <node concept=\"2YIFZM\" id=\"2ti6ENSL5VI\" role=\"2Oq$k0\">\n+ <ref role=\"37wK5l\" to=\"bd8o:~ApplicationManager.getApplication()\" resolve=\"getApplication\" />\n+ <ref role=\"1Pybhc\" to=\"bd8o:~ApplicationManager\" resolve=\"ApplicationManager\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"2ti6ENSL78N\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"bd8o:~Application.executeOnPooledThread(java.lang.Runnable)\" resolve=\"executeOnPooledThread\" />\n+ <node concept=\"1bVj0M\" id=\"2ti6ENSL7pF\" role=\"37wK5m\">\n+ <node concept=\"3clFbS\" id=\"2ti6ENSL7pG\" role=\"1bW5cS\">\n+ <node concept=\"3J1_TO\" id=\"2ti6ENSMkrI\" role=\"3cqZAp\">\n+ <node concept=\"3uVAMA\" id=\"2ti6ENSMkwO\" role=\"1zxBo5\">\n+ <node concept=\"XOnhg\" id=\"2ti6ENSMkwP\" role=\"1zc67B\">\n+ <property role=\"TrG5h\" value=\"e\" />\n+ <node concept=\"nSUau\" id=\"2ti6ENSMkwQ\" role=\"1tU5fm\">\n+ <node concept=\"3uibUv\" id=\"2ti6ENSMkLT\" role=\"nSUat\">\n+ <ref role=\"3uigEE\" to=\"wyt6:~InterruptedException\" resolve=\"InterruptedException\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbS\" id=\"2ti6ENSMkwR\" role=\"1zc67A\" />\n+ </node>\n+ <node concept=\"3clFbS\" id=\"2ti6ENSMkrK\" role=\"1zxBo7\">\n+ <node concept=\"2$JKZl\" id=\"2ti6ENSLn6v\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"2ti6ENSLn6x\" role=\"2LFqv$\">\n+ <node concept=\"3clFbF\" id=\"2ti6ENSL7Vd\" role=\"3cqZAp\">\n+ <node concept=\"2YIFZM\" id=\"2ti6ENSL7X5\" role=\"3clFbG\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Thread.sleep(long)\" resolve=\"sleep\" />\n+ <ref role=\"1Pybhc\" to=\"wyt6:~Thread\" resolve=\"Thread\" />\n+ <node concept=\"3cmrfG\" id=\"2ti6ENSL85J\" role=\"37wK5m\">\n+ <property role=\"3cmrfH\" value=\"100\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"22lmx$\" id=\"2ti6ENSLD59\" role=\"2$JKZa\">\n+ <node concept=\"3eOSWO\" id=\"2ti6ENSLF7D\" role=\"3uHU7w\">\n+ <node concept=\"3cmrfG\" id=\"2ti6ENSLFdp\" role=\"3uHU7w\">\n+ <property role=\"3cmrfH\" value=\"0\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"2ti6ENSLDW7\" role=\"3uHU7B\">\n+ <node concept=\"2OqwBi\" id=\"2ti6ENSLD_6\" role=\"2Oq$k0\">\n+ <node concept=\"37vLTw\" id=\"2ti6ENSLDiC\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"2ti6ENSLfKm\" resolve=\"client\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"2ti6ENSLDKQ\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"5440:~IModelClient.getAsyncStore()\" resolve=\"getAsyncStore\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"2ti6ENSLEef\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"hvt5:~IKeyValueStore.getPendingSize()\" resolve=\"getPendingSize\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3eOSWO\" id=\"2ti6ENSLo4N\" role=\"3uHU7B\">\n+ <node concept=\"2OqwBi\" id=\"2ti6ENSLfhp\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"2ti6ENSLioN\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"2ti6ENSLfKm\" resolve=\"client\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"2ti6ENSLfht\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"hvt5:~IKeyValueStore.getPendingSize()\" resolve=\"getPendingSize\" />\n+ </node>\n+ </node>\n+ <node concept=\"3cmrfG\" id=\"2ti6ENSLoaz\" role=\"3uHU7w\">\n+ <property role=\"3cmrfH\" value=\"0\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbF\" id=\"2ti6ENSLoFc\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"2ti6ENSLoYQ\" role=\"3clFbG\">\n+ <node concept=\"37vLTw\" id=\"2ti6ENSLoFa\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"2ti6ENSLiJH\" resolve=\"whenDone\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"2ti6ENSLpl1\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Runnable.run()\" resolve=\"run\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"3Tm1VV\" id=\"6dPmVFx52N0\" role=\"1B3o_S\" />\n</node>\n<node concept=\"312cEu\" id=\"6dPmVFx76Ou\">\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Give the model client time to write the changes after import before closing MPS |
426,501 | 14.02.2022 16:08:04 | -3,600 | 33365835dfcffeb139dbbe56d24c7f2fcaf48768 | ui-client: added some more ts-ignore because of deprecated HtmlDialogElement | [
{
"change_type": "MODIFY",
"old_path": "ui-client/src/scripts/NewRootNode.ts",
"new_path": "ui-client/src/scripts/NewRootNode.ts",
"diff": "@@ -37,6 +37,7 @@ export function addNewRootNode(modelRef: string, callback: (nodeRef: string) =>\nconst closeButton = document.createElement(\"img\");\ncloseButton.onmouseover = () => closeButton.src = \"icons/AllIcons/Actions/CloseHovered\";\ncloseButton.onmouseout = () => closeButton.src = \"icons/AllIcons/Actions/Close\";\n+ // @ts-ignore\ncloseButton.onclick = () => dialog.close();\ncloseButton.src = \"icons/AllIcons/Actions/Close\";\ncloseButton.classList.add(\"close-button\");\n@@ -55,6 +56,7 @@ export function addNewRootNode(modelRef: string, callback: (nodeRef: string) =>\nurl: \"addRootNode?modelRef=\" + modelRef + \"&conceptId=\" + conceptDescriptor.id,\nasync: true,\nsuccess: response => {\n+ // @ts-ignore\ndialog.close();\ncallback(response);\n}\n@@ -77,6 +79,7 @@ export function addNewRootNode(modelRef: string, callback: (nodeRef: string) =>\n}\ndocument.body.append(dialog);\n+ // @ts-ignore\ndialog.showModal();\n} catch (error) {\nconsole.log(error);\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | ui-client: added some more ts-ignore because of deprecated HtmlDialogElement |
426,497 | 17.02.2022 10:41:32 | -3,600 | 11b434e6589ae4fde451438442fb6450dbc0a243 | ui-client: use node 17.4.0 | [
{
"change_type": "MODIFY",
"old_path": "ui-client/build.gradle",
"new_path": "ui-client/build.gradle",
"diff": "@@ -8,8 +8,8 @@ apply plugin: 'base'\nnode {\nif (!rootProject.hasProperty(\"useInstalledNvm\") || !rootProject.useInstalledNvm.toBoolean()) {\n// also change the .nvmrc file\n- version = '12.18.3'\n- npmVersion = '6.14.8'\n+ version = '17.4.0'\n+ npmVersion = '8.3.1'\ndownload = true\n}\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | ui-client: use node 17.4.0 |
426,496 | 17.02.2022 12:52:20 | -3,600 | 784c0dd10dda70435cf6a986bc525167340a32c0 | Package MPS-extensions modules and modelix into the workspace-manager docker image
They are required for the model import | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile-workspace-manager",
"new_path": "Dockerfile-workspace-manager",
"diff": "@@ -9,4 +9,7 @@ WORKDIR /workspace-manager/\nEXPOSE 28104\nCOPY workspace-manager/build/libs/workspace-manager-latest-all.jar /workspace-manager/workspace-manager.jar\nCOPY artifacts/mps /mps\n+COPY headless-mps/build/libs /headless-mps\n+COPY artifacts/de.itemis.mps.extensions /languages/mps-extensions\n+COPY build/org.modelix/build/artifacts/org.modelix /languages/modelix\nCMD [\"java\", \"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5071\", \"-Dmps.home=/mps\", \"-XX:MaxRAMPercentage=75\",\"-jar\", \"/workspace-manager/workspace-manager.jar\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -55,7 +55,7 @@ class WorkspaceManager {\nprivate val buildJobs: MutableMap<String, WorkspaceBuildJob> = Collections.synchronizedMap(HashMap())\nprivate val executor = Executors.newSingleThreadExecutor()\nprivate val headlessMpsFolder = run {\n- val candidates = listOf(File(\"../headless-mps/build/libs/\"))\n+ val candidates = listOf(File(\"../headless-mps/build/libs/\"), File(\"/headless-mps\"))\ncandidates.firstOrNull { it.exists() }\n?: throw RuntimeException(\"headless-mps not found in $candidates\")\n}\n@@ -213,9 +213,11 @@ class WorkspaceManager {\nval additionalFolders = ArrayList<File>()\nif (!modulesMiner.getModules().modules.containsKey(org_modelix_model_mpsplugin)) {\nadditionalFolders += File(File(\"..\"), \"mps\")\n+ additionalFolders += File(\"/languages/modelix\")\n}\nif (!modulesMiner.getModules().modules.containsKey(org_modelix_model_api)) {\nadditionalFolders += File(File(File(\"..\"), \"artifacts\"), \"de.itemis.mps.extensions\")\n+ additionalFolders += File(\"/languages/mps-extensions\")\n}\nadditionalFolders.filter { it.exists() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it.toPath(), it.toPath())) }\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"new_path": "workspace-manager/src/test/kotlin/org/modelix/workspace/build/BuildScriptGeneratorTest.kt",
"diff": "@@ -26,10 +26,10 @@ internal class BuildScriptGeneratorTest {\nfun test() {\nval org_modelix_ui_server = ModuleId(\"39aab22b-473f-4e44-b037-0c602964897d\")\nval org_modelix_notation_impl_baseLanguage = ModuleId(\"2db6cf34-1ef5-4ea9-ab56-6511aab61960\")\n- val generator = BuildScriptGenerator(\n- inputFolders = listOf(File(\"../mps\"), File(\"../artifacts\"), File(\"../samples\")),\n-// modulesToGenerate = listOf(org_modelix_ui_server, org_modelix_notation_impl_baseLanguage)\n- )\n+ val modulesMiner = ModulesMiner()\n+ val inputFolders = listOf(File(\"../mps\"), File(\"../artifacts\"), File(\"../samples\"))\n+ inputFolders.map { it.absoluteFile.toPath() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it, it)) }\n+ val generator = BuildScriptGenerator(modulesMiner)\nval xml = generator.generateXML()\nprintln(xml)\nval antScriptFile = File(\"auto-generated-build.xml\")\n@@ -38,9 +38,10 @@ internal class BuildScriptGeneratorTest {\n@Test\nfun test2() {\n- val generator = BuildScriptGenerator(\n- inputFolders = listOf(File(\"../artifacts/mps\"), File(\"../generator-test-project\"))\n- )\n+ val modulesMiner = ModulesMiner()\n+ val inputFolders = listOf(File(\"../artifacts/mps\"), File(\"../generator-test-project\"))\n+ inputFolders.map { it.absoluteFile.toPath() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it, it)) }\n+ val generator = BuildScriptGenerator(modulesMiner)\nval xml = generator.generateXML()\nprintln(xml)\nval antScriptFile = File(\"generator-test-project-build.xml\")\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Package MPS-extensions modules and modelix into the workspace-manager docker image
They are required for the model import |
426,496 | 17.02.2022 14:58:09 | -3,600 | 1500670f2af6c071e6237015c48d49dff411beeb | jvm and multiplatform projects don't work together in kotlin 1.6.10
Kotlin JVM projects fail to resolve the model-client...jar.
Going back to 1.5.30. | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -37,9 +37,9 @@ buildscript {\nplugins {\nid \"com.diffplug.gradle.spotless\" version \"4.5.1\" apply false\n- id \"org.jetbrains.kotlin.jvm\" version \"1.6.10\" apply false\n- id \"org.jetbrains.kotlin.multiplatform\" version \"1.6.10\" apply false\n- id \"org.jetbrains.kotlin.plugin.serialization\" version \"1.6.10\" apply false\n+ id \"org.jetbrains.kotlin.jvm\" version \"1.5.30\" apply false\n+ id \"org.jetbrains.kotlin.multiplatform\" version \"1.5.30\" apply false\n+ id \"org.jetbrains.kotlin.plugin.serialization\" version \"1.5.30\" apply false\n}\nif (System.getenv(\"NEXUS_USERNAME\") != null) ext.nexusUsername = System.getenv(\"NEXUS_USERNAME\")\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-client/build.gradle.kts",
"new_path": "workspace-client/build.gradle.kts",
"diff": "import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar\ndescription = \"Downloads modules from a workspace before starting MPS\"\n-val ktorVersion = \"1.6.5\"\n-val kotlinCoroutinesVersion = \"1.5.2\"\n-val kotlinVersion = \"1.5.31\"\n+val ktorVersion = \"1.6.7\"\n+val kotlinCoroutinesVersion = \"1.6.0\"\n+val kotlinVersion = \"1.6.10\"\nval logbackVersion = \"1.2.1\"\nplugins {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | jvm and multiplatform projects don't work together in kotlin 1.6.10
Kotlin JVM projects fail to resolve the model-client...jar.
Going back to 1.5.30. |
426,496 | 17.02.2022 18:25:23 | -3,600 | 9a44aa57039ffe54c35b59a147259b2e9b44ced1 | Forward workspace job output to the projector instance waiting for it | [
{
"change_type": "MODIFY",
"old_path": "workspace-client/src/main/kotlin/org/modelix/workspace/client/Main.kt",
"new_path": "workspace-client/src/main/kotlin/org/modelix/workspace/client/Main.kt",
"diff": "*/\npackage org.modelix.workspace.client\n-import com.charleskorn.kaml.Yaml.Companion.default\nimport io.ktor.client.*\nimport io.ktor.client.call.*\nimport io.ktor.client.engine.cio.*\n-import io.ktor.client.features.*\nimport io.ktor.client.request.*\n-import io.ktor.client.response.*\nimport io.ktor.client.statement.*\n-import io.ktor.client.statement.HttpResponse\nimport io.ktor.http.*\n-import io.ktor.util.*\n-import io.ktor.util.cio.*\n-import io.ktor.utils.io.*\n+import kotlinx.coroutines.delay\nimport kotlinx.coroutines.runBlocking\nimport org.modelix.workspace.manager.WorkspaceBuildStatus\nimport org.zeroturnaround.zip.ZipUtil\nimport java.io.File\n+import kotlin.math.sign\nfun main(args: Array<String>) {\nprintln(\"env: ${System.getenv()}\")\n@@ -44,13 +39,22 @@ fun main(args: Array<String>) {\nval httpClient = HttpClient(CIO)\nval outputFile = File(\"workspace.zip\").absoluteFile\nrunBlocking {\n+ var printedLines = 0\nwhile (true) {\nval statusString = httpClient.get<String>(serverUrl + \"$workspaceId/status\")\nval status = WorkspaceBuildStatus.valueOf(statusString.trim())\nwhen (status) {\nWorkspaceBuildStatus.FailedZip -> throw RuntimeException(\"Workspace $workspaceId failed to create the ZIP file. Can't download modules.\")\nWorkspaceBuildStatus.AllSuccessful, WorkspaceBuildStatus.ZipSuccessful -> break\n- WorkspaceBuildStatus.New, WorkspaceBuildStatus.Queued, WorkspaceBuildStatus.Running, WorkspaceBuildStatus.FailedBuild -> {}\n+ WorkspaceBuildStatus.New, WorkspaceBuildStatus.Queued, WorkspaceBuildStatus.Running, WorkspaceBuildStatus.FailedBuild -> {\n+ val output = httpClient.get<String>(serverUrl + \"$workspaceId/output\")\n+ val lines = output.split('\\n').drop(printedLines)\n+ if (lines.isNotEmpty()) {\n+ printedLines += lines.size\n+ lines.forEach { println(\"[WORKSPACE] $it\") }\n+ }\n+ delay(1000L)\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -162,6 +162,13 @@ fun Application.workspaceManagerModule() {\ncall.respondText(job.status.toString(), ContentType.Text.Plain, HttpStatusCode.OK)\n}\n+ get(\"{workspaceId}/output\") {\n+ val workspaceId = call.parameters[\"workspaceId\"]!!\n+ val job = manager.buildWorkspaceDownloadFileAsync(workspaceId)\n+ call.respondText(job.output.joinToString(\"\\n\"), ContentType.Text.Plain, HttpStatusCode.OK)\n+ }\n+\n+\nget(\"{workspaceId}/download-modules/workspace.zip\") {\nval id = call.parameters[\"workspaceId\"]!!\nval workspace = manager.getWorkspace(id)\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Forward workspace job output to the projector instance waiting for it |
426,496 | 18.02.2022 12:06:15 | -3,600 | c197804b1dbf13f2fdce89d146441f518b2726a3 | Allow specifying credentials for git repositories | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -140,7 +140,7 @@ File | Description\n[kubernetes-apply-gcloud.sh](kubernetes-apply-gcloud.sh) |\n[kubernetes-apply-local.sh](kubernetes-apply-local.sh) |\n[kubernetes-gcloud-dbsecret.sh](kubernetes-gcloud-dbsecret.sh) |\n-[kubernetes-modelsecret.sh](kubernetes-modelsecret.sh) |\n+[kubernetes-secrets.sh](kubernetes-secrets.sh) |\n[kubernetes-open-proxy.sh](kubernetes-open-proxy.sh) | Opens Modelix in the browser after loading the kubernetes configuration in docker desktop\n[kubernetes-use-latest-tag.sh](kubernetes-use-latest-tag.sh) | Use this before [kubernetes-apply-local.sh](kubernetes-apply-local.sh) to update the kubernetes configurations to use the latest Modelix version\n[modelix-version.sh](modelix-version.sh) | Reads or creates a modelix.version file that is used to tag the docker images\n"
},
{
"change_type": "MODIFY",
"old_path": "doc/running-modelix.md",
"new_path": "doc/running-modelix.md",
"diff": "@@ -17,11 +17,11 @@ Otherwise, MPS (the JBR) will not use the correct memory limit.\n- `../gradlew run`\n- Option 2: Use Kubernetes and run the existing images.\nChoose this option if you didn't change anything in the model server code.\n- - `./kubernetes-modelsecret.sh`\n+ - `./kubernetes-secrets.sh`\n- `./kubernetes-use-latest-tag.sh`\n- `./kubernetes-apply-modelserver.sh`\n- Option 3: Use kubernetes and build your own images. Choose this option while developing the model server.\n- - `./kubernetes-modelsecret.sh`\n+ - `./kubernetes-secrets.sh`\n- `./docker-build-db.sh`\n- `./docker-build-model.sh`\n- `./kubernetes-apply-modelserver.sh`\n@@ -77,7 +77,7 @@ To connect your local MPS IDE follow these instructions:\n- `./docker-build-all.sh`\n- `./docker-push-hub.sh`\n- `kubectl create secret generic cloudsql-instance-credentials --from-file=./kubernetes/secrets/cloudsql.json`\n-- `./kubernetes-modelsecret.sh`\n+- `./kubernetes-secrets.sh`\n- SSL certificate (not supported yet)\n- `cd ssl`\n- `./generate.sh`\n"
},
{
"change_type": "DELETE",
"old_path": "generate-modelsecret.sh",
"new_path": null,
"diff": "-#!/bin/sh\n-\n-mkdir -p ./kubernetes/secrets/\n-\n-cat /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | head -c 32 > ./kubernetes/secrets/modelsecret.txt\n-\n"
},
{
"change_type": "DELETE",
"old_path": "kubernetes-modelsecret.sh",
"new_path": null,
"diff": "-#!/bin/sh\n-\n-if [ ! -f ./kubernetes/secrets/modelsecret.txt ]; then\n- ./generate-modelsecret.sh\n-fi\n-\n-kubectl create secret generic modelsecret --from-file=./kubernetes/secrets/modelsecret.txt\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "kubernetes-secrets.sh",
"diff": "+#!/bin/sh\n+\n+mkdir -p ./kubernetes/secrets/\n+\n+if [ ! -f ./kubernetes/secrets/modelsecret.txt ]; then\n+ cat /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | head -c 32 > ./kubernetes/secrets/modelsecret.txt\n+fi\n+kubectl create secret generic modelsecret --from-file=./kubernetes/secrets/modelsecret.txt\n+\n+if [ ! -f ./kubernetes/secrets/workspace-credentials-key.txt ]; then\n+ cat /dev/urandom | env LC_CTYPE=C tr -dc 'a-zA-Z0-9' | head -c 100 > ./kubernetes/secrets/workspace-credentials-key.txt\n+fi\n+kubectl create secret generic workspacesecret --from-file=./kubernetes/secrets/workspace-credentials-key.txt\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "kubernetes/common/workspace-manager-deployment.yaml",
"new_path": "kubernetes/common/workspace-manager-deployment.yaml",
"diff": "@@ -56,8 +56,14 @@ spec:\nvolumeMounts:\n- mountPath: \"/workspace-manager/modelix-workspaces/uploads\"\nname: workspace-uploads\n+ - name: workspacesecret\n+ mountPath: /secrets/workspacesecret\n+ readOnly: true\nrestartPolicy: Always\nvolumes:\n- name: workspace-uploads\npersistentVolumeClaim:\nclaimName: workspace-uploads\n+ - name: workspacesecret\n+ secret:\n+ secretName: workspacesecret\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/build.gradle.kts",
"new_path": "workspace-manager/build.gradle.kts",
"diff": "@@ -41,6 +41,7 @@ dependencies {\nimplementation(\"org.apache.maven.shared:maven-invoker:3.1.0\")\nimplementation(\"org.zeroturnaround:zt-zip:1.14\")\nimplementation(\"org.apache.commons:commons-text:1.9\")\n+ implementation(\"org.jasypt:jasypt:1.9.3\")\nimplementation(project(\":model-client\"))\nimplementation(project(\":headless-mps\"))\nimplementation(\"io.ktor\",\"ktor-html-builder\", ktorVersion)\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/GitRepositoryManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/GitRepositoryManager.kt",
"diff": "package org.modelix.workspace.manager\nimport org.eclipse.jgit.api.Git\n+import org.eclipse.jgit.errors.RepositoryNotFoundException\nimport org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider\nimport org.modelix.model.persistent.HashUtil\n-import org.modelix.workspace.build.BuildScriptGenerator\nimport java.io.*\nimport java.lang.IllegalArgumentException\nimport java.util.zip.ZipOutputStream\n-class GitRepositoryManager(val config: GitRepository, val credentials: Credentials?, val workspaceDirectory: File) {\n- private val repoDirectory = File(workspaceDirectory, \"git-\" + HashUtil.sha256(\"${config.url} ${config.branch}\").replace(\"*\", \"\"))\n+class GitRepositoryManager(val config: GitRepository, val encryptedCredentials: Credentials?, val workspaceDirectory: File) {\n+ private val repoDirectory = File(workspaceDirectory, \"git-\" + toValidFileName(config.url))\n+\n+ fun toValidFileName(text: String): String {\n+ val allowed = \"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-., \".toSet()\n+ return text.map { if (allowed.contains(it)) it else '_' }.joinToString(\"\")\n+ }\nfun updateRepo(): String {\nval existed = repoDirectory.exists()\n@@ -36,12 +41,23 @@ class GitRepositoryManager(val config: GitRepository, val credentials: Credentia\nreturn git.repository.exactRef(\"HEAD\").objectId.name\n}\n- private fun openRepo() = if (repoDirectory.exists()) Git.open(repoDirectory) else cloneRepo()\n+ private fun openRepo(): Git {\n+ if (repoDirectory.exists()) {\n+ try {\n+ return Git.open(repoDirectory)\n+ } catch (e: RepositoryNotFoundException) {\n+ return cloneRepo()\n+ }\n+ } else {\n+ return cloneRepo()\n+ }\n+ }\nprivate fun cloneRepo(): Git {\nval cmd = Git.cloneRepository()\n- if (credentials != null) {\n- cmd.setCredentialsProvider(UsernamePasswordCredentialsProvider(credentials.user, credentials.password))\n+ if (encryptedCredentials != null) {\n+ val decrypted = encryptedCredentials.decrypt()\n+ cmd.setCredentialsProvider(UsernamePasswordCredentialsProvider(decrypted.user, decrypted.password))\n}\ncmd.setURI(config.url)\nif (config.branch != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"diff": "package org.modelix.workspace.manager\nimport kotlinx.serialization.Serializable\n+import org.jasypt.salt.RandomSaltGenerator\n+import org.jasypt.util.text.AES256TextEncryptor\n+import java.io.File\n+import java.nio.charset.StandardCharsets\n+import java.security.SecureRandom\n+import java.util.*\n+\n@Serializable\ndata class Workspace(var id: String,\n@@ -38,10 +45,61 @@ data class GitRepository(val url: String,\nval branch: String = \"master\",\nvar commitHash: String? = null,\nval paths: List<String> = listOf(),\n- val credentialsRef: String? = null)\n+ var credentials: Credentials? = null)\n@Serializable\n-data class Credentials(val user: String, val password: String)\n+data class Credentials(val user: String, val password: String) {\n+ fun decrypt(): Credentials {\n+ return Credentials(decrypt(user), decrypt(password))\n+ }\n+\n+ fun encrypt(): Credentials {\n+ return Credentials(encrypt(user), encrypt(password))\n+ }\n+\n+ private fun encrypt(input: String): String {\n+ return if (input.startsWith(ENCRYPTED_PREFIX)) {\n+ input\n+ } else {\n+ ENCRYPTED_PREFIX + credentialsEncryptor.encrypt(input)\n+ }\n+ }\n+\n+ private fun decrypt(input: String): String {\n+ return if (input.startsWith(ENCRYPTED_PREFIX)) {\n+ credentialsEncryptor.decrypt(input.drop(ENCRYPTED_PREFIX.length))\n+ } else {\n+ input\n+ }\n+ }\n+}\n@Serializable\ndata class MavenRepository(val url: String)\n+\n+\n+private const val ENCRYPTED_PREFIX = \"encrypted:\"\n+private val credentialsEncryptor = run {\n+ val encryptor = AES256TextEncryptor()\n+ val key = try {\n+ val kubernetesSecretFile = File(\"/secrets/workspacesecret/workspace-credentials-key.txt\")\n+ if (kubernetesSecretFile.exists()) {\n+ kubernetesSecretFile.readLines().first()\n+ } else {\n+ println(\"${kubernetesSecretFile.absolutePath} doesn't exist\")\n+ val localSecretFile = File(\"workspace-credentials-key.txt\")\n+ if (localSecretFile.exists()) {\n+ localSecretFile.readLines().first()\n+ } else {\n+ val rand = SecureRandom()\n+ val k = (1..200).map { rand.nextInt(10) }.joinToString(\"\") { it.toString() }\n+ localSecretFile.writeText(k, StandardCharsets.UTF_8)\n+ k\n+ }\n+ }\n+ } catch (e: Exception) {\n+ \"g5Mu5trXweUQmijZtZrmjCel81O64FyVxbNFFXgOfsaUYdJ5oZ89BIN8TQy20nQskDOHK0fzJ3bnkqZLUeO6Jng2WR2WJY1V8ef86pyWj6HO5c\"\n+ }\n+ encryptor.setPassword(key)\n+ encryptor\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -129,6 +129,7 @@ class WorkspaceManager {\n@Synchronized\nfun update(workspace: Workspace) {\n//loadCommitHashes(workspace)\n+ workspace.gitRepositories.forEach { it.credentials = it.credentials?.encrypt() }\nval id = workspace.id\nmodelClient.put(key(id), Json.encodeToString(workspace))\nactiveWorkspaces[workspace.id] = workspace\n@@ -170,7 +171,7 @@ class WorkspaceManager {\nval mavenFolders = workspace.mavenDependencies\n.map { MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadFromMaven(it, job.outputHandler) }\nval gitManagers = workspace.gitRepositories\n- .map { it to GitRepositoryManager(it, null, getWorkspaceDirectory(workspace)) }\n+ .map { it to GitRepositoryManager(it, it.credentials, getWorkspaceDirectory(workspace)) }\ngitManagers.forEach { it.second.updateRepo() }\nval moduleFolders: List<ModuleOrigin> =\nmavenFolders.map { ModuleOrigin(it.toPath(), workspacePath.relativize(it.toPath())) } +\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Allow specifying credentials for git repositories |
426,496 | 18.02.2022 12:47:13 | -3,600 | 31a6b04a86d1259a964d7324288472d8e93cad21 | Use same encryption key during development and in kubernetes | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"diff": "@@ -87,7 +87,7 @@ private val credentialsEncryptor = run {\nkubernetesSecretFile.readLines().first()\n} else {\nprintln(\"${kubernetesSecretFile.absolutePath} doesn't exist\")\n- val localSecretFile = File(\"workspace-credentials-key.txt\")\n+ val localSecretFile = File(\"../kubernetes/secrets/workspace-credentials-key.txt\")\nif (localSecretFile.exists()) {\nlocalSecretFile.readLines().first()\n} else {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Use same encryption key during development and in kubernetes |
426,496 | 21.02.2022 12:39:01 | -3,600 | cdc31d3037467938232d5915aad0c2b36928627b | Git credential were missing when executing a git pull | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/GitRepositoryManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/GitRepositoryManager.kt",
"diff": "package org.modelix.workspace.manager\nimport org.eclipse.jgit.api.Git\n+import org.eclipse.jgit.api.GitCommand\n+import org.eclipse.jgit.api.TransportCommand\nimport org.eclipse.jgit.errors.RepositoryNotFoundException\nimport org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider\nimport org.modelix.model.persistent.HashUtil\n@@ -35,7 +37,7 @@ class GitRepositoryManager(val config: GitRepository, val encryptedCredentials:\nif (existed) {\ngit.checkout().setName(config.commitHash ?: config.branch).call()\nif (config.commitHash == null) {\n- git.pull().call()\n+ applyCredentials(git.pull()).call()\n}\n}\nreturn git.repository.exactRef(\"HEAD\").objectId.name\n@@ -53,12 +55,17 @@ class GitRepositoryManager(val config: GitRepository, val encryptedCredentials:\n}\n}\n- private fun cloneRepo(): Git {\n- val cmd = Git.cloneRepository()\n+ private fun <C : GitCommand<T>, T, E : TransportCommand<C, T>> applyCredentials(cmd: E): E {\nif (encryptedCredentials != null) {\nval decrypted = encryptedCredentials.decrypt()\ncmd.setCredentialsProvider(UsernamePasswordCredentialsProvider(decrypted.user, decrypted.password))\n}\n+ return cmd\n+ }\n+\n+ private fun cloneRepo(): Git {\n+ val cmd = Git.cloneRepository()\n+ applyCredentials(cmd)\ncmd.setURI(config.url)\nif (config.branch != null) {\ncmd.setBranch(config.branch)\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Git credential were missing when executing a git pull |
426,496 | 21.02.2022 14:20:50 | -3,600 | 404214a75904ac0e01c893a1d7572a4969923195 | Load declared plugin dependencies
Plugin were only loaded if they contained modules with a dependency
between them. Now, also plugins are included that are declared as a
dependency in the plugins.xml. | [
{
"change_type": "MODIFY",
"old_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/ModelImportMain.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/ModelImportMain.kt",
"diff": "package org.modelix.headlessmps\nimport kotlinx.serialization.decodeFromString\n+import kotlinx.serialization.encodeToString\nimport kotlinx.serialization.json.Json\n+import kotlinx.serialization.json.JsonBuilder\n+import kotlinx.serialization.json.JsonConfiguration\nimport java.io.File\nimport java.net.URLClassLoader\nimport java.nio.charset.StandardCharsets\n@@ -22,7 +25,11 @@ object ModelImportMain {\nif (envFile == null) throw IllegalArgumentException(\"$ENVIRONMENT_ARG_KEY argument is missing\")\nval environmentSpec = Json.decodeFromString<EnvironmentSpec>(envFile.readText(StandardCharsets.UTF_8))\n- println(\"Loading environment\")\n+ println(\"*** Loading environment *** \")\n+ Json {\n+ prettyPrint = true\n+ }.encodeToString(environmentSpec).let(::println)\n+\n//Thread.currentThread().contextClassLoader = URLClassLoader(environmentSpec.classPath.map { File(it).toURI().toURL() }.toTypedArray())\nval mpsEnvironment = EnvironmentLoader(environmentSpec).loadEnvironment()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -65,7 +65,7 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\n}\nfun generateAnt(): Document {\n- val plan = generatePlan(modulesToGenerate ?: modulesMiner.getModules().modules.values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toList())\n+ val plan = generatePlan(modulesToGenerate ?: modulesMiner.getModules().getModules().values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toList())\nval dbf = DocumentBuilderFactory.newInstance()\nval db = dbf.newDocumentBuilder()\n@@ -171,7 +171,7 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\nfun generatePlan(modulesToGenerate: List<ModuleId>): GenerationPlan {\nval planBuilder = GenerationPlanBuilder(modulesMiner.getModules())\n- planBuilder.build(modulesToGenerate.mapNotNull { modulesMiner.getModules().modules[it] })\n+ planBuilder.build(modulesToGenerate.mapNotNull { modulesMiner.getModules().getModules()[it] })\nreturn planBuilder.plan\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"diff": "@@ -16,13 +16,27 @@ package org.modelix.workspace.build\nimport java.io.File\nclass FoundModules {\n- val modules: MutableMap<ModuleId, FoundModule> = LinkedHashMap()\n+ private val modules: MutableMap<ModuleId, FoundModule> = LinkedHashMap()\nvar mpsHome: File? = null\nval projects: MutableList<FoundProject> = ArrayList()\n+ val plugins: MutableMap<String, PluginModuleOwner> = LinkedHashMap()\n+\n+ fun getPlugin(id: String): PluginModuleOwner? {\n+ return plugins[id]\n+ }\n+\n+ fun getModules(): Map<ModuleId, FoundModule> = modules\n+\n+ fun addPlugin(plugin: PluginModuleOwner) {\n+ val pluginId = plugin.pluginId\n+ if (pluginId != null) {\n+ plugins += pluginId to plugin\n+ }\n+ }\nfun addModule(module: FoundModule) {\nif (module.moduleId.id.isNotEmpty()) {\n- val existing = modules[module.moduleId]\n+ val existing = getModules()[module.moduleId]\nif (existing != null) {\nif (existing.owner != module.owner) {\nprintln(\"Duplicate module ${module.moduleId} in ${module.owner.path.getLocalAbsolutePath()} and ${existing.owner.path.getLocalAbsolutePath()}\")\n@@ -31,6 +45,10 @@ class FoundModules {\nexisting.dependencies += module.dependencies\n} else {\nmodules[module.moduleId] = module\n+ if (module.owner is PluginModuleOwner) {\n+ val pluginId = module.owner.pluginId\n+ if (pluginId != null) plugins += pluginId to module.owner\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"diff": "@@ -35,7 +35,7 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\nval cycleStart = currentProcessingModules.indexOf(dependency.moduleId)\nif (cycleStart != -1) {\ncycleIds = currentProcessingModules.drop(cycleStart) + dependency.moduleId\n- println(\"Dependency cycle detected: \" + cycleIds.map { availableModules.modules[it]?.name }.joinToString(\" -> \"))\n+ println(\"Dependency cycle detected: \" + cycleIds.map { availableModules.getModules()[it]?.name }.joinToString(\" -> \"))\nval chunkIndex = plan.getHighestChunkIndex(cycleIds).coerceAtLeast(0)\ncycleIds.forEach { forcedChunkIndex[it] = chunkIndex }\n}\n@@ -62,7 +62,7 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\nfun resolveModule(dep: ModuleDependency, usedBy: FoundModule): FoundModule? {\n// jetbrains.mps.lang.docComment doesn't exist (referenced in jetbrains.mps.lang.text)\n// if (dep.id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\n- val resolved = availableModules.modules[dep.id]\n+ val resolved = availableModules.getModules()[dep.id]\nif (resolved == null && !dep.ignoreIfMissing) {\nthrow RuntimeException(\"Dependency ${dep.id} not found (used by ${usedBy.name})\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"diff": "@@ -69,6 +69,7 @@ class ModulesMiner() {\n} else {\nval isPluginDir = File(File(file, \"META-INF\"), \"plugin.xml\").exists()\nval pluginOwner = if (isPluginDir) PluginModuleOwner(origin.localModulePath(file)) else null\n+ if (pluginOwner != null) modules.addPlugin(pluginOwner)\nfile.listFiles()?.forEach { child ->\ncollectModules(child, owner ?: pluginOwner, origin, result)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/PluginModuleOwner.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/PluginModuleOwner.kt",
"diff": "*/\npackage org.modelix.workspace.build\n+import java.io.ByteArrayInputStream\nimport java.io.File\n+import java.util.regex.Matcher\n+import java.util.regex.Pattern\n/**\n* Modules packaged as an IDEA plugin containing a META-INF/plugin.xml file.\n@@ -21,9 +24,9 @@ import java.io.File\nclass PluginModuleOwner(path: ModulePath) : ModuleOwner(path) {\nvar pluginId: String? = null\nvar name: String? = null\n+ val pluginDependencies: MutableSet<String> = HashSet() // plugin IDs\ninit {\n- try {\nval pluginPath = path.getLocalAbsolutePath().toFile()\nval pluginDescriptorFile = File(File(pluginPath, \"META-INF\"), \"plugin.xml\")\nfor (line in pluginDescriptorFile.readLines()) {\n@@ -35,10 +38,12 @@ class PluginModuleOwner(path: ModulePath) : ModuleOwner(path) {\nval nameMatch = Regex(\"\"\".*<name>(.+)</name>.*\"\"\").matchEntire(line)\nif (nameMatch != null) name = nameMatch.groupValues[1]\n}\n+ val depends = Regex(\"\"\".*<depends>(.+)</depends>.*\"\"\").matchEntire(line)\n+ if (depends != null) pluginDependencies += depends.groupValues[1]\n}\n- } catch (e: Exception) {\n- println(e.message)\n- e.printStackTrace()\n+\n+ if (pluginId == null) {\n+ throw RuntimeException(\"Plugin has no ID: $pluginPath\")\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/XmlUtils.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/XmlUtils.kt",
"diff": "@@ -40,6 +40,10 @@ fun Node.parentTagName(): String? {\nreturn parentNode.tagName\n}\n+fun Node.tagName(): String? {\n+ return if (this is Element) this.tagName else null\n+}\n+\nfun Node.children(): List<Node> {\nval children = childNodes\nval result = ArrayList<Node>(children.length)\n@@ -67,7 +71,7 @@ fun xmlToString(doc: Document): String {\nfun readXmlFile(file: File): Document {\nval dbf = DocumentBuilderFactory.newInstance()\n- dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)\n+ //dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)\nval db = dbf.newDocumentBuilder()\nreturn db.parse(file)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -33,6 +33,7 @@ import java.util.zip.ZipOutputStream\nimport javax.xml.parsers.DocumentBuilderFactory\nimport kotlin.collections.ArrayList\nimport kotlin.collections.HashMap\n+import kotlin.collections.LinkedHashMap\nclass WorkspaceManager {\ncompanion object {\n@@ -212,11 +213,11 @@ class WorkspaceManager {\n// Modelix and MPS-extensions are required to run the importer\nval additionalFolders = ArrayList<File>()\n- if (!modulesMiner.getModules().modules.containsKey(org_modelix_model_mpsplugin)) {\n+ if (!modulesMiner.getModules().getModules().containsKey(org_modelix_model_mpsplugin)) {\nadditionalFolders += File(File(\"..\"), \"mps\")\nadditionalFolders += File(\"/languages/modelix\")\n}\n- if (!modulesMiner.getModules().modules.containsKey(org_modelix_model_api)) {\n+ if (!modulesMiner.getModules().getModules().containsKey(org_modelix_model_api)) {\nadditionalFolders += File(File(File(\"..\"), \"artifacts\"), \"de.itemis.mps.extensions\")\nadditionalFolders += File(\"/languages/mps-extensions\")\n}\n@@ -270,7 +271,7 @@ class WorkspaceManager {\nnewChild(\"component\") {\nsetAttribute(\"name\", \"MPSProject\")\nnewChild(\"projectModules\") {\n- for (module in modules.modules.values) {\n+ for (module in modules.getModules().values) {\nif (module.owner is SourceModuleOwner) {\nnewChild(\"modulePath\") {\nsetAttribute(\"path\", module.owner.getWorkspaceRelativePath())\n@@ -320,10 +321,10 @@ class WorkspaceManager {\nprivate fun buildEnvironmentSpec(modules: FoundModules, classPath: List<String>): String {\nval mpsHome = modules.mpsHome ?: throw RuntimeException(\"mps.home not found\")\n- val plugins = ArrayList<PluginSpec>()\n+ val plugins: MutableMap<String, PluginSpec> = LinkedHashMap()\nval libraries = ArrayList<LibrarySpec>()\n- val rootModuleIds = modules.modules.values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toMutableSet()\n+ val rootModuleIds = modules.getModules().values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toMutableSet()\nrootModuleIds += org_modelix_model_mpsplugin\nval modulesToLoad = modules.getWithDependencies(rootModuleIds).map { it.owner }.toSet()\n@@ -332,16 +333,27 @@ class WorkspaceManager {\nis PluginModuleOwner -> {\nval pluginId = moduleOwner.pluginId\n?: throw RuntimeException(\"Plugin has no ID: ${moduleOwner.path.getLocalAbsolutePath()}\")\n- plugins += PluginSpec(moduleOwner.path.getLocalAbsolutePath().toString(), pluginId, moduleOwner.name ?: \"\")\n+ pluginWithDependencies(pluginId, modules, plugins)\n}\nis LibraryModuleOwner, is SourceModuleOwner -> libraries += LibrarySpec(moduleOwner.path.getLocalAbsolutePath().toString())\n}\n}\nval projects = modules.projects.map { ProjectSpec(it.path.canonicalPath, it.name) }\n- val spec = EnvironmentSpec(mpsHome.absolutePath, plugins, libraries, projects, classPath)\n+ val spec = EnvironmentSpec(mpsHome.absolutePath, plugins.values.toList(), libraries, projects, classPath)\nreturn Json.encodeToString(spec)\n}\n+ private fun pluginWithDependencies(pluginId: String, modules: FoundModules, result: MutableMap<String, PluginSpec>) {\n+ if (result.containsKey(pluginId)) return\n+ val plugin = modules.getPlugin(pluginId)\n+ if (plugin != null) {\n+ result += pluginId to PluginSpec(plugin.path.getLocalAbsolutePath().toString(), pluginId, plugin.name ?: \"\")\n+ for (dependency in plugin.pluginDependencies) {\n+ pluginWithDependencies(dependency, modules, result)\n+ }\n+ }\n+ }\n+\nprivate fun visitFiles(file: File, visitor: (File)->Unit) {\nvisitor(file)\nif (file.isDirectory) {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Load declared plugin dependencies
Plugin were only loaded if they contained modules with a dependency
between them. Now, also plugins are included that are declared as a
dependency in the plugins.xml. |
426,496 | 21.02.2022 14:44:45 | -3,600 | b5f2a9972a8c9bd78ca778cfa474ab54b69004ff | Don't load cloudResource.xml during import | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -301,6 +301,12 @@ class WorkspaceManager {\n}\n}\n+ // Avoid connecting to any other model server\n+ for (project in modulesMiner.getModules().projects) {\n+ val cloudResourcesFile = File(File(project.path, \".mps\"), \"cloudResources.xml\")\n+ if (cloudResourcesFile.exists()) cloudResourcesFile.delete()\n+ }\n+\nval json = buildEnvironmentSpec(modulesMiner.getModules(), mpsClassPath)\nval envFile = File(\"mps-environment.json\")\nenvFile.writeBytes(json.toByteArray(StandardCharsets.UTF_8))\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Don't load cloudResource.xml during import |
426,497 | 16.02.2022 14:29:54 | -3,600 | a410a817b9b0a9740a74369152be6e96135b5db6 | cloud view: prevent double copy | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"diff": "</node>\n<node concept=\"3Tm1VV\" id=\"7jRNnvCcY5o\" role=\"1B3o_S\" />\n</node>\n+ <node concept=\"2YIFZL\" id=\"68ebMUMLrp7\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"containsModule\" />\n+ <node concept=\"37vLTG\" id=\"68ebMUMLtv0\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"treeInRepository\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMLtv1\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" node=\"3i6diw3mm_Q\" resolve=\"CloudRepository\" />\n+ </node>\n+ </node>\n+ <node concept=\"37vLTG\" id=\"68ebMUMLtv2\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"module\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMLtv3\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"lui2:~SModule\" resolve=\"SModule\" />\n+ </node>\n+ </node>\n+ <node concept=\"3clFbS\" id=\"68ebMUMLrpa\" role=\"3clF47\">\n+ <node concept=\"3clFbF\" id=\"68ebMUMLufI\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMLuA4\" role=\"3clFbG\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMLufH\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMLtv0\" resolve=\"treeInRepository\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMM1kl\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" node=\"68ebMUMLCbA\" resolve=\"hasModuleInRepository\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMM2pR\" role=\"37wK5m\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMM264\" role=\"2Oq$k0\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMM1NW\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMLtv2\" resolve=\"module\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMM2jN\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"lui2:~SModule.getModuleId()\" resolve=\"getModuleId\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMM2AB\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Object.toString()\" resolve=\"toString\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3Tm1VV\" id=\"68ebMUMLoUq\" role=\"1B3o_S\" />\n+ <node concept=\"10P_77\" id=\"68ebMUMLrne\" role=\"3clF45\" />\n+ </node>\n<node concept=\"2tJIrI\" id=\"7jRNnvCbwLr\" role=\"jymVt\" />\n<node concept=\"2YIFZL\" id=\"74bn2Kw_TNe\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"copyInModelixAsIndependentModule\" />\n</node>\n</node>\n<node concept=\"37vLTw\" id=\"3CCis83DQCl\" role=\"37vLTJ\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n</node>\n</node>\n</node>\n<node concept=\"3clFbC\" id=\"3CCis83DPZC\" role=\"3clFbw\">\n<node concept=\"10Nm6u\" id=\"3CCis83DQbR\" role=\"3uHU7w\" />\n<node concept=\"37vLTw\" id=\"3CCis83DPwg\" role=\"3uHU7B\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n</node>\n</node>\n</node>\n<node concept=\"3clFbF\" id=\"3CCis83BON$\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"3CCis83BP6G\" role=\"3clFbG\">\n<node concept=\"37vLTw\" id=\"3CCis83BZ4M\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n</node>\n<node concept=\"liA8E\" id=\"3CCis83BPd7\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"yyf4:~ProgressMonitor.start(java.lang.String,int)\" resolve=\"start\" />\n</node>\n<node concept=\"2OqwBi\" id=\"3CCis83DCr0\" role=\"3clFbw\">\n<node concept=\"37vLTw\" id=\"3CCis83DC7X\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n</node>\n<node concept=\"liA8E\" id=\"3CCis83DCAp\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"yyf4:~ProgressMonitor.isCanceled()\" resolve=\"isCanceled\" />\n</node>\n<node concept=\"2OqwBi\" id=\"3CCis83DLew\" role=\"33vP2m\">\n<node concept=\"37vLTw\" id=\"3CCis83DLex\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n</node>\n<node concept=\"liA8E\" id=\"3CCis83DLey\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"yyf4:~ProgressMonitor.subTask(int)\" resolve=\"subTask\" />\n<node concept=\"3clFbF\" id=\"3CCis83E1QX\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"3CCis83E2jc\" role=\"3clFbG\">\n<node concept=\"37vLTw\" id=\"3CCis83E1QV\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n</node>\n<node concept=\"liA8E\" id=\"3CCis83E2uK\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"yyf4:~ProgressMonitor.done()\" resolve=\"done\" />\n</node>\n</node>\n<node concept=\"37vLTG\" id=\"3CCis83$Os8\" role=\"3clF46\">\n- <property role=\"TrG5h\" value=\"progress\" />\n+ <property role=\"TrG5h\" value=\"proygress\" />\n<node concept=\"3uibUv\" id=\"3CCis83BYrs\" role=\"1tU5fm\">\n<ref role=\"3uigEE\" to=\"yyf4:~ProgressMonitor\" resolve=\"ProgressMonitor\" />\n</node>\n+ <node concept=\"2AHcQZ\" id=\"68ebMUMLgMl\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~Nullable\" resolve=\"Nullable\" />\n+ </node>\n</node>\n<node concept=\"3cqZAl\" id=\"6dTx9S5rSuN\" role=\"3clF45\" />\n<node concept=\"P$JXv\" id=\"6dTx9S5rSDO\" role=\"lGtFl\">\n<node concept=\"17QB3L\" id=\"24If7DPKK6t\" role=\"1tU5fm\" />\n</node>\n</node>\n+ <node concept=\"3clFb_\" id=\"68ebMUMLCbA\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"hasModuleInRepository\" />\n+ <node concept=\"3clFbS\" id=\"68ebMUMLCbB\" role=\"3clF47\">\n+ <node concept=\"3clFbF\" id=\"68ebMUMLCbC\" role=\"3cqZAp\">\n+ <node concept=\"1rXfSq\" id=\"68ebMUMLCbD\" role=\"3clFbG\">\n+ <ref role=\"37wK5l\" node=\"2Js2MfX9Evn\" resolve=\"computeRead\" />\n+ <node concept=\"1bVj0M\" id=\"68ebMUMLCbE\" role=\"37wK5m\">\n+ <node concept=\"3clFbS\" id=\"68ebMUMLCbF\" role=\"1bW5cS\">\n+ <node concept=\"3cpWs8\" id=\"68ebMUMLCbG\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"68ebMUMLCbH\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"activeBranch\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMLCbI\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"5440:~ActiveBranch\" resolve=\"ActiveBranch\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"68ebMUMLCbJ\" role=\"33vP2m\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMLCbK\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"3i6diw3mtrY\" resolve=\"modelServer\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMLCbL\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" node=\"6aRQr1X24wJ\" resolve=\"getActiveBranch\" />\n+ <node concept=\"37vLTw\" id=\"68ebMUMLCbM\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"3i6diw3mtCr\" resolve=\"repositoryId\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs8\" id=\"68ebMUMLCbN\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"68ebMUMLCbO\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"branch\" />\n+ <property role=\"3TUv4t\" value=\"true\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMLCbP\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"jks5:~IBranch\" resolve=\"IBranch\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"68ebMUMLCbQ\" role=\"33vP2m\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMLCbR\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMLCbH\" resolve=\"activeBranch\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMLCbS\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"5440:~ActiveBranch.getBranch()\" resolve=\"getBranch\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs8\" id=\"68ebMUMLCbT\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"68ebMUMLCbU\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"rootNode\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMLCbV\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"jks5:~PNodeAdapter\" resolve=\"PNodeAdapter\" />\n+ </node>\n+ <node concept=\"2ShNRf\" id=\"68ebMUMLCbW\" role=\"33vP2m\">\n+ <node concept=\"1pGfFk\" id=\"68ebMUMLCbX\" role=\"2ShVmc\">\n+ <ref role=\"37wK5l\" to=\"jks5:~PNodeAdapter.<init>(long,org.modelix.model.api.IBranch)\" resolve=\"PNodeAdapter\" />\n+ <node concept=\"10M0yZ\" id=\"68ebMUMLCbY\" role=\"37wK5m\">\n+ <ref role=\"1PxDUh\" to=\"jks5:~ITree\" resolve=\"ITree\" />\n+ <ref role=\"3cqZAo\" to=\"jks5:~ITree.ROOT_ID\" resolve=\"ROOT_ID\" />\n+ </node>\n+ <node concept=\"37vLTw\" id=\"68ebMUMLCbZ\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMLCbO\" resolve=\"branch\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs6\" id=\"68ebMUMLCc9\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMLCca\" role=\"3cqZAk\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMLCcb\" role=\"2Oq$k0\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMLM$n\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMLCbU\" resolve=\"rootNode\" />\n+ </node>\n+ <node concept=\"AQDAd\" id=\"68ebMUMLCcd\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" node=\"24If7DPFqLp\" resolve=\"getChidlrenAsList\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMLCce\" role=\"37wK5m\">\n+ <node concept=\"359W_D\" id=\"68ebMUMLCcf\" role=\"2Oq$k0\">\n+ <ref role=\"359W_E\" to=\"jh6v:qmkA5fOskm\" resolve=\"Repository\" />\n+ <ref role=\"359W_F\" to=\"jh6v:qmkA5fOskn\" resolve=\"modules\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMLCcg\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"c17a:~SNamedElement.getName()\" resolve=\"getName\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2HwmR7\" id=\"68ebMUMLCch\" role=\"2OqNvi\">\n+ <node concept=\"1bVj0M\" id=\"68ebMUMLCci\" role=\"23t8la\">\n+ <node concept=\"3clFbS\" id=\"68ebMUMLCcj\" role=\"1bW5cS\">\n+ <node concept=\"3clFbF\" id=\"68ebMUMLCck\" role=\"3cqZAp\">\n+ <node concept=\"17R0WA\" id=\"68ebMUMLCcl\" role=\"3clFbG\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMLCcm\" role=\"3uHU7w\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMLCcz\" resolve=\"moduleId\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"68ebMUMLCcn\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMLCco\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMLCct\" resolve=\"it\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMLCcp\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"jks5:~INode.getPropertyValue(java.lang.String)\" resolve=\"getPropertyValue\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMLCcq\" role=\"37wK5m\">\n+ <node concept=\"355D3s\" id=\"68ebMUMLCcr\" role=\"2Oq$k0\">\n+ <ref role=\"355D3t\" to=\"jh6v:qmkA5fOskf\" resolve=\"Module\" />\n+ <ref role=\"355D3u\" to=\"jh6v:3Ezg1fME0bw\" resolve=\"id\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMLCcs\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"c17a:~SProperty.getName()\" resolve=\"getName\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"Rh6nW\" id=\"68ebMUMLCct\" role=\"1bW2Oz\">\n+ <property role=\"TrG5h\" value=\"it\" />\n+ <node concept=\"2jxLKc\" id=\"68ebMUMLCcu\" role=\"1tU5fm\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3Tm1VV\" id=\"68ebMUMLCcv\" role=\"1B3o_S\" />\n+ <node concept=\"10P_77\" id=\"68ebMUMLCcw\" role=\"3clF45\" />\n+ <node concept=\"37vLTG\" id=\"68ebMUMLCcz\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"moduleId\" />\n+ <property role=\"3TUv4t\" value=\"true\" />\n+ <node concept=\"17QB3L\" id=\"68ebMUMLCc$\" role=\"1tU5fm\" />\n+ </node>\n+ </node>\n<node concept=\"2tJIrI\" id=\"24If7DPKIOD\" role=\"jymVt\" />\n<node concept=\"2tJIrI\" id=\"2rg0XZ1jqCA\" role=\"jymVt\" />\n<node concept=\"3clFb_\" id=\"2rg0XZ1jjGj\" role=\"jymVt\">\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "<node concept=\"17QB3L\" id=\"6aRQr1WODm1\" role=\"1tU5fm\" />\n<node concept=\"2YIFZM\" id=\"6aRQr1WODg5\" role=\"33vP2m\">\n<ref role=\"1Pybhc\" to=\"jkm4:~Messages\" resolve=\"Messages\" />\n- <ref role=\"37wK5l\" to=\"jkm4:~Messages.showInputDialog(com.intellij.openapi.project.Project,java.lang.String,java.lang.String,javax.swing.Icon)\" resolve=\"showInputDialog\" />\n+ <ref role=\"37wK5l\" to=\"jkm4:~Messages.showInputDialog(com.intellij.openapi.project.Project,java.lang.String,java.lang.String,javax.swing.Icon,java.lang.String,com.intellij.openapi.ui.InputValidator)\" resolve=\"showInputDialog\" />\n<node concept=\"2OqwBi\" id=\"6aRQr1WODg6\" role=\"37wK5m\">\n<node concept=\"2WthIp\" id=\"6aRQr1WODg7\" role=\"2Oq$k0\" />\n<node concept=\"1DTwFV\" id=\"6aRQr1WODg8\" role=\"2OqNvi\">\n<property role=\"Xl_RC\" value=\"Add Model Server\" />\n</node>\n<node concept=\"10Nm6u\" id=\"6aRQr1WODgb\" role=\"37wK5m\" />\n+ <node concept=\"Xl_RD\" id=\"68ebMUMj7$i\" role=\"37wK5m\">\n+ <property role=\"Xl_RC\" value=\"http://\" />\n+ </node>\n+ <node concept=\"10Nm6u\" id=\"68ebMUMj90u\" role=\"37wK5m\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n</node>\n+ <node concept=\"2JFkCU\" id=\"68ebMUMVQD_\" role=\"3cqZAp\">\n+ <node concept=\"tCFHf\" id=\"68ebMUMVQDX\" role=\"2JFLmv\">\n+ <ref role=\"tCJdB\" node=\"68ebMUMVMvJ\" resolve=\"ModuleAlreadyOnCloud\" />\n+ <node concept=\"2GrUjf\" id=\"68ebMUMVQEp\" role=\"2J__8u\">\n+ <ref role=\"2Gs0qQ\" node=\"1xehy3Sk67R\" resolve=\"treeInRepository\" />\n+ </node>\n+ </node>\n+ </node>\n</node>\n<node concept=\"2OqwBi\" id=\"5rz8NqPRfo5\" role=\"2GsD0m\">\n<node concept=\"2YIFZM\" id=\"5rz8NqPRfo6\" role=\"2Oq$k0\">\n</node>\n<node concept=\"2ScWuX\" id=\"nP6bhxQlVl\" role=\"tmbBb\">\n<node concept=\"3clFbS\" id=\"nP6bhxQlVm\" role=\"2VODD2\">\n+ <node concept=\"3cpWs8\" id=\"68ebMUMQRoP\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"68ebMUMQRoQ\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"connected\" />\n+ <node concept=\"10P_77\" id=\"68ebMUMQRmb\" role=\"1tU5fm\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMQRoR\" role=\"33vP2m\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMQRoS\" role=\"2Oq$k0\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMQRoT\" role=\"2Oq$k0\" />\n+ <node concept=\"2BZ7hE\" id=\"68ebMUMQRoU\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"1xehy3Sk7sb\" resolve=\"treeInRepository\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMQRoV\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"csg2:3i6diw3n0$X\" resolve=\"isConnected\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"3clFbF\" id=\"1xehy3Sm8VG\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"1xehy3Sm8VH\" role=\"3clFbG\">\n<node concept=\"2OqwBi\" id=\"1xehy3Sm8VI\" role=\"2Oq$k0\">\n</node>\n</node>\n</node>\n- <node concept=\"3SKdUt\" id=\"nP6bhxQm2J\" role=\"3cqZAp\">\n- <node concept=\"1PaTwC\" id=\"nP6bhxQm2K\" role=\"1aUNEU\">\n- <node concept=\"3oM_SD\" id=\"nP6bhxQm2L\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"TODO\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"nP6bhxQm6K\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"verify\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"nP6bhxQm6O\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"it\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"nP6bhxQm73\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"is\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"nP6bhxQm79\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"not\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"nP6bhxQm7q\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"already\" />\n+ <node concept=\"3cpWs6\" id=\"nP6bhxQmfP\" role=\"3cqZAp\">\n+ <node concept=\"1Wc70l\" id=\"68ebMUMUdBS\" role=\"3cqZAk\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMUd7x\" role=\"3uHU7B\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMQRoQ\" resolve=\"connected\" />\n</node>\n- <node concept=\"3oM_SD\" id=\"nP6bhxQm7G\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"stored\" />\n+ <node concept=\"3fqX7Q\" id=\"68ebMUMUefN\" role=\"3uHU7w\">\n+ <node concept=\"2YIFZM\" id=\"68ebMUMUefP\" role=\"3fr31v\">\n+ <ref role=\"1Pybhc\" to=\"csg2:i0AVAFXWm5\" resolve=\"ModelCloudImportUtils\" />\n+ <ref role=\"37wK5l\" to=\"csg2:68ebMUMLrp7\" resolve=\"containsModule\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMUefQ\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMUefR\" role=\"2Oq$k0\" />\n+ <node concept=\"2BZ7hE\" id=\"68ebMUMUefS\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"1xehy3Sk7sb\" resolve=\"treeInRepository\" />\n</node>\n</node>\n+ <node concept=\"2OqwBi\" id=\"68ebMUMUefT\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMUefU\" role=\"2Oq$k0\" />\n+ <node concept=\"1DTwFV\" id=\"68ebMUMUefV\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"i0AVAFY_LO\" resolve=\"module\" />\n</node>\n- <node concept=\"3cpWs6\" id=\"nP6bhxQmfP\" role=\"3cqZAp\">\n- <node concept=\"2OqwBi\" id=\"1xehy3SndDM\" role=\"3cqZAk\">\n- <node concept=\"2OqwBi\" id=\"1xehy3SncYl\" role=\"2Oq$k0\">\n- <node concept=\"2WthIp\" id=\"1xehy3SncYo\" role=\"2Oq$k0\" />\n- <node concept=\"2BZ7hE\" id=\"1xehy3SncYq\" role=\"2OqNvi\">\n- <ref role=\"2WH_rO\" node=\"1xehy3Sk7sb\" resolve=\"treeInRepository\" />\n</node>\n</node>\n- <node concept=\"liA8E\" id=\"1xehy3SndLA\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"csg2:3i6diw3n0$X\" resolve=\"isConnected\" />\n</node>\n</node>\n</node>\n</node>\n<node concept=\"2ScWuX\" id=\"e_REOZbrVA\" role=\"tmbBb\">\n<node concept=\"3clFbS\" id=\"e_REOZbrVB\" role=\"2VODD2\">\n+ <node concept=\"3cpWs8\" id=\"68ebMUMXwbi\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"68ebMUMXwbj\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"connected\" />\n+ <node concept=\"10P_77\" id=\"68ebMUMXwbk\" role=\"1tU5fm\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMXwbl\" role=\"33vP2m\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMXwbm\" role=\"2Oq$k0\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMXwbn\" role=\"2Oq$k0\" />\n+ <node concept=\"2BZ7hE\" id=\"68ebMUMXwbo\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"1xehy3Sk9_8\" resolve=\"treeInRepository\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMXwbp\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"csg2:3i6diw3n0$X\" resolve=\"isConnected\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"3clFbF\" id=\"1xehy3SmaYV\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"1xehy3SmaYW\" role=\"3clFbG\">\n<node concept=\"2OqwBi\" id=\"1xehy3SmaYX\" role=\"2Oq$k0\">\n</node>\n</node>\n</node>\n- <node concept=\"3SKdUt\" id=\"e_REOZbrVL\" role=\"3cqZAp\">\n- <node concept=\"1PaTwC\" id=\"e_REOZbrVM\" role=\"1aUNEU\">\n- <node concept=\"3oM_SD\" id=\"e_REOZbrVN\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"TODO\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"e_REOZbrVO\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"verify\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"e_REOZbrVP\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"it\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"e_REOZbrVQ\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"is\" />\n+ <node concept=\"3cpWs6\" id=\"68ebMUMXx3P\" role=\"3cqZAp\">\n+ <node concept=\"1Wc70l\" id=\"68ebMUMXx3Q\" role=\"3cqZAk\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMXx3R\" role=\"3uHU7B\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMXwbj\" resolve=\"connected\" />\n</node>\n- <node concept=\"3oM_SD\" id=\"e_REOZbrVR\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"not\" />\n+ <node concept=\"3fqX7Q\" id=\"68ebMUMXx3S\" role=\"3uHU7w\">\n+ <node concept=\"2YIFZM\" id=\"68ebMUMXx3T\" role=\"3fr31v\">\n+ <ref role=\"1Pybhc\" to=\"csg2:i0AVAFXWm5\" resolve=\"ModelCloudImportUtils\" />\n+ <ref role=\"37wK5l\" to=\"csg2:68ebMUMLrp7\" resolve=\"containsModule\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMXx3U\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMXx3V\" role=\"2Oq$k0\" />\n+ <node concept=\"2BZ7hE\" id=\"68ebMUMXx3W\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"1xehy3Sk9_8\" resolve=\"treeInRepository\" />\n</node>\n- <node concept=\"3oM_SD\" id=\"e_REOZbrVS\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"already\" />\n</node>\n- <node concept=\"3oM_SD\" id=\"e_REOZbrVT\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"stored\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMXx3X\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMXx3Y\" role=\"2Oq$k0\" />\n+ <node concept=\"1DTwFV\" id=\"68ebMUMXx3Z\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"e_REOZbrU4\" resolve=\"module\" />\n</node>\n</node>\n</node>\n- <node concept=\"3cpWs6\" id=\"e_REOZbrVU\" role=\"3cqZAp\">\n- <node concept=\"2OqwBi\" id=\"1xehy3SneII\" role=\"3cqZAk\">\n- <node concept=\"2OqwBi\" id=\"1xehy3Sneao\" role=\"2Oq$k0\">\n- <node concept=\"2WthIp\" id=\"1xehy3Snear\" role=\"2Oq$k0\" />\n- <node concept=\"2BZ7hE\" id=\"1xehy3Sneat\" role=\"2OqNvi\">\n- <ref role=\"2WH_rO\" node=\"1xehy3Sk9_8\" resolve=\"treeInRepository\" />\n- </node>\n- </node>\n- <node concept=\"liA8E\" id=\"1xehy3SneOA\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"csg2:3i6diw3n0$X\" resolve=\"isConnected\" />\n</node>\n</node>\n</node>\n<node concept=\"2tJIrI\" id=\"5wf7OU9p9WK\" role=\"jymVt\" />\n<node concept=\"3Tm1VV\" id=\"5wf7OU9ni8B\" role=\"1B3o_S\" />\n</node>\n+ <node concept=\"sE7Ow\" id=\"68ebMUMVMvJ\">\n+ <property role=\"3GE5qa\" value=\"actions.physicalelements\" />\n+ <property role=\"TrG5h\" value=\"ModuleAlreadyOnCloud\" />\n+ <property role=\"2uzpH1\" value=\"Copy on Cloud & Sync\" />\n+ <node concept=\"2JriF1\" id=\"68ebMUMVMvK\" role=\"2JrayB\">\n+ <property role=\"TrG5h\" value=\"treeInRepository\" />\n+ <node concept=\"3Tm6S6\" id=\"68ebMUMVMvL\" role=\"1B3o_S\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMVMvM\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"csg2:3i6diw3mm_Q\" resolve=\"CloudRepository\" />\n+ </node>\n+ <node concept=\"2K2imR\" id=\"68ebMUMVMvN\" role=\"2K2Cet\">\n+ <node concept=\"3clFbS\" id=\"68ebMUMVMvO\" role=\"2VODD2\">\n+ <node concept=\"3clFbF\" id=\"68ebMUMVMvP\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMVMvQ\" role=\"3clFbG\">\n+ <node concept=\"2K3dj_\" id=\"68ebMUMVMvR\" role=\"2Oq$k0\" />\n+ <node concept=\"liA8E\" id=\"68ebMUMVMvS\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"csg2:16i93QEglbV\" resolve=\"presentation\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"1DS2jV\" id=\"68ebMUMVMvT\" role=\"1NuT2Z\">\n+ <property role=\"TrG5h\" value=\"project\" />\n+ <ref role=\"1DUlNI\" to=\"qkt:~CommonDataKeys.PROJECT\" resolve=\"PROJECT\" />\n+ <node concept=\"1oajcY\" id=\"68ebMUMVMvU\" role=\"1oa70y\" />\n+ </node>\n+ <node concept=\"1DS2jV\" id=\"68ebMUMVMvV\" role=\"1NuT2Z\">\n+ <property role=\"TrG5h\" value=\"module\" />\n+ <ref role=\"1DUlNI\" to=\"qq03:~MPSCommonDataKeys.MODULE\" resolve=\"MODULE\" />\n+ <node concept=\"1oajcY\" id=\"68ebMUMVMvW\" role=\"1oa70y\" />\n+ </node>\n+ <node concept=\"tnohg\" id=\"68ebMUMVMvX\" role=\"tncku\">\n+ <node concept=\"3clFbS\" id=\"68ebMUMVMvY\" role=\"2VODD2\">\n+ <node concept=\"3SKdUt\" id=\"68ebMUMVQ2A\" role=\"3cqZAp\">\n+ <node concept=\"1PaTwC\" id=\"68ebMUMVQ2B\" role=\"1aUNEU\">\n+ <node concept=\"3oM_SD\" id=\"68ebMUMVQ2C\" role=\"1PaTwD\">\n+ <property role=\"3oM_SC\" value=\"noop\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2ScWuX\" id=\"68ebMUMVMwa\" role=\"tmbBb\">\n+ <node concept=\"3clFbS\" id=\"68ebMUMVMwb\" role=\"2VODD2\">\n+ <node concept=\"3cpWs8\" id=\"68ebMUMVMwc\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"68ebMUMVMwd\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"connected\" />\n+ <node concept=\"10P_77\" id=\"68ebMUMVMwe\" role=\"1tU5fm\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMVMwf\" role=\"33vP2m\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMVMwg\" role=\"2Oq$k0\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMVMwh\" role=\"2Oq$k0\" />\n+ <node concept=\"2BZ7hE\" id=\"68ebMUMVMwi\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"68ebMUMVMvK\" resolve=\"treeInRepository\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMVMwj\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"csg2:3i6diw3n0$X\" resolve=\"isConnected\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbF\" id=\"68ebMUMVMwk\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMVMwl\" role=\"3clFbG\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMVMwm\" role=\"2Oq$k0\">\n+ <node concept=\"tl45R\" id=\"68ebMUMVMwn\" role=\"2Oq$k0\" />\n+ <node concept=\"liA8E\" id=\"68ebMUMVMwo\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"qkt:~AnActionEvent.getPresentation()\" resolve=\"getPresentation\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMVMwp\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"qkt:~Presentation.setText(java.lang.String)\" resolve=\"setText\" />\n+ <node concept=\"3cpWs3\" id=\"68ebMUMVP8G\" role=\"37wK5m\">\n+ <node concept=\"Xl_RD\" id=\"68ebMUMVP9c\" role=\"3uHU7w\">\n+ <property role=\"Xl_RC\" value=\" already in Cloud\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"68ebMUMXu0E\" role=\"3uHU7B\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMVMwt\" role=\"2Oq$k0\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMVMwu\" role=\"2Oq$k0\" />\n+ <node concept=\"1DTwFV\" id=\"68ebMUMXtLU\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"68ebMUMVMvV\" resolve=\"module\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMXuhJ\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"lui2:~SModule.getModuleName()\" resolve=\"getModuleName\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs6\" id=\"68ebMUMVMwx\" role=\"3cqZAp\">\n+ <node concept=\"1Wc70l\" id=\"68ebMUMVMwy\" role=\"3cqZAk\">\n+ <node concept=\"37vLTw\" id=\"68ebMUMVMwz\" role=\"3uHU7B\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMVMwd\" resolve=\"connected\" />\n+ </node>\n+ <node concept=\"2YIFZM\" id=\"68ebMUMVMw_\" role=\"3uHU7w\">\n+ <ref role=\"1Pybhc\" to=\"csg2:i0AVAFXWm5\" resolve=\"ModelCloudImportUtils\" />\n+ <ref role=\"37wK5l\" to=\"csg2:68ebMUMLrp7\" resolve=\"containsModule\" />\n+ <node concept=\"2OqwBi\" id=\"68ebMUMVMwA\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMVMwB\" role=\"2Oq$k0\" />\n+ <node concept=\"2BZ7hE\" id=\"68ebMUMVMwC\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"68ebMUMVMvK\" resolve=\"treeInRepository\" />\n+ </node>\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"68ebMUMVMwD\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMVMwE\" role=\"2Oq$k0\" />\n+ <node concept=\"1DTwFV\" id=\"68ebMUMVMwF\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"68ebMUMVMvV\" resolve=\"module\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n</model>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | cloud view: prevent double copy |
426,497 | 16.02.2022 14:52:17 | -3,600 | 6debdec2412dbb98d8f925cc9f557f6fadfd7132 | cloud view: progress when copy | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"diff": "<import index=\"hvt5\" ref=\"0a2651ab-f212-45c2-a2f0-343e76cbc26b/java:org.modelix.model(org.modelix.model.client/)\" />\n<import index=\"pjrh\" ref=\"6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.adapter(MPS.Core/)\" />\n<import index=\"yzht\" ref=\"498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:org.jetbrains.concurrency(MPS.IDEA/)\" />\n+ <import index=\"xygl\" ref=\"498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)\" />\n<import index=\"onis\" ref=\"87f4b21e-a3a5-459e-a54b-408fd9eb7350/java:gnu.trove.set(org.modelix.lib/)\" implicit=\"true\" />\n</imports>\n<registry>\n<node concept=\"3cpWs8\" id=\"13B7cI$78Co\" role=\"3cqZAp\">\n<node concept=\"3cpWsn\" id=\"13B7cI$78Cp\" role=\"3cpWs9\">\n<property role=\"TrG5h\" value=\"cloudModuleNode\" />\n+ <property role=\"3TUv4t\" value=\"true\" />\n<node concept=\"3uibUv\" id=\"13B7cI$78Cq\" role=\"1tU5fm\">\n<ref role=\"3uigEE\" to=\"jks5:~INode\" resolve=\"INode\" />\n</node>\n</node>\n</node>\n</node>\n+ <node concept=\"3clFbF\" id=\"68ebMUMZrzm\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMZJsk\" role=\"3clFbG\">\n+ <node concept=\"2ShNRf\" id=\"68ebMUMZrzi\" role=\"2Oq$k0\">\n+ <node concept=\"YeOm9\" id=\"68ebMUMZEtm\" role=\"2ShVmc\">\n+ <node concept=\"1Y3b0j\" id=\"68ebMUMZEtp\" role=\"YeSDq\">\n+ <property role=\"2bfB8j\" value=\"true\" />\n+ <ref role=\"1Y3XeK\" to=\"xygl:~Task$Modal\" resolve=\"Task.Modal\" />\n+ <ref role=\"37wK5l\" to=\"xygl:~Task$Modal.<init>(com.intellij.openapi.project.Project,java.lang.String,boolean)\" resolve=\"Task.Modal\" />\n+ <node concept=\"3Tm1VV\" id=\"68ebMUMZEtq\" role=\"1B3o_S\" />\n+ <node concept=\"3clFb_\" id=\"68ebMUMZEtx\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"run\" />\n+ <node concept=\"3Tm1VV\" id=\"68ebMUMZEty\" role=\"1B3o_S\" />\n+ <node concept=\"3cqZAl\" id=\"68ebMUMZEt$\" role=\"3clF45\" />\n+ <node concept=\"37vLTG\" id=\"68ebMUMZEt_\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"indicator\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMZEtA\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"xygl:~ProgressIndicator\" resolve=\"ProgressIndicator\" />\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"68ebMUMZEtB\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n+ </node>\n+ <node concept=\"3clFbS\" id=\"68ebMUMZEtC\" role=\"3clF47\">\n<node concept=\"3SKdUt\" id=\"aVVeoQuTlD\" role=\"3cqZAp\">\n<node concept=\"1PaTwC\" id=\"aVVeoQuTlE\" role=\"1aUNEU\">\n<node concept=\"3oM_SD\" id=\"aVVeoQuTlF\" role=\"1PaTwD\">\n<ref role=\"3cqZAo\" node=\"i0AVAFY84T\" resolve=\"module\" />\n</node>\n<node concept=\"10Nm6u\" id=\"6dTx9S5tuRI\" role=\"37wK5m\" />\n- <node concept=\"10Nm6u\" id=\"3CCis83AAAu\" role=\"37wK5m\" />\n+ <node concept=\"2ShNRf\" id=\"68ebMUMZMMY\" role=\"37wK5m\">\n+ <node concept=\"1pGfFk\" id=\"68ebMUMZQBz\" role=\"2ShVmc\">\n+ <ref role=\"37wK5l\" to=\"mk8z:~ProgressMonitorAdapter.<init>(com.intellij.openapi.progress.ProgressIndicator)\" resolve=\"ProgressMonitorAdapter\" />\n+ <node concept=\"37vLTw\" id=\"68ebMUMZSek\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMZEt_\" resolve=\"indicator\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"68ebMUMZEtE\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"wyt6:~Override\" resolve=\"Override\" />\n+ </node>\n+ </node>\n+ <node concept=\"37vLTw\" id=\"68ebMUMZHke\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMZF8T\" resolve=\"project\" />\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"68ebMUMZIeh\" role=\"37wK5m\">\n+ <property role=\"Xl_RC\" value=\"\" />\n+ </node>\n+ <node concept=\"3clFbT\" id=\"68ebMUMZJ6H\" role=\"37wK5m\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMZK0u\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"xygl:~Task.queue()\" resolve=\"queue\" />\n+ </node>\n</node>\n</node>\n<node concept=\"3cpWs6\" id=\"6dTx9S5vRzl\" role=\"3cqZAp\">\n</node>\n<node concept=\"37vLTG\" id=\"i0AVAFY89w\" role=\"3clF46\">\n<property role=\"TrG5h\" value=\"treeInRepository\" />\n+ <property role=\"3TUv4t\" value=\"true\" />\n<node concept=\"3uibUv\" id=\"5rz8NqPQ1qx\" role=\"1tU5fm\">\n<ref role=\"3uigEE\" node=\"3i6diw3mm_Q\" resolve=\"CloudRepository\" />\n</node>\n</node>\n<node concept=\"37vLTG\" id=\"i0AVAFY84T\" role=\"3clF46\">\n<property role=\"TrG5h\" value=\"module\" />\n+ <property role=\"3TUv4t\" value=\"true\" />\n<node concept=\"3uibUv\" id=\"i0AVAFYANg\" role=\"1tU5fm\">\n<ref role=\"3uigEE\" to=\"lui2:~SModule\" resolve=\"SModule\" />\n</node>\n</node>\n+ <node concept=\"37vLTG\" id=\"68ebMUMZF8T\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"project\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMZF_l\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"4nm9:~Project\" resolve=\"Project\" />\n+ </node>\n+ </node>\n<node concept=\"3uibUv\" id=\"6dTx9S5vPYY\" role=\"3clF45\">\n<ref role=\"3uigEE\" to=\"jks5:~INode\" resolve=\"INode\" />\n</node>\n<node concept=\"2YIFZL\" id=\"74bn2Kw_Uv1\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"copyAndSyncInModelixAsIndependentModule\" />\n<node concept=\"3clFbS\" id=\"5i$4SBK0N49\" role=\"3clF47\">\n+ <node concept=\"3clFbH\" id=\"68ebMUMZcJY\" role=\"3cqZAp\" />\n<node concept=\"3SKdUt\" id=\"i0AVAFXKAj\" role=\"3cqZAp\">\n<node concept=\"1PaTwC\" id=\"i0AVAFXKAk\" role=\"1aUNEU\">\n<node concept=\"3oM_SD\" id=\"i0AVAFXKAl\" role=\"1PaTwD\">\n<node concept=\"37vLTw\" id=\"5i$4SBK0Tf9\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"5i$4SBK0RVo\" resolve=\"module\" />\n</node>\n+ <node concept=\"37vLTw\" id=\"68ebMUMZTfU\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"5i$4SBK0Tp7\" resolve=\"mpsProject\" />\n+ </node>\n</node>\n</node>\n</node>\n</node>\n</node>\n<node concept=\"37vLTw\" id=\"3CCis83DQCl\" role=\"37vLTJ\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n</node>\n</node>\n</node>\n<node concept=\"3clFbC\" id=\"3CCis83DPZC\" role=\"3clFbw\">\n<node concept=\"10Nm6u\" id=\"3CCis83DQbR\" role=\"3uHU7w\" />\n<node concept=\"37vLTw\" id=\"3CCis83DPwg\" role=\"3uHU7B\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n</node>\n</node>\n</node>\n<node concept=\"3clFbF\" id=\"3CCis83BON$\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"3CCis83BP6G\" role=\"3clFbG\">\n<node concept=\"37vLTw\" id=\"3CCis83BZ4M\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n</node>\n<node concept=\"liA8E\" id=\"3CCis83BPd7\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"yyf4:~ProgressMonitor.start(java.lang.String,int)\" resolve=\"start\" />\n</node>\n<node concept=\"2OqwBi\" id=\"3CCis83DCr0\" role=\"3clFbw\">\n<node concept=\"37vLTw\" id=\"3CCis83DC7X\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n</node>\n<node concept=\"liA8E\" id=\"3CCis83DCAp\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"yyf4:~ProgressMonitor.isCanceled()\" resolve=\"isCanceled\" />\n</node>\n<node concept=\"2OqwBi\" id=\"3CCis83DLew\" role=\"33vP2m\">\n<node concept=\"37vLTw\" id=\"3CCis83DLex\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n</node>\n<node concept=\"liA8E\" id=\"3CCis83DLey\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"yyf4:~ProgressMonitor.subTask(int)\" resolve=\"subTask\" />\n<node concept=\"3clFbF\" id=\"3CCis83E1QX\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"3CCis83E2jc\" role=\"3clFbG\">\n<node concept=\"37vLTw\" id=\"3CCis83E1QV\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"proygress\" />\n+ <ref role=\"3cqZAo\" node=\"3CCis83$Os8\" resolve=\"progress\" />\n</node>\n<node concept=\"liA8E\" id=\"3CCis83E2uK\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"yyf4:~ProgressMonitor.done()\" resolve=\"done\" />\n</node>\n</node>\n<node concept=\"37vLTG\" id=\"3CCis83$Os8\" role=\"3clF46\">\n- <property role=\"TrG5h\" value=\"proygress\" />\n+ <property role=\"TrG5h\" value=\"progress\" />\n<node concept=\"3uibUv\" id=\"3CCis83BYrs\" role=\"1tU5fm\">\n<ref role=\"3uigEE\" to=\"yyf4:~ProgressMonitor\" resolve=\"ProgressMonitor\" />\n</node>\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "<ref role=\"2WH_rO\" node=\"e_REOZbrU4\" resolve=\"module\" />\n</node>\n</node>\n+ <node concept=\"2OqwBi\" id=\"68ebMUMZU1E\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"68ebMUMZTJq\" role=\"2Oq$k0\" />\n+ <node concept=\"1DTwFV\" id=\"68ebMUMZUKt\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"e_REOZbrU2\" resolve=\"project\" />\n+ </node>\n+ </node>\n</node>\n</node>\n</node>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | cloud view: progress when copy |
426,497 | 16.02.2022 15:37:30 | -3,600 | 8bba24daecd9b57d6da7731dda6c38cd9ed62a78 | use sets in persistent configuration to avoid double mapping or binding
Reworked some of the null safety with annotations in PersistenBindingConfiguration | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "</node>\n</node>\n<node concept=\"liA8E\" id=\"6JwgQ7URQ8x\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.isEmpty()\" resolve=\"isEmpty\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.isEmpty()\" resolve=\"isEmpty\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"6JwgQ7URU1M\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.isEmpty()\" resolve=\"isEmpty\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.isEmpty()\" resolve=\"isEmpty\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"6JwgQ7URWTK\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.isEmpty()\" resolve=\"isEmpty\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.isEmpty()\" resolve=\"isEmpty\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"6JwgQ7US05f\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.isEmpty()\" resolve=\"isEmpty\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.isEmpty()\" resolve=\"isEmpty\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"6JwgQ7UShNZ\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.clear()\" resolve=\"clear\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.clear()\" resolve=\"clear\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"6JwgQ7USimu\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.clear()\" resolve=\"clear\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.clear()\" resolve=\"clear\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"6JwgQ7USit_\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.clear()\" resolve=\"clear\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.clear()\" resolve=\"clear\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"6JwgQ7USh9M\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.clear()\" resolve=\"clear\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.clear()\" resolve=\"clear\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n</node>\n- <node concept=\"3clFbJ\" id=\"2DojN6AJwkt\" role=\"3cqZAp\">\n- <node concept=\"3clFbS\" id=\"2DojN6AJwkv\" role=\"3clFbx\">\n- <node concept=\"YS8fn\" id=\"2DojN6AJx2k\" role=\"3cqZAp\">\n- <node concept=\"2ShNRf\" id=\"2DojN6AJx8v\" role=\"YScLw\">\n- <node concept=\"1pGfFk\" id=\"2DojN6AJyTD\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"wyt6:~IllegalStateException.<init>(java.lang.String)\" resolve=\"IllegalStateException\" />\n- <node concept=\"Xl_RD\" id=\"2DojN6AJz7D\" role=\"37wK5m\">\n- <property role=\"Xl_RC\" value=\"state should not be null\" />\n- </node>\n- </node>\n- </node>\n- </node>\n- </node>\n- <node concept=\"3clFbC\" id=\"2DojN6AJwHm\" role=\"3clFbw\">\n- <node concept=\"10Nm6u\" id=\"2DojN6AJwSh\" role=\"3uHU7w\" />\n- <node concept=\"37vLTw\" id=\"2DojN6AJwr0\" role=\"3uHU7B\">\n- <ref role=\"3cqZAo\" node=\"1xehy3SrdcA\" resolve=\"state\" />\n- </node>\n- </node>\n- </node>\n<node concept=\"3clFbF\" id=\"1xehy3SreFu\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"1xehy3Srf9B\" role=\"3clFbG\">\n<node concept=\"37vLTw\" id=\"1xehy3SreFs\" role=\"2Oq$k0\">\n</node>\n</node>\n<node concept=\"liA8E\" id=\"1xehy3SribM\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.add(java.lang.Object)\" resolve=\"add\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.add(java.lang.Object)\" resolve=\"add\" />\n<node concept=\"2OqwBi\" id=\"1xehy3SribN\" role=\"37wK5m\">\n<node concept=\"37vLTw\" id=\"1xehy3SribO\" role=\"2Oq$k0\">\n<ref role=\"3cqZAo\" node=\"1xehy3SoXrF\" resolve=\"modelServer\" />\n</node>\n</node>\n<node concept=\"liA8E\" id=\"5RwL1nyisYx\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.contains(java.lang.Object)\" resolve=\"contains\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.contains(java.lang.Object)\" resolve=\"contains\" />\n<node concept=\"37vLTw\" id=\"5RwL1nyitQS\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"5RwL1nyic4c\" resolve=\"url\" />\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"5RwL1nyhD9x\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.add(java.lang.Object)\" resolve=\"add\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.add(java.lang.Object)\" resolve=\"add\" />\n<node concept=\"2OqwBi\" id=\"5RwL1nyhD9y\" role=\"37wK5m\">\n<node concept=\"37vLTw\" id=\"5RwL1nyhD9z\" role=\"2Oq$k0\">\n<ref role=\"3cqZAo\" node=\"5RwL1nyhD9A\" resolve=\"modelServer\" />\n</node>\n</node>\n<node concept=\"liA8E\" id=\"7jRNnvCcvqG\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.add(java.lang.Object)\" resolve=\"add\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.add(java.lang.Object)\" resolve=\"add\" />\n<node concept=\"3cpWs3\" id=\"7jRNnvCcvqH\" role=\"37wK5m\">\n<node concept=\"37vLTw\" id=\"7jRNnvCcvqI\" role=\"3uHU7w\">\n<ref role=\"3cqZAo\" node=\"7jRNnvCcvqs\" resolve=\"moduleName\" />\n</node>\n</node>\n<node concept=\"liA8E\" id=\"$SKJo8t_Au\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.remove(java.lang.Object)\" resolve=\"remove\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.remove(java.lang.Object)\" resolve=\"remove\" />\n<node concept=\"37vLTw\" id=\"$SKJo8tAv4\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"$SKJo8txpd\" resolve=\"transientModuleDesc\" />\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"2zfU5FnWxW3\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.remove(java.lang.Object)\" resolve=\"remove\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.remove(java.lang.Object)\" resolve=\"remove\" />\n<node concept=\"37vLTw\" id=\"2zfU5FnWxW4\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"2zfU5FnWxVP\" resolve=\"transientModuleDesc\" />\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"2zfU5FnWU2_\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.remove(java.lang.Object)\" resolve=\"remove\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.remove(java.lang.Object)\" resolve=\"remove\" />\n<node concept=\"37vLTw\" id=\"2zfU5FnWU2A\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"2zfU5FnWU2n\" resolve=\"moduleDesc\" />\n</node>\n</node>\n</node>\n<node concept=\"liA8E\" id=\"7pEM25OpZyx\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.add(java.lang.Object)\" resolve=\"add\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.add(java.lang.Object)\" resolve=\"add\" />\n<node concept=\"2OqwBi\" id=\"3i6diw3nl7P\" role=\"37wK5m\">\n<node concept=\"37vLTw\" id=\"3i6diw3nl7Q\" role=\"2Oq$k0\">\n<ref role=\"3cqZAo\" node=\"7pEM25OpFiM\" resolve=\"repositoryInModelServer\" />\n</node>\n</node>\n<node concept=\"liA8E\" id=\"1xehy3Srr$X\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.add(java.lang.Object)\" resolve=\"add\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.add(java.lang.Object)\" resolve=\"add\" />\n<node concept=\"3cpWs3\" id=\"1xehy3Srr$Y\" role=\"37wK5m\">\n<node concept=\"37vLTw\" id=\"1xehy3Srr$Z\" role=\"3uHU7w\">\n<ref role=\"3cqZAo\" node=\"1xehy3Srr$J\" resolve=\"moduleName\" />\n</node>\n</node>\n<node concept=\"3clFbS\" id=\"5isGFNR_0BK\" role=\"1bW5cS\">\n- <node concept=\"3clFbJ\" id=\"2DojN6AJs0f\" role=\"3cqZAp\">\n- <node concept=\"3clFbS\" id=\"2DojN6AJs0h\" role=\"3clFbx\">\n- <node concept=\"YS8fn\" id=\"2DojN6AJtbr\" role=\"3cqZAp\">\n- <node concept=\"2ShNRf\" id=\"2DojN6AJto1\" role=\"YScLw\">\n- <node concept=\"1pGfFk\" id=\"2DojN6AJvhq\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"wyt6:~IllegalStateException.<init>(java.lang.String)\" resolve=\"IllegalStateException\" />\n- <node concept=\"Xl_RD\" id=\"2DojN6AJvG_\" role=\"37wK5m\">\n- <property role=\"Xl_RC\" value=\"state should not be null\" />\n- </node>\n- </node>\n- </node>\n- </node>\n- </node>\n- <node concept=\"3clFbC\" id=\"2DojN6AJssa\" role=\"3clFbw\">\n- <node concept=\"10Nm6u\" id=\"2DojN6AJsHe\" role=\"3uHU7w\" />\n- <node concept=\"37vLTw\" id=\"2DojN6AJs79\" role=\"3uHU7B\">\n- <ref role=\"3cqZAo\" node=\"5isGFNR_0BI\" resolve=\"state\" />\n- </node>\n- </node>\n- </node>\n<node concept=\"3clFbF\" id=\"5isGFNR_0BL\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"5isGFNR_0BM\" role=\"3clFbG\">\n<node concept=\"liA8E\" id=\"5isGFNR_0BQ\" role=\"2OqNvi\">\n</node>\n</node>\n<node concept=\"liA8E\" id=\"5isGFNR_0C8\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.add(java.lang.Object)\" resolve=\"add\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.add(java.lang.Object)\" resolve=\"add\" />\n<node concept=\"3cpWs3\" id=\"5isGFNR_0C9\" role=\"37wK5m\">\n<node concept=\"37vLTw\" id=\"5isGFNR_0Ca\" role=\"3uHU7w\">\n<ref role=\"3cqZAo\" node=\"5isGFNR_0BU\" resolve=\"moduleName\" />\n</node>\n<node concept=\"3clFbJ\" id=\"1xehy3SoS98\" role=\"3cqZAp\">\n<node concept=\"3clFbS\" id=\"1xehy3SoS99\" role=\"3clFbx\">\n- <node concept=\"YS8fn\" id=\"1xehy3SoS9a\" role=\"3cqZAp\">\n- <node concept=\"2ShNRf\" id=\"1xehy3SoS9b\" role=\"YScLw\">\n+ <node concept=\"RRSsy\" id=\"2RZSADNMKXS\" role=\"3cqZAp\">\n+ <property role=\"RRSoG\" value=\"gZ5eI4k/fatal\" />\n+ <node concept=\"2ShNRf\" id=\"1xehy3SoS9b\" role=\"RRSow\">\n<node concept=\"1pGfFk\" id=\"1xehy3SoS9c\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"wyt6:~RuntimeException.<init>(java.lang.String)\" resolve=\"RuntimeException\" />\n- <node concept=\"3cpWs3\" id=\"1xehy3SoS9d\" role=\"37wK5m\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~RuntimeException.<init>()\" resolve=\"RuntimeException\" />\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs3\" id=\"1xehy3SoS9d\" role=\"RRSoy\">\n<node concept=\"2GrUjf\" id=\"1xehy3SoS9e\" role=\"3uHU7w\">\n<ref role=\"2Gs0qQ\" node=\"1xehy3SoS8Y\" resolve=\"moduleStr\" />\n</node>\n</node>\n</node>\n</node>\n- </node>\n- </node>\n+ <node concept=\"3N13vt\" id=\"2RZSADNMPKm\" role=\"3cqZAp\" />\n</node>\n<node concept=\"3y3z36\" id=\"1xehy3SoS9g\" role=\"3clFbw\">\n<node concept=\"3cmrfG\" id=\"1xehy3SoS9h\" role=\"3uHU7w\">\n</node>\n</node>\n</node>\n- <node concept=\"abc8K\" id=\"6JwgQ7UWWiK\" role=\"3cqZAp\">\n- <node concept=\"Xl_RD\" id=\"6JwgQ7UWWiL\" role=\"abp_N\">\n- <property role=\"Xl_RC\" value=\"bindTransientModulesAsSpecifiedInPersistedConfiguration \" />\n- </node>\n- <node concept=\"2GrUjf\" id=\"6JwgQ7UWWJO\" role=\"abp_N\">\n- <ref role=\"2Gs0qQ\" node=\"1xehy3SoS8Y\" resolve=\"moduleStr\" />\n- </node>\n- </node>\n<node concept=\"3clFbH\" id=\"5rz8NqPRLtL\" role=\"3cqZAp\" />\n<node concept=\"3clFbF\" id=\"1xehy3SoS9s\" role=\"3cqZAp\">\n<node concept=\"1rXfSq\" id=\"1xehy3SoS9t\" role=\"3clFbG\">\n</node>\n<node concept=\"3clFbJ\" id=\"nzqvuXQQPf\" role=\"3cqZAp\">\n<node concept=\"3clFbS\" id=\"nzqvuXQQPg\" role=\"3clFbx\">\n- <node concept=\"YS8fn\" id=\"nzqvuXQQPh\" role=\"3cqZAp\">\n- <node concept=\"2ShNRf\" id=\"nzqvuXQQPi\" role=\"YScLw\">\n- <node concept=\"1pGfFk\" id=\"nzqvuXQQPj\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"wyt6:~RuntimeException.<init>(java.lang.String)\" resolve=\"RuntimeException\" />\n- <node concept=\"3cpWs3\" id=\"nzqvuXQQPk\" role=\"37wK5m\">\n+ <node concept=\"RRSsy\" id=\"2RZSADNMRQ4\" role=\"3cqZAp\">\n+ <property role=\"RRSoG\" value=\"gZ5eI4k/fatal\" />\n+ <node concept=\"3cpWs3\" id=\"nzqvuXQQPk\" role=\"RRSoy\">\n<node concept=\"2GrUjf\" id=\"nzqvuXQQPl\" role=\"3uHU7w\">\n<ref role=\"2Gs0qQ\" node=\"nzqvuXQQP5\" resolve=\"moduleStr\" />\n</node>\n<property role=\"Xl_RC\" value=\"The configuration of Modelix is not correct, please check .mps/cloudResources.xml. Module entry: \" />\n</node>\n</node>\n+ <node concept=\"2ShNRf\" id=\"nzqvuXQQPi\" role=\"RRSow\">\n+ <node concept=\"1pGfFk\" id=\"nzqvuXQQPj\" role=\"2ShVmc\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~RuntimeException.<init>()\" resolve=\"RuntimeException\" />\n</node>\n</node>\n</node>\n+ <node concept=\"3N13vt\" id=\"2RZSADNMUKV\" role=\"3cqZAp\" />\n</node>\n<node concept=\"3y3z36\" id=\"nzqvuXQQPn\" role=\"3clFbw\">\n<node concept=\"3cmrfG\" id=\"nzqvuXQQPo\" role=\"3uHU7w\">\n</node>\n</node>\n</node>\n- <node concept=\"abc8K\" id=\"6JwgQ7UWXB1\" role=\"3cqZAp\">\n- <node concept=\"Xl_RD\" id=\"6JwgQ7UWXB2\" role=\"abp_N\">\n- <property role=\"Xl_RC\" value=\"bindMappedModulesAsSpecifiedInPersistedConfiguration \" />\n- </node>\n- <node concept=\"2GrUjf\" id=\"6JwgQ7UWXB3\" role=\"abp_N\">\n- <ref role=\"2Gs0qQ\" node=\"nzqvuXQQP5\" resolve=\"moduleStr\" />\n- </node>\n- </node>\n<node concept=\"3clFbH\" id=\"nzqvuXQQPG\" role=\"3cqZAp\" />\n<node concept=\"3clFbF\" id=\"nzqvuXQQPH\" role=\"3cqZAp\">\n<node concept=\"1rXfSq\" id=\"nzqvuXQQPI\" role=\"3clFbG\">\n<property role=\"TrG5h\" value=\"modelServers\" />\n<node concept=\"3Tm1VV\" id=\"7xblg8lmona\" role=\"1B3o_S\" />\n<node concept=\"3uibUv\" id=\"7f6Tb6nwIAF\" role=\"1tU5fm\">\n- <ref role=\"3uigEE\" to=\"33ny:~List\" resolve=\"List\" />\n+ <ref role=\"3uigEE\" to=\"33ny:~Set\" resolve=\"Set\" />\n<node concept=\"3uibUv\" id=\"7f6Tb6nwJeg\" role=\"11_B2D\">\n<ref role=\"3uigEE\" to=\"wyt6:~String\" resolve=\"String\" />\n</node>\n</node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADNSLGy\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n</node>\n<node concept=\"312cEg\" id=\"7xblg8lmp1Z\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"transientProjects\" />\n<node concept=\"3Tm1VV\" id=\"7xblg8lmoOl\" role=\"1B3o_S\" />\n<node concept=\"3uibUv\" id=\"7f6Tb6nwJK5\" role=\"1tU5fm\">\n- <ref role=\"3uigEE\" to=\"33ny:~List\" resolve=\"List\" />\n+ <ref role=\"3uigEE\" to=\"33ny:~Set\" resolve=\"Set\" />\n<node concept=\"3uibUv\" id=\"7f6Tb6nwJK6\" role=\"11_B2D\">\n<ref role=\"3uigEE\" to=\"wyt6:~String\" resolve=\"String\" />\n</node>\n</node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADNSNMD\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n</node>\n<node concept=\"312cEg\" id=\"6UFKywMPOVi\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"transientModules\" />\n<node concept=\"3Tm1VV\" id=\"6UFKywMPMF3\" role=\"1B3o_S\" />\n<node concept=\"3uibUv\" id=\"6UFKywMPODn\" role=\"1tU5fm\">\n- <ref role=\"3uigEE\" to=\"33ny:~List\" resolve=\"List\" />\n+ <ref role=\"3uigEE\" to=\"33ny:~Set\" resolve=\"Set\" />\n<node concept=\"3uibUv\" id=\"6UFKywMPOUS\" role=\"11_B2D\">\n<ref role=\"3uigEE\" to=\"wyt6:~String\" resolve=\"String\" />\n</node>\n</node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADNSPC1\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n</node>\n<node concept=\"312cEg\" id=\"5isGFNR_amH\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"mappedModules\" />\n<node concept=\"3Tm1VV\" id=\"5isGFNR_amI\" role=\"1B3o_S\" />\n<node concept=\"3uibUv\" id=\"5isGFNR_amJ\" role=\"1tU5fm\">\n- <ref role=\"3uigEE\" to=\"33ny:~List\" resolve=\"List\" />\n+ <ref role=\"3uigEE\" to=\"33ny:~Set\" resolve=\"Set\" />\n<node concept=\"3uibUv\" id=\"5isGFNR_amK\" role=\"11_B2D\">\n<ref role=\"3uigEE\" to=\"wyt6:~String\" resolve=\"String\" />\n</node>\n</node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADNSQR4\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n</node>\n<node concept=\"2tJIrI\" id=\"6UFKywMPP1b\" role=\"jymVt\" />\n<node concept=\"3clFbW\" id=\"6UFKywMPPmk\" role=\"jymVt\">\n<node concept=\"37vLTI\" id=\"6UFKywMPQVh\" role=\"3clFbG\">\n<node concept=\"2ShNRf\" id=\"6UFKywMPRwO\" role=\"37vLTx\">\n<node concept=\"1pGfFk\" id=\"6UFKywMPYTM\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"33ny:~LinkedList.<init>()\" resolve=\"LinkedList\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~LinkedHashSet.<init>()\" resolve=\"LinkedHashSet\" />\n<node concept=\"3uibUv\" id=\"6UFKywMPZEl\" role=\"1pMfVU\">\n<ref role=\"3uigEE\" to=\"wyt6:~String\" resolve=\"String\" />\n</node>\n<node concept=\"37vLTI\" id=\"7f6Tb6nwK3r\" role=\"3clFbG\">\n<node concept=\"2ShNRf\" id=\"7f6Tb6nwK3s\" role=\"37vLTx\">\n<node concept=\"1pGfFk\" id=\"7f6Tb6nwK3t\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"33ny:~LinkedList.<init>()\" resolve=\"LinkedList\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~LinkedHashSet.<init>()\" resolve=\"LinkedHashSet\" />\n<node concept=\"3uibUv\" id=\"7f6Tb6nwK3u\" role=\"1pMfVU\">\n<ref role=\"3uigEE\" to=\"wyt6:~String\" resolve=\"String\" />\n</node>\n<node concept=\"37vLTI\" id=\"7f6Tb6nwK3J\" role=\"3clFbG\">\n<node concept=\"2ShNRf\" id=\"7f6Tb6nwK3K\" role=\"37vLTx\">\n<node concept=\"1pGfFk\" id=\"7f6Tb6nwK3L\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"33ny:~LinkedList.<init>()\" resolve=\"LinkedList\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~LinkedHashSet.<init>()\" resolve=\"LinkedHashSet\" />\n<node concept=\"3uibUv\" id=\"7f6Tb6nwK3M\" role=\"1pMfVU\">\n<ref role=\"3uigEE\" to=\"wyt6:~String\" resolve=\"String\" />\n</node>\n<node concept=\"37vLTI\" id=\"1PLmMHCHLq7\" role=\"3clFbG\">\n<node concept=\"2ShNRf\" id=\"1PLmMHCHM2Y\" role=\"37vLTx\">\n<node concept=\"1pGfFk\" id=\"1PLmMHCI1_V\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"33ny:~LinkedList.<init>()\" resolve=\"LinkedList\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~LinkedHashSet.<init>()\" resolve=\"LinkedHashSet\" />\n<node concept=\"3uibUv\" id=\"1PLmMHCI2ny\" role=\"1pMfVU\">\n<ref role=\"3uigEE\" to=\"wyt6:~String\" resolve=\"String\" />\n</node>\n<ref role=\"3cqZAo\" node=\"7xblg8lmo$P\" resolve=\"modelServers\" />\n</node>\n<node concept=\"liA8E\" id=\"6UFKywMQdxO\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.hashCode()\" resolve=\"hashCode\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.hashCode()\" resolve=\"hashCode\" />\n</node>\n</node>\n<node concept=\"3cmrfG\" id=\"6UFKywMQaD5\" role=\"3uHU7B\">\n<ref role=\"3cqZAo\" node=\"7xblg8lmp1Z\" resolve=\"transientProjects\" />\n</node>\n<node concept=\"liA8E\" id=\"6UFKywMQdzg\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.hashCode()\" resolve=\"hashCode\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.hashCode()\" resolve=\"hashCode\" />\n</node>\n</node>\n<node concept=\"3cmrfG\" id=\"6UFKywMQdzh\" role=\"3uHU7B\">\n<ref role=\"3cqZAo\" node=\"6UFKywMPOVi\" resolve=\"transientModules\" />\n</node>\n<node concept=\"liA8E\" id=\"6UFKywMQmdH\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.hashCode()\" resolve=\"hashCode\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.hashCode()\" resolve=\"hashCode\" />\n</node>\n</node>\n<node concept=\"3cmrfG\" id=\"6UFKywMQi_q\" role=\"3uHU7B\">\n<ref role=\"3cqZAo\" node=\"5isGFNR_amH\" resolve=\"mappedModules\" />\n</node>\n<node concept=\"liA8E\" id=\"1PLmMHCI5jr\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"33ny:~List.hashCode()\" resolve=\"hashCode\" />\n+ <ref role=\"37wK5l\" to=\"33ny:~Set.hashCode()\" resolve=\"hashCode\" />\n</node>\n</node>\n<node concept=\"3cmrfG\" id=\"1PLmMHCI5js\" role=\"3uHU7B\">\n<ref role=\"37wK5l\" node=\"6UFKywMPPmk\" resolve=\"CloudResourcesConfigurationComponent.State\" />\n</node>\n</node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADNMW_t\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n</node>\n<node concept=\"2tJIrI\" id=\"7xblg8lmne7\" role=\"jymVt\" />\n<node concept=\"3Tm1VV\" id=\"7xblg8lmms8\" role=\"1B3o_S\" />\n<node concept=\"3clFb_\" id=\"7xblg8lmnRn\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"getState\" />\n<node concept=\"3Tm1VV\" id=\"7xblg8lmnRo\" role=\"1B3o_S\" />\n- <node concept=\"2AHcQZ\" id=\"7xblg8lmnRq\" role=\"2AJF6D\">\n- <ref role=\"2AI5Lk\" to=\"mhfm:~Nullable\" resolve=\"Nullable\" />\n- </node>\n<node concept=\"3uibUv\" id=\"7xblg8lmnRs\" role=\"3clF45\">\n<ref role=\"3uigEE\" node=\"7xblg8lmnwf\" resolve=\"CloudResourcesConfigurationComponent.State\" />\n</node>\n<node concept=\"2AHcQZ\" id=\"7xblg8lmnRu\" role=\"2AJF6D\">\n<ref role=\"2AI5Lk\" to=\"wyt6:~Override\" resolve=\"Override\" />\n</node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADNSS70\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n</node>\n<node concept=\"3clFb_\" id=\"7xblg8lmnRv\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"loadState\" />\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | use sets in persistent configuration to avoid double mapping or binding
Reworked some of the null safety with annotations in PersistenBindingConfiguration |
426,497 | 16.02.2022 16:29:02 | -3,600 | 15fc57a5638e544b88879236c5c8e3e47997b05b | integration test: fix compilation error | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.integrationtests/models/org.modelix.integrationtests.mps",
"new_path": "mps/org.modelix.integrationtests/models/org.modelix.integrationtests.mps",
"diff": "<node concept=\"37vLTw\" id=\"11vVX88rM8S\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"11vVX88rLeR\" resolve=\"simpleSolution1\" />\n</node>\n+ <node concept=\"2YIFZM\" id=\"2RZSADO2Pt$\" role=\"37wK5m\">\n+ <ref role=\"37wK5l\" to=\"alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)\" resolve=\"toIdeaProject\" />\n+ <ref role=\"1Pybhc\" to=\"alof:~ProjectHelper\" resolve=\"ProjectHelper\" />\n+ <node concept=\"37vLTw\" id=\"2RZSADO2PBE\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"11vVX88rChQ\" resolve=\"mpsProject\" />\n+ </node>\n+ </node>\n</node>\n</node>\n</node>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | integration test: fix compilation error |
426,497 | 16.02.2022 17:18:36 | -3,600 | 56a1ae1ddc2119fc96fb5296e1f8bf13b70e1cb6 | integration test: print stacktrace | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.integrationtests/models/org.modelix.integrationtests.mps",
"new_path": "mps/org.modelix.integrationtests/models/org.modelix.integrationtests.mps",
"diff": "<node concept=\"3clFbS\" id=\"5yNJPA6bCq5\" role=\"9aQI4\">\n<node concept=\"abc8K\" id=\"5yNJPA6bCwX\" role=\"3cqZAp\">\n<node concept=\"Xl_RD\" id=\"5yNJPA6bCBO\" role=\"abp_N\">\n- <property role=\"Xl_RC\" value=\" KO: \" />\n+ <property role=\"Xl_RC\" value=\" FAILED: \" />\n</node>\n- <node concept=\"2OqwBi\" id=\"5yNJPA6bDxm\" role=\"abp_N\">\n- <node concept=\"37vLTw\" id=\"5yNJPA6bDmS\" role=\"2Oq$k0\">\n+ <node concept=\"2OqwBi\" id=\"2RZSADO3V03\" role=\"abp_N\">\n+ <node concept=\"37vLTw\" id=\"2RZSADO3UvJ\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"5yNJPA6bxLc\" resolve=\"it\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"2RZSADO3VIu\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" node=\"5yNJPA6tlbs\" resolve=\"testName\" />\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"2RZSADO3WuN\" role=\"abp_N\">\n+ <property role=\"Xl_RC\" value=\"\\n\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"2RZSADO42J9\" role=\"abp_N\">\n+ <node concept=\"37vLTw\" id=\"2RZSADO42cq\" role=\"2Oq$k0\">\n<ref role=\"3cqZAo\" node=\"5yNJPA6b$Zr\" resolve=\"testResult\" />\n</node>\n- <node concept=\"liA8E\" id=\"5yNJPA6bDEx\" role=\"2OqNvi\">\n+ <node concept=\"liA8E\" id=\"2RZSADO46x6\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" node=\"5yNJPA6bAJu\" resolve=\"getError\" />\n</node>\n</node>\n</node>\n+ <node concept=\"3clFbF\" id=\"2RZSADO47pq\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"2RZSADO4aXh\" role=\"3clFbG\">\n+ <node concept=\"2OqwBi\" id=\"2RZSADO49Wd\" role=\"2Oq$k0\">\n+ <node concept=\"37vLTw\" id=\"2RZSADO49rA\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"5yNJPA6b$Zr\" resolve=\"testResult\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"2RZSADO4atk\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" node=\"2RZSADO3MaL\" resolve=\"getThorwable\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"2RZSADO4by$\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Throwable.printStackTrace()\" resolve=\"printStackTrace\" />\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"3clFbF\" id=\"5yNJPA6bE0g\" role=\"3cqZAp\">\n<node concept=\"37vLTI\" id=\"5yNJPA6bElV\" role=\"3clFbG\">\n<node concept=\"3clFbT\" id=\"5yNJPA6bEsA\" role=\"37vLTx\">\n<node concept=\"3Tm6S6\" id=\"5yNJPA6btYN\" role=\"1B3o_S\" />\n<node concept=\"17QB3L\" id=\"5yNJPA6btZ2\" role=\"1tU5fm\" />\n</node>\n+ <node concept=\"312cEg\" id=\"2RZSADO3Kko\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"t\" />\n+ <node concept=\"3Tm6S6\" id=\"2RZSADO3KbR\" role=\"1B3o_S\" />\n+ <node concept=\"3uibUv\" id=\"2RZSADO3Ksx\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"wyt6:~Throwable\" resolve=\"Throwable\" />\n+ </node>\n+ </node>\n<node concept=\"2tJIrI\" id=\"5yNJPA6btZu\" role=\"jymVt\" />\n<node concept=\"3clFbW\" id=\"5yNJPA6btZX\" role=\"jymVt\">\n<node concept=\"3cqZAl\" id=\"5yNJPA6btZZ\" role=\"3clF45\" />\n</node>\n</node>\n</node>\n+ <node concept=\"3clFbF\" id=\"2RZSADO3Lk8\" role=\"3cqZAp\">\n+ <node concept=\"37vLTI\" id=\"2RZSADO3LYk\" role=\"3clFbG\">\n+ <node concept=\"37vLTw\" id=\"2RZSADO3M7t\" role=\"37vLTx\">\n+ <ref role=\"3cqZAo\" node=\"2RZSADO3KZV\" resolve=\"t\" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"2RZSADO3LF3\" role=\"37vLTJ\">\n+ <node concept=\"Xjq3P\" id=\"2RZSADO3LxJ\" role=\"2Oq$k0\" />\n+ <node concept=\"2OwXpG\" id=\"2RZSADO3LNE\" role=\"2OqNvi\">\n+ <ref role=\"2Oxat5\" node=\"2RZSADO3Kko\" resolve=\"t\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n</node>\n<node concept=\"37vLTG\" id=\"5yNJPA6bu0s\" role=\"3clF46\">\n<property role=\"TrG5h\" value=\"error\" />\n<node concept=\"17QB3L\" id=\"5yNJPA6bu0r\" role=\"1tU5fm\" />\n</node>\n+ <node concept=\"37vLTG\" id=\"2RZSADO3KZV\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"t\" />\n+ <node concept=\"3uibUv\" id=\"2RZSADO3L82\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"wyt6:~Throwable\" resolve=\"Throwable\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbW\" id=\"2RZSADO3KAC\" role=\"jymVt\">\n+ <node concept=\"3cqZAl\" id=\"2RZSADO3KAD\" role=\"3clF45\" />\n+ <node concept=\"3Tm1VV\" id=\"2RZSADO3KAE\" role=\"1B3o_S\" />\n+ <node concept=\"3clFbS\" id=\"2RZSADO3KAF\" role=\"3clF47\">\n+ <node concept=\"3clFbF\" id=\"2RZSADO3KAG\" role=\"3cqZAp\">\n+ <node concept=\"37vLTI\" id=\"2RZSADO3KAH\" role=\"3clFbG\">\n+ <node concept=\"10Nm6u\" id=\"2RZSADO3KTM\" role=\"37vLTx\" />\n+ <node concept=\"2OqwBi\" id=\"2RZSADO3KAJ\" role=\"37vLTJ\">\n+ <node concept=\"Xjq3P\" id=\"2RZSADO3KAK\" role=\"2Oq$k0\" />\n+ <node concept=\"2OwXpG\" id=\"2RZSADO3KAL\" role=\"2OqNvi\">\n+ <ref role=\"2Oxat5\" node=\"5yNJPA6btZd\" resolve=\"error\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n</node>\n<node concept=\"2tJIrI\" id=\"5yNJPA6bAhI\" role=\"jymVt\" />\n<node concept=\"3clFb_\" id=\"5yNJPA6bAkE\" role=\"jymVt\">\n<node concept=\"3Tm1VV\" id=\"5yNJPA6bAHR\" role=\"1B3o_S\" />\n<node concept=\"17QB3L\" id=\"5yNJPA6bAJl\" role=\"3clF45\" />\n</node>\n+ <node concept=\"3clFb_\" id=\"2RZSADO3MaL\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"getThorwable\" />\n+ <node concept=\"3clFbS\" id=\"2RZSADO3MaM\" role=\"3clF47\">\n+ <node concept=\"3clFbJ\" id=\"2RZSADO3MaN\" role=\"3cqZAp\">\n+ <node concept=\"1rXfSq\" id=\"2RZSADO3MaO\" role=\"3clFbw\">\n+ <ref role=\"37wK5l\" node=\"5yNJPA6bAkE\" resolve=\"isSuccessful\" />\n+ </node>\n+ <node concept=\"3clFbS\" id=\"2RZSADO3MaP\" role=\"3clFbx\">\n+ <node concept=\"YS8fn\" id=\"2RZSADO3MaQ\" role=\"3cqZAp\">\n+ <node concept=\"2ShNRf\" id=\"2RZSADO3MaR\" role=\"YScLw\">\n+ <node concept=\"1pGfFk\" id=\"2RZSADO3MaS\" role=\"2ShVmc\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~IllegalStateException.<init>(java.lang.String)\" resolve=\"IllegalStateException\" />\n+ <node concept=\"Xl_RD\" id=\"2RZSADO3MaT\" role=\"37wK5m\">\n+ <property role=\"Xl_RC\" value=\"It is successful, no error available\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs6\" id=\"2RZSADO3MaU\" role=\"3cqZAp\">\n+ <node concept=\"37vLTw\" id=\"2RZSADO3MEh\" role=\"3cqZAk\">\n+ <ref role=\"3cqZAo\" node=\"2RZSADO3Kko\" resolve=\"t\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3Tm1VV\" id=\"2RZSADO3MaW\" role=\"1B3o_S\" />\n+ <node concept=\"3uibUv\" id=\"2RZSADO3MNO\" role=\"3clF45\">\n+ <ref role=\"3uigEE\" to=\"wyt6:~Throwable\" resolve=\"Throwable\" />\n+ </node>\n+ </node>\n<node concept=\"2tJIrI\" id=\"5yNJPA6trPq\" role=\"jymVt\" />\n<node concept=\"2YIFZL\" id=\"5yNJPA6trVb\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"ok\" />\n<node concept=\"3cpWs6\" id=\"5yNJPA6trYB\" role=\"3cqZAp\">\n<node concept=\"2ShNRf\" id=\"5yNJPA6trZd\" role=\"3cqZAk\">\n<node concept=\"1pGfFk\" id=\"5yNJPA6tsbu\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" node=\"5yNJPA6btZX\" resolve=\"TestResult\" />\n- <node concept=\"10Nm6u\" id=\"5yNJPA6tsco\" role=\"37wK5m\" />\n+ <ref role=\"37wK5l\" node=\"2RZSADO3KAC\" resolve=\"TestResult\" />\n</node>\n</node>\n</node>\n<node concept=\"37vLTw\" id=\"5yNJPA6tuuK\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"5yNJPA6tutP\" resolve=\"error\" />\n</node>\n+ <node concept=\"37vLTw\" id=\"2RZSADO3K_W\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"2RZSADO3JVY\" resolve=\"t\" />\n+ </node>\n</node>\n</node>\n</node>\n<property role=\"TrG5h\" value=\"error\" />\n<node concept=\"17QB3L\" id=\"5yNJPA6tutO\" role=\"1tU5fm\" />\n</node>\n+ <node concept=\"37vLTG\" id=\"2RZSADO3JVY\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"t\" />\n+ <node concept=\"3uibUv\" id=\"2RZSADO3K0y\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"wyt6:~Throwable\" resolve=\"Throwable\" />\n+ </node>\n+ </node>\n</node>\n<node concept=\"2tJIrI\" id=\"5yNJPA6tuok\" role=\"jymVt\" />\n<node concept=\"3Tm1VV\" id=\"5yNJPA6btY8\" role=\"1B3o_S\" />\n</node>\n</node>\n</node>\n+ <node concept=\"37vLTw\" id=\"2RZSADO52oL\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"1QKKVBBBL5n\" resolve=\"t\" />\n+ </node>\n</node>\n</node>\n</node>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | integration test: print stacktrace |
426,497 | 16.02.2022 17:34:45 | -3,600 | 22bbe67b7a7b74a6a4a6af26510b228588bb8bca | integration tests: use write action | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.integrationtests/models/org.modelix.integrationtests.mps",
"new_path": "mps/org.modelix.integrationtests/models/org.modelix.integrationtests.mps",
"diff": "<child id=\"8974276187400348171\" name=\"commandClosureLiteral\" index=\"1QHqEI\" />\n</concept>\n<concept id=\"8974276187400348181\" name=\"jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement\" flags=\"nn\" index=\"1QHqEK\" />\n+ <concept id=\"8974276187400348183\" name=\"jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement\" flags=\"nn\" index=\"1QHqEM\" />\n<concept id=\"8974276187400348177\" name=\"jetbrains.mps.lang.access.structure.ExecuteCommandStatement\" flags=\"nn\" index=\"1QHqEO\" />\n</language>\n<language id=\"fd392034-7849-419d-9071-12563d152375\" name=\"jetbrains.mps.baseLanguage.closures\">\n</node>\n</node>\n</node>\n- <node concept=\"1QHqEK\" id=\"11vVX88tlXB\" role=\"3cqZAp\">\n- <node concept=\"1QHqEC\" id=\"11vVX88tlXD\" role=\"1QHqEI\">\n- <node concept=\"3clFbS\" id=\"11vVX88tlXF\" role=\"1bW5cS\">\n+ <node concept=\"1QHqEM\" id=\"2RZSADO5Nyy\" role=\"3cqZAp\">\n+ <node concept=\"1QHqEC\" id=\"2RZSADO5Ny$\" role=\"1QHqEI\">\n+ <node concept=\"3clFbS\" id=\"2RZSADO5NyA\" role=\"1bW5cS\">\n<node concept=\"3clFbF\" id=\"7ZZZU$lf4Ab\" role=\"3cqZAp\">\n<node concept=\"2YIFZM\" id=\"7ZZZU$lf4TQ\" role=\"3clFbG\">\n<ref role=\"37wK5l\" to=\"csg2:74bn2Kw_TNe\" resolve=\"copyInModelixAsIndependentModule\" />\n</node>\n</node>\n</node>\n- <node concept=\"1QHqEK\" id=\"5i$4SBK0d$9\" role=\"3cqZAp\">\n- <node concept=\"1QHqEC\" id=\"5i$4SBK0d$a\" role=\"1QHqEI\">\n- <node concept=\"3clFbS\" id=\"5i$4SBK0d$b\" role=\"1bW5cS\">\n+ <node concept=\"1QHqEM\" id=\"2RZSADO5T37\" role=\"3cqZAp\">\n+ <node concept=\"1QHqEC\" id=\"2RZSADO5T39\" role=\"1QHqEI\">\n+ <node concept=\"3clFbS\" id=\"2RZSADO5T3b\" role=\"1bW5cS\">\n<node concept=\"3cpWs8\" id=\"1QKKVBBDQ03\" role=\"3cqZAp\">\n<node concept=\"3cpWsn\" id=\"1QKKVBBDQ04\" role=\"3cpWs9\">\n<property role=\"TrG5h\" value=\"ideaProject\" />\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | integration tests: use write action |
426,497 | 17.02.2022 09:51:30 | -3,600 | 8718c231086118131a4a9055ac83d785b73506af | mpsplugin: create progress indicator in actions | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.integrationtests/models/org.modelix.integrationtests.mps",
"new_path": "mps/org.modelix.integrationtests/models/org.modelix.integrationtests.mps",
"diff": "<child id=\"8974276187400348171\" name=\"commandClosureLiteral\" index=\"1QHqEI\" />\n</concept>\n<concept id=\"8974276187400348181\" name=\"jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement\" flags=\"nn\" index=\"1QHqEK\" />\n- <concept id=\"8974276187400348183\" name=\"jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement\" flags=\"nn\" index=\"1QHqEM\" />\n<concept id=\"8974276187400348177\" name=\"jetbrains.mps.lang.access.structure.ExecuteCommandStatement\" flags=\"nn\" index=\"1QHqEO\" />\n</language>\n<language id=\"fd392034-7849-419d-9071-12563d152375\" name=\"jetbrains.mps.baseLanguage.closures\">\n</node>\n</node>\n</node>\n- <node concept=\"1QHqEM\" id=\"2RZSADO5Nyy\" role=\"3cqZAp\">\n- <node concept=\"1QHqEC\" id=\"2RZSADO5Ny$\" role=\"1QHqEI\">\n- <node concept=\"3clFbS\" id=\"2RZSADO5NyA\" role=\"1bW5cS\">\n+ <node concept=\"1QHqEK\" id=\"2RZSADOe1sm\" role=\"3cqZAp\">\n+ <node concept=\"1QHqEC\" id=\"2RZSADOe1so\" role=\"1QHqEI\">\n+ <node concept=\"3clFbS\" id=\"2RZSADOe1sq\" role=\"1bW5cS\">\n<node concept=\"3clFbF\" id=\"7ZZZU$lf4Ab\" role=\"3cqZAp\">\n<node concept=\"2YIFZM\" id=\"7ZZZU$lf4TQ\" role=\"3clFbG\">\n<ref role=\"37wK5l\" to=\"csg2:74bn2Kw_TNe\" resolve=\"copyInModelixAsIndependentModule\" />\n<ref role=\"3cqZAo\" node=\"11vVX88rLeR\" resolve=\"simpleSolution1\" />\n</node>\n<node concept=\"2YIFZM\" id=\"2RZSADO2Pt$\" role=\"37wK5m\">\n- <ref role=\"37wK5l\" to=\"alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)\" resolve=\"toIdeaProject\" />\n<ref role=\"1Pybhc\" to=\"alof:~ProjectHelper\" resolve=\"ProjectHelper\" />\n+ <ref role=\"37wK5l\" to=\"alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)\" resolve=\"toIdeaProject\" />\n<node concept=\"37vLTw\" id=\"2RZSADO2PBE\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"11vVX88rChQ\" resolve=\"mpsProject\" />\n</node>\n</node>\n+ <node concept=\"10Nm6u\" id=\"2RZSADOe0CG\" role=\"37wK5m\" />\n</node>\n</node>\n</node>\n</node>\n- <node concept=\"2OqwBi\" id=\"11vVX88tmu0\" role=\"ukAjM\">\n- <node concept=\"37vLTw\" id=\"11vVX88tmfN\" role=\"2Oq$k0\">\n+ <node concept=\"2OqwBi\" id=\"2RZSADOe2zI\" role=\"ukAjM\">\n+ <node concept=\"37vLTw\" id=\"2RZSADOe22c\" role=\"2Oq$k0\">\n<ref role=\"3cqZAo\" node=\"11vVX88rChQ\" resolve=\"mpsProject\" />\n</node>\n- <node concept=\"liA8E\" id=\"11vVX88tmFu\" role=\"2OqNvi\">\n+ <node concept=\"liA8E\" id=\"2RZSADOe3cr\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"z1c3:~Project.getRepository()\" resolve=\"getRepository\" />\n</node>\n</node>\n</node>\n</node>\n</node>\n- <node concept=\"1QHqEM\" id=\"2RZSADO5T37\" role=\"3cqZAp\">\n- <node concept=\"1QHqEC\" id=\"2RZSADO5T39\" role=\"1QHqEI\">\n- <node concept=\"3clFbS\" id=\"2RZSADO5T3b\" role=\"1bW5cS\">\n+ <node concept=\"1QHqEK\" id=\"2RZSADOdWTE\" role=\"3cqZAp\">\n+ <node concept=\"1QHqEC\" id=\"2RZSADOdWTG\" role=\"1QHqEI\">\n+ <node concept=\"3clFbS\" id=\"2RZSADOdWTI\" role=\"1bW5cS\">\n<node concept=\"3cpWs8\" id=\"1QKKVBBDQ03\" role=\"3cqZAp\">\n<node concept=\"3cpWsn\" id=\"1QKKVBBDQ04\" role=\"3cpWs9\">\n<property role=\"TrG5h\" value=\"ideaProject\" />\n<ref role=\"3uigEE\" to=\"4nm9:~Project\" resolve=\"Project\" />\n</node>\n<node concept=\"2YIFZM\" id=\"1QKKVBBDQhW\" role=\"33vP2m\">\n- <ref role=\"37wK5l\" to=\"alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)\" resolve=\"toIdeaProject\" />\n<ref role=\"1Pybhc\" to=\"alof:~ProjectHelper\" resolve=\"ProjectHelper\" />\n+ <ref role=\"37wK5l\" to=\"alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)\" resolve=\"toIdeaProject\" />\n<node concept=\"37vLTw\" id=\"1QKKVBBDQqQ\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"1QKKVBBDsMN\" resolve=\"mpsProject\" />\n</node>\n</node>\n<node concept=\"3clFbF\" id=\"7ZZZU$lglMx\" role=\"3cqZAp\">\n<node concept=\"2YIFZM\" id=\"7ZZZU$lglP0\" role=\"3clFbG\">\n- <ref role=\"37wK5l\" to=\"csg2:74bn2Kw_Uv1\" resolve=\"copyAndSyncInModelixAsIndependentModule\" />\n<ref role=\"1Pybhc\" to=\"csg2:i0AVAFXWm5\" resolve=\"ModelCloudImportUtils\" />\n+ <ref role=\"37wK5l\" to=\"csg2:74bn2Kw_Uv1\" resolve=\"copyAndSyncInModelixAsIndependentModule\" />\n<node concept=\"37vLTw\" id=\"5i$4SBK0d$h\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"5i$4SBK0d$1\" resolve=\"treeInRepository\" />\n</node>\n<node concept=\"37vLTw\" id=\"1QKKVBBDQxR\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"1QKKVBBDQ04\" resolve=\"ideaProject\" />\n</node>\n+ <node concept=\"10Nm6u\" id=\"2RZSADOdVvp\" role=\"37wK5m\" />\n</node>\n</node>\n</node>\n</node>\n- <node concept=\"2OqwBi\" id=\"5i$4SBK0d$j\" role=\"ukAjM\">\n- <node concept=\"37vLTw\" id=\"5i$4SBK0d$k\" role=\"2Oq$k0\">\n+ <node concept=\"2OqwBi\" id=\"2RZSADOdXOG\" role=\"ukAjM\">\n+ <node concept=\"37vLTw\" id=\"2RZSADOdXOH\" role=\"2Oq$k0\">\n<ref role=\"3cqZAo\" node=\"1QKKVBBDsMN\" resolve=\"mpsProject\" />\n</node>\n- <node concept=\"liA8E\" id=\"5i$4SBK0d$l\" role=\"2OqNvi\">\n+ <node concept=\"liA8E\" id=\"2RZSADOdXOI\" role=\"2OqNvi\">\n<ref role=\"37wK5l\" to=\"z1c3:~Project.getRepository()\" resolve=\"getRepository\" />\n</node>\n</node>\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"diff": "</node>\n</node>\n</node>\n- <node concept=\"3clFbF\" id=\"68ebMUMZrzm\" role=\"3cqZAp\">\n- <node concept=\"2OqwBi\" id=\"68ebMUMZJsk\" role=\"3clFbG\">\n- <node concept=\"2ShNRf\" id=\"68ebMUMZrzi\" role=\"2Oq$k0\">\n- <node concept=\"YeOm9\" id=\"68ebMUMZEtm\" role=\"2ShVmc\">\n- <node concept=\"1Y3b0j\" id=\"68ebMUMZEtp\" role=\"YeSDq\">\n- <property role=\"2bfB8j\" value=\"true\" />\n- <ref role=\"1Y3XeK\" to=\"xygl:~Task$Modal\" resolve=\"Task.Modal\" />\n- <ref role=\"37wK5l\" to=\"xygl:~Task$Modal.<init>(com.intellij.openapi.project.Project,java.lang.String,boolean)\" resolve=\"Task.Modal\" />\n- <node concept=\"3Tm1VV\" id=\"68ebMUMZEtq\" role=\"1B3o_S\" />\n- <node concept=\"3clFb_\" id=\"68ebMUMZEtx\" role=\"jymVt\">\n- <property role=\"TrG5h\" value=\"run\" />\n- <node concept=\"3Tm1VV\" id=\"68ebMUMZEty\" role=\"1B3o_S\" />\n- <node concept=\"3cqZAl\" id=\"68ebMUMZEt$\" role=\"3clF45\" />\n- <node concept=\"37vLTG\" id=\"68ebMUMZEt_\" role=\"3clF46\">\n- <property role=\"TrG5h\" value=\"indicator\" />\n- <node concept=\"3uibUv\" id=\"68ebMUMZEtA\" role=\"1tU5fm\">\n- <ref role=\"3uigEE\" to=\"xygl:~ProgressIndicator\" resolve=\"ProgressIndicator\" />\n- </node>\n- <node concept=\"2AHcQZ\" id=\"68ebMUMZEtB\" role=\"2AJF6D\">\n- <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n- </node>\n- </node>\n- <node concept=\"3clFbS\" id=\"68ebMUMZEtC\" role=\"3clF47\">\n- <node concept=\"3SKdUt\" id=\"aVVeoQuTlD\" role=\"3cqZAp\">\n- <node concept=\"1PaTwC\" id=\"aVVeoQuTlE\" role=\"1aUNEU\">\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTlF\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"Then\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTYd\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"make\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTYw\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"sure\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTYO\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"it\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTYT\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"is\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTYZ\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"the\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTZe\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"same\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTZm\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"as\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTZB\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"the\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuTZL\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"physical\" />\n- </node>\n- <node concept=\"3oM_SD\" id=\"aVVeoQuU04\" role=\"1PaTwD\">\n- <property role=\"3oM_SC\" value=\"module\" />\n- </node>\n- </node>\n- </node>\n<node concept=\"3clFbF\" id=\"6dTx9S5tthy\" role=\"3cqZAp\">\n<node concept=\"1rXfSq\" id=\"6dTx9S5tthw\" role=\"3clFbG\">\n<ref role=\"37wK5l\" node=\"74bn2Kw_YOn\" resolve=\"replicatePhysicalModule\" />\n<ref role=\"3cqZAo\" node=\"i0AVAFY84T\" resolve=\"module\" />\n</node>\n<node concept=\"10Nm6u\" id=\"6dTx9S5tuRI\" role=\"37wK5m\" />\n- <node concept=\"2ShNRf\" id=\"68ebMUMZMMY\" role=\"37wK5m\">\n- <node concept=\"1pGfFk\" id=\"68ebMUMZQBz\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"mk8z:~ProgressMonitorAdapter.<init>(com.intellij.openapi.progress.ProgressIndicator)\" resolve=\"ProgressMonitorAdapter\" />\n- <node concept=\"37vLTw\" id=\"68ebMUMZSek\" role=\"37wK5m\">\n- <ref role=\"3cqZAo\" node=\"68ebMUMZEt_\" resolve=\"indicator\" />\n- </node>\n- </node>\n- </node>\n- </node>\n- </node>\n- </node>\n- <node concept=\"2AHcQZ\" id=\"68ebMUMZEtE\" role=\"2AJF6D\">\n- <ref role=\"2AI5Lk\" to=\"wyt6:~Override\" resolve=\"Override\" />\n- </node>\n- </node>\n- <node concept=\"37vLTw\" id=\"68ebMUMZHke\" role=\"37wK5m\">\n- <ref role=\"3cqZAo\" node=\"68ebMUMZF8T\" resolve=\"project\" />\n- </node>\n- <node concept=\"Xl_RD\" id=\"68ebMUMZIeh\" role=\"37wK5m\">\n- <property role=\"Xl_RC\" value=\"\" />\n- </node>\n- <node concept=\"3clFbT\" id=\"68ebMUMZJ6H\" role=\"37wK5m\" />\n- </node>\n- </node>\n- </node>\n- <node concept=\"liA8E\" id=\"68ebMUMZK0u\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"xygl:~Task.queue()\" resolve=\"queue\" />\n+ <node concept=\"37vLTw\" id=\"2RZSADOd$4b\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"2RZSADOdymK\" resolve=\"progress\" />\n</node>\n</node>\n</node>\n<ref role=\"3uigEE\" to=\"4nm9:~Project\" resolve=\"Project\" />\n</node>\n</node>\n+ <node concept=\"37vLTG\" id=\"2RZSADOdymK\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"progress\" />\n+ <node concept=\"3uibUv\" id=\"2RZSADOdymL\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"yyf4:~ProgressMonitor\" resolve=\"ProgressMonitor\" />\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADOdymM\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~Nullable\" resolve=\"Nullable\" />\n+ </node>\n+ </node>\n<node concept=\"3uibUv\" id=\"6dTx9S5vPYY\" role=\"3clF45\">\n<ref role=\"3uigEE\" to=\"jks5:~INode\" resolve=\"INode\" />\n</node>\n<node concept=\"37vLTw\" id=\"68ebMUMZTfU\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"5i$4SBK0Tp7\" resolve=\"mpsProject\" />\n</node>\n+ <node concept=\"37vLTw\" id=\"2RZSADOdz6C\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"2RZSADOdyCO\" resolve=\"progress\" />\n+ </node>\n</node>\n</node>\n</node>\n<ref role=\"3uigEE\" to=\"4nm9:~Project\" resolve=\"Project\" />\n</node>\n</node>\n+ <node concept=\"37vLTG\" id=\"2RZSADOdyCO\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"progress\" />\n+ <node concept=\"3uibUv\" id=\"2RZSADOdyCP\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"yyf4:~ProgressMonitor\" resolve=\"ProgressMonitor\" />\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADOdyCQ\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~Nullable\" resolve=\"Nullable\" />\n+ </node>\n+ </node>\n<node concept=\"3cqZAl\" id=\"5i$4SBK0N47\" role=\"3clF45\" />\n<node concept=\"3Tm1VV\" id=\"5i$4SBK0N48\" role=\"1B3o_S\" />\n</node>\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "</node>\n<node concept=\"tnohg\" id=\"nP6bhxN7Q4\" role=\"tncku\">\n<node concept=\"3clFbS\" id=\"nP6bhxN7Q5\" role=\"2VODD2\">\n+ <node concept=\"3clFbF\" id=\"68ebMUMZrzm\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"68ebMUMZJsk\" role=\"3clFbG\">\n+ <node concept=\"2ShNRf\" id=\"68ebMUMZrzi\" role=\"2Oq$k0\">\n+ <node concept=\"YeOm9\" id=\"68ebMUMZEtm\" role=\"2ShVmc\">\n+ <node concept=\"1Y3b0j\" id=\"68ebMUMZEtp\" role=\"YeSDq\">\n+ <property role=\"2bfB8j\" value=\"true\" />\n+ <ref role=\"37wK5l\" to=\"xygl:~Task$Modal.<init>(com.intellij.openapi.project.Project,java.lang.String,boolean)\" resolve=\"Task.Modal\" />\n+ <ref role=\"1Y3XeK\" to=\"xygl:~Task$Modal\" resolve=\"Task.Modal\" />\n+ <node concept=\"3Tm1VV\" id=\"68ebMUMZEtq\" role=\"1B3o_S\" />\n+ <node concept=\"3clFb_\" id=\"68ebMUMZEtx\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"run\" />\n+ <node concept=\"3Tm1VV\" id=\"68ebMUMZEty\" role=\"1B3o_S\" />\n+ <node concept=\"3cqZAl\" id=\"68ebMUMZEt$\" role=\"3clF45\" />\n+ <node concept=\"37vLTG\" id=\"68ebMUMZEt_\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"indicator\" />\n+ <node concept=\"3uibUv\" id=\"68ebMUMZEtA\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"xygl:~ProgressIndicator\" resolve=\"ProgressIndicator\" />\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"68ebMUMZEtB\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n+ </node>\n+ <node concept=\"3clFbS\" id=\"68ebMUMZEtC\" role=\"3clF47\">\n<node concept=\"3clFbF\" id=\"74bn2KwAqqr\" role=\"3cqZAp\">\n<node concept=\"2YIFZM\" id=\"74bn2KwAqrT\" role=\"3clFbG\">\n<ref role=\"37wK5l\" to=\"csg2:74bn2Kw_Uv1\" resolve=\"copyAndSyncInModelixAsIndependentModule\" />\n<ref role=\"2WH_rO\" node=\"nP6bhxUcuG\" resolve=\"project\" />\n</node>\n</node>\n+ <node concept=\"2ShNRf\" id=\"2RZSADOdBME\" role=\"37wK5m\">\n+ <node concept=\"1pGfFk\" id=\"2RZSADOdDKI\" role=\"2ShVmc\">\n+ <ref role=\"37wK5l\" to=\"mk8z:~ProgressMonitorAdapter.<init>(com.intellij.openapi.progress.ProgressIndicator)\" resolve=\"ProgressMonitorAdapter\" />\n+ <node concept=\"37vLTw\" id=\"2RZSADOdElc\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"68ebMUMZEt_\" resolve=\"indicator\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"68ebMUMZEtE\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"wyt6:~Override\" resolve=\"Override\" />\n+ </node>\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"2RZSADOhVTa\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"2RZSADOhVh7\" role=\"2Oq$k0\" />\n+ <node concept=\"1DTwFV\" id=\"2RZSADOhWJ6\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"nP6bhxUcuG\" resolve=\"project\" />\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"68ebMUMZIeh\" role=\"37wK5m\">\n+ <property role=\"Xl_RC\" value=\"Copy on Cloud\" />\n+ </node>\n+ <node concept=\"3clFbT\" id=\"68ebMUMZJ6H\" role=\"37wK5m\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"68ebMUMZK0u\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"xygl:~Task.queue()\" resolve=\"queue\" />\n+ </node>\n</node>\n</node>\n+ <node concept=\"3clFbH\" id=\"2RZSADOd$MK\" role=\"3cqZAp\" />\n</node>\n</node>\n<node concept=\"2ScWuX\" id=\"nP6bhxQlVl\" role=\"tmbBb\">\n</node>\n<node concept=\"tnohg\" id=\"e_REOZbrU6\" role=\"tncku\">\n<node concept=\"3clFbS\" id=\"e_REOZbrU7\" role=\"2VODD2\">\n+ <node concept=\"3clFbF\" id=\"2RZSADOdGIZ\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"2RZSADOdGJ0\" role=\"3clFbG\">\n+ <node concept=\"2ShNRf\" id=\"2RZSADOdGJ1\" role=\"2Oq$k0\">\n+ <node concept=\"YeOm9\" id=\"2RZSADOdGJ2\" role=\"2ShVmc\">\n+ <node concept=\"1Y3b0j\" id=\"2RZSADOdGJ3\" role=\"YeSDq\">\n+ <property role=\"2bfB8j\" value=\"true\" />\n+ <ref role=\"37wK5l\" to=\"xygl:~Task$Modal.<init>(com.intellij.openapi.project.Project,java.lang.String,boolean)\" resolve=\"Task.Modal\" />\n+ <ref role=\"1Y3XeK\" to=\"xygl:~Task$Modal\" resolve=\"Task.Modal\" />\n+ <node concept=\"3Tm1VV\" id=\"2RZSADOdGJ4\" role=\"1B3o_S\" />\n+ <node concept=\"3clFb_\" id=\"2RZSADOdGJ5\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"run\" />\n+ <node concept=\"3Tm1VV\" id=\"2RZSADOdGJ6\" role=\"1B3o_S\" />\n+ <node concept=\"3cqZAl\" id=\"2RZSADOdGJ7\" role=\"3clF45\" />\n+ <node concept=\"37vLTG\" id=\"2RZSADOdGJ8\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"indicator\" />\n+ <node concept=\"3uibUv\" id=\"2RZSADOdGJ9\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"xygl:~ProgressIndicator\" resolve=\"ProgressIndicator\" />\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADOdGJa\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"mhfm:~NotNull\" resolve=\"NotNull\" />\n+ </node>\n+ </node>\n+ <node concept=\"3clFbS\" id=\"2RZSADOdGJb\" role=\"3clF47\">\n<node concept=\"3clFbF\" id=\"74bn2KwAspT\" role=\"3cqZAp\">\n<node concept=\"2YIFZM\" id=\"74bn2KwAsr7\" role=\"3clFbG\">\n<ref role=\"37wK5l\" to=\"csg2:74bn2Kw_TNe\" resolve=\"copyInModelixAsIndependentModule\" />\n<ref role=\"2WH_rO\" node=\"e_REOZbrU2\" resolve=\"project\" />\n</node>\n</node>\n+ <node concept=\"2ShNRf\" id=\"2RZSADOdJMt\" role=\"37wK5m\">\n+ <node concept=\"1pGfFk\" id=\"2RZSADOdLKx\" role=\"2ShVmc\">\n+ <ref role=\"37wK5l\" to=\"mk8z:~ProgressMonitorAdapter.<init>(com.intellij.openapi.progress.ProgressIndicator)\" resolve=\"ProgressMonitorAdapter\" />\n+ <node concept=\"37vLTw\" id=\"2RZSADOdMkZ\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"2RZSADOdGJ8\" resolve=\"indicator\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2AHcQZ\" id=\"2RZSADOdGJc\" role=\"2AJF6D\">\n+ <ref role=\"2AI5Lk\" to=\"wyt6:~Override\" resolve=\"Override\" />\n+ </node>\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"2RZSADOhZ_c\" role=\"37wK5m\">\n+ <node concept=\"2WthIp\" id=\"2RZSADOhYV2\" role=\"2Oq$k0\" />\n+ <node concept=\"1DTwFV\" id=\"2RZSADOi0p1\" role=\"2OqNvi\">\n+ <ref role=\"2WH_rO\" node=\"e_REOZbrU2\" resolve=\"project\" />\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"2RZSADOdGJd\" role=\"37wK5m\">\n+ <property role=\"Xl_RC\" value=\"Copy on Cloud\" />\n+ </node>\n+ <node concept=\"3clFbT\" id=\"2RZSADOdGJe\" role=\"37wK5m\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"2RZSADOdGJf\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"xygl:~Task.queue()\" resolve=\"queue\" />\n+ </node>\n</node>\n</node>\n+ <node concept=\"3clFbH\" id=\"2RZSADOdGIL\" role=\"3cqZAp\" />\n</node>\n</node>\n<node concept=\"2ScWuX\" id=\"e_REOZbrVA\" role=\"tmbBb\">\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | mpsplugin: create progress indicator in actions |
426,496 | 22.02.2022 16:19:30 | -3,600 | f76adea00fab3d550faf08c4efd78903fa37e049 | Memory of MPS instance increased to 4 GB
This is necessary when loading MPS-extensions + mbeddr | [
{
"change_type": "MODIFY",
"old_path": "kubernetes/common/workspace-client-deployment.yaml",
"new_path": "kubernetes/common/workspace-client-deployment.yaml",
"diff": "@@ -40,10 +40,10 @@ spec:\nreadOnly: true\nresources:\nrequests:\n- memory: \"3.0Gi\"\n+ memory: \"4.0Gi\"\ncpu: 500m\nlimits:\n- memory: \"3.0Gi\"\n+ memory: \"4.0Gi\"\ncpu: \"1.5\"\nreadinessProbe:\nhttpGet:\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Memory of MPS instance increased to 4 GB
This is necessary when loading MPS-extensions + mbeddr |
426,496 | 23.02.2022 14:20:13 | -3,600 | caf9187f895b67f9866890241fbf98d74b477fe7 | Added mbeddr and iets3 languages to the docker image
To allow working with modelix in an environment without access to
external maven repositories. | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile-workspace-manager",
"new_path": "Dockerfile-workspace-manager",
"diff": "@@ -5,6 +5,10 @@ RUN apt install maven -y\nRUN apt install git -y\nRUN apt install ant -y\n+COPY bundled-maven-dependencies /bundled-maven-dependencies\n+WORKDIR /bundled-maven-dependencies\n+RUN mvn dependency:go-offline\n+\nWORKDIR /workspace-manager/\nEXPOSE 28104\nCOPY workspace-manager/build/libs/workspace-manager-latest-all.jar /workspace-manager/workspace-manager.jar\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "bundled-maven-dependencies/pom.xml",
"diff": "+<project>\n+ <modelVersion>4.0.0</modelVersion>\n+\n+ <groupId>org.modelix</groupId>\n+ <artifactId>bundled-maven-dependencies</artifactId>\n+ <version>1</version>\n+\n+ <repositories>\n+ <repository>\n+ <id>itemis</id>\n+ <name>itemis nexus</name>\n+ <url>https://projects.itemis.de/nexus/content/repositories/mbeddr/</url>\n+ </repository>\n+ </repositories>\n+\n+ <dependencies>\n+ <dependency>\n+ <groupId>de.itemis.mps</groupId>\n+ <artifactId>extensions</artifactId>\n+ <version>2020.3.2227.715a7cf</version>\n+ <type>zip</type>\n+ </dependency>\n+ <dependency>\n+ <groupId>com.mbeddr</groupId>\n+ <artifactId>platform</artifactId>\n+ <version>2020.3.23153.87edbd6</version>\n+ <type>zip</type>\n+ </dependency>\n+ <dependency>\n+ <groupId>com.mbeddr</groupId>\n+ <artifactId>mbeddr</artifactId>\n+ <version>2020.3.23153.87edbd6</version>\n+ <type>zip</type>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.iets3</groupId>\n+ <artifactId>opensource</artifactId>\n+ <version>2020.3.5345.a0a13f6</version>\n+ <type>zip</type>\n+ </dependency>\n+ </dependencies>\n+</project>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "kubernetes-use-latest-tag.sh",
"new_path": "kubernetes-use-latest-tag.sh",
"diff": "@@ -10,6 +10,8 @@ sed -i.bak -E \"s/(image:.*:).*/\\1${TAG}/\" kubernetes/common/ui-deployment.yaml\nsed -i.bak -E \"s/(image:.*:).*/\\1${TAG}/\" kubernetes/common/projector-deployment.yaml\nsed -i.bak -E \"s/(image:.*:).*/\\1${TAG}/\" kubernetes/common/uiproxy-deployment.yaml\nsed -i.bak -E \"s/(image:.*:).*/\\1${TAG}/\" kubernetes/common/instances-manager-deployment.yaml\n+sed -i.bak -E \"s/(image:.*:).*/\\1${TAG}/\" kubernetes/common/workspace-manager-deployment.yaml\n+sed -i.bak -E \"s/(image:.*:).*/\\1${TAG}/\" kubernetes/common/workspace-client-deployment.yaml\nrm kubernetes/local/db-deployment.yaml.bak\nrm kubernetes/common/model-deployment.yaml.bak\n@@ -18,3 +20,5 @@ rm kubernetes/common/ui-deployment.yaml.bak\nrm kubernetes/common/projector-deployment.yaml.bak\nrm kubernetes/common/uiproxy-deployment.yaml.bak\nrm kubernetes/common/instances-manager-deployment.yaml.bak\n+rm kubernetes/common/workspace-manager-deployment.yaml.bak\n+rm kubernetes/common/workspace-client-deployment.yaml.bak\n"
},
{
"change_type": "MODIFY",
"old_path": "kubernetes/common/oauth-deployment.yaml",
"new_path": "kubernetes/common/oauth-deployment.yaml",
"diff": "@@ -41,6 +41,7 @@ spec:\n- --skip-auth-regex=\\/model\\/getEmail\n- --skip-auth-regex=^\\/$\n- --http-address=0.0.0.0:4180\n+ - --pass-user-headers=true\nvolumeMounts:\n- name: sslcert\nmountPath: /secrets/sslcert\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/XmlUtils.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/XmlUtils.kt",
"diff": "@@ -44,6 +44,8 @@ fun Node.tagName(): String? {\nreturn if (this is Element) this.tagName else null\n}\n+fun Node.findTag(tagName: String): Element? = children().filterIsInstance<Element>().find { it.tagName() == tagName }\n+\nfun Node.children(): List<Node> {\nval children = childNodes\nval result = ArrayList<Node>(children.length)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/LocalMavenDependenciesExplorer.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.workspace.manager\n+\n+import org.modelix.workspace.build.findTag\n+import org.modelix.workspace.build.readXmlFile\n+import java.io.File\n+\n+object LocalMavenDependenciesExplorer {\n+ private var cached: List<MavenCoordinates>? = null\n+\n+ @Synchronized\n+ fun getAvailableDependencies(): List<MavenCoordinates> {\n+ var result: List<MavenCoordinates>? = cached\n+ if (result == null) {\n+ result = findAvailableDependencies()\n+ cached = result\n+ }\n+ return result\n+ }\n+\n+ private fun findAvailableDependencies(): List<MavenCoordinates> {\n+ val result = ArrayList<MavenCoordinates>()\n+ val userHome = File(System.getProperty(\"user.home\"))\n+ val localRepoDir = File(userHome, \".m2\")\n+ for (file in localRepoDir.walk()) {\n+ if (file.extension == \"pom\") {\n+ val xml = try {\n+ readXmlFile(file)\n+ } catch (e: Exception) {\n+ continue\n+ }\n+ val groupId = xml.documentElement.findTag(\"groupId\")?.textContent ?: continue\n+ val artifactId = xml.documentElement.findTag(\"artifactId\")?.textContent ?: continue\n+ val version = xml.documentElement.findTag(\"version\")?.textContent ?: continue\n+ val packaging = xml.documentElement.findTag(\"packaging\")?.textContent\n+ var coordinates = \"$groupId:$artifactId:$version\"\n+ if (packaging != null) coordinates += \":$packaging\"\n+ result += MavenCoordinates(groupId, artifactId, version, packaging)\n+ }\n+ }\n+ return result\n+ .asSequence()\n+ .filter { it.packaging == \"zip\" }\n+ .sortedBy(MavenCoordinates::packaging)\n+ .sortedBy(MavenCoordinates::version)\n+ .sortedBy(MavenCoordinates::artifactId)\n+ .sortedBy(MavenCoordinates::groupId)\n+ .toList()\n+ }\n+}\n+\n+data class MavenCoordinates(val groupId: String,\n+ val artifactId: String,\n+ val version: String,\n+ val packaging: String?) {\n+ override fun toString(): String {\n+ var coordinates = \"$groupId:$artifactId:$version\"\n+ if (packaging != null) coordinates += \":$packaging\"\n+ return coordinates\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"diff": "package org.modelix.workspace.manager\nimport kotlinx.serialization.Serializable\n-import org.jasypt.salt.RandomSaltGenerator\nimport org.jasypt.util.text.AES256TextEncryptor\nimport org.modelix.model.persistent.HashUtil\nimport java.io.File\n@@ -29,7 +28,7 @@ data class Workspace(var id: String,\nval modelRepositories: List<ModelRepository> = listOf(),\nval gitRepositories: List<GitRepository> = listOf(),\nval mavenRepositories: List<MavenRepository> = listOf(),\n- val mavenDependencies: List<String> = listOf(),\n+ var mavenDependencies: List<String> = listOf(),\nval uploads: MutableList<String> = ArrayList())\n@JvmInline\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildStatus.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceBuildStatus.kt",
"diff": "/*\n- * Copyright 2003-2022 JetBrains s.r.o.\n- *\n* Licensed under the Apache License, Version 2.0 (the \"License\");\n* you may not use this file except in compliance with the License.\n* You may obtain a copy of the License at\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -111,16 +111,119 @@ fun Application.workspaceManagerModule() {\n}\nval (workspace, workspaceHash) = workspaceAndHash\nval yaml = Yaml.default.encodeToString(workspace)\n- val htmlTemplate = Application::class.java.classLoader.getResource(\"html/edit.html\")?.readText()\n- if (htmlTemplate == null) {\n- call.respond(HttpStatusCode.InternalServerError, \"HTML template not found\")\n- return@get\n+\n+ this.call.respondHtml(HttpStatusCode.OK) {\n+ head {\n+ title { text(\"Edit Workspace\") }\n+ }\n+ body {\n+ div {\n+ a {\n+ href = \"../$workspaceHash/download-modules/queue\"\n+ text(\"Download Modules\")\n+ }\n+ a {\n+ style = \"margin-left: 24px\"\n+ href = \"../../workspace-$workspaceHash/ide/\"\n+ text(\"Open in MPS\")\n+ }\n+ }\n+ br()\n+ form {\n+ action = \"./update\"\n+ method = FormMethod.post\n+ textArea {\n+ name = \"content\"\n+ style = \"width: 800px; height: 500px\"\n+ text(yaml)\n+ }\n+ br()\n+ input {\n+ type = InputType.submit\n+ value = \"Save Changes\"\n+ }\n+ }\n+ br()\n+ div {\n+ style = \"border: 1px solid black; padding: 10px;\"\n+ div { text(\"Upload file or directory (max ~200 MB):\") }\n+ form {\n+ action = \"./upload\"\n+ method = FormMethod.post\n+ encType = FormEncType.multipartFormData\n+ div {\n+ text(\"Choose File(s):\")\n+ input {\n+ type = InputType.file\n+ name = \"file\"\n+ multiple = true\n+ }\n+ }\n+ div {\n+ text(\"Choose Directory: \")\n+ input {\n+ type = InputType.file\n+ name = \"folder\"\n+ attributes[\"webkitdirectory\"] = \"true\"\n+ attributes[\"mozdirectory\"] = \"true\"\n+ }\n+ }\n+ div {\n+ input {\n+ type = InputType.submit\n+ value = \"Upload\"\n+ }\n+ }\n+ }\n+ }\n+ br()\n+ br()\n+ div {\n+ style = \"border: 1px solid black; padding: 10px;\"\n+ div {\n+ text(\"Add Bundled Dependency\")\n+ }\n+ ul {\n+ val deps = LocalMavenDependenciesExplorer.getAvailableDependencies()\n+ for (dependency in deps) {\n+ li {\n+ form {\n+ action = \"./add-maven-dependency\"\n+ method = FormMethod.post\n+ input {\n+ type = InputType.submit\n+ name = \"coordinates\"\n+ value = dependency.toString()\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ post(\"{workspaceId}/add-maven-dependency\") {\n+ val id = call.parameters[\"workspaceId\"]\n+ if (id == null) {\n+ call.respond(HttpStatusCode.BadRequest, \"Workspace ID is missing\")\n+ return@post\n+ }\n+ val workspaceAndHash = manager.getWorkspaceForId(id)\n+ if (workspaceAndHash == null) {\n+ call.respond(HttpStatusCode.NotFound, \"Workspace $id not found\")\n+ return@post\n+ }\n+ val (workspace, workspaceHash) = workspaceAndHash\n+ val coordinates = call.receiveParameters()[\"coordinates\"]\n+ if (coordinates.isNullOrEmpty()) {\n+ call.respond(HttpStatusCode.BadRequest, \"coordinates missing\")\n+ } else {\n+ workspace.mavenDependencies += coordinates\n+ manager.update(workspace)\n+ call.respondRedirect(\"./edit\")\n}\n- val html = htmlTemplate\n- .replace(\"{{content}}\", StringEscapeUtils.escapeHtml4(yaml))\n- .replace(\"{{workspaceId}}\", id)\n- .replace(\"{{workspaceHash}}\", workspaceHash.toString())\n- this.call.respondText(html, ContentType.Text.Html, HttpStatusCode.OK)\n}\nget(\"{workspaceHash}/download-modules/queue\") {\n"
},
{
"change_type": "DELETE",
"old_path": "workspace-manager/src/main/resources/html/edit.html",
"new_path": null,
"diff": "-<!DOCTYPE html>\n-<html lang=\"en\">\n-<head>\n- <meta charset=\"UTF-8\">\n- <title>Edit Workspace</title>\n-</head>\n-<body>\n- <form action=\"./update\" method=\"post\">\n- <input type=\"submit\" value=\"Save\" />\n- <br/>\n- <textarea name=\"content\" style=\"width: 800px; height: 500px\">{{content}}</textarea>\n- </form>\n- <br/>\n- <div style=\"border: 1px solid black; padding: 10px;\">\n- <div>Upload file or directory (max ~200 MB):</div>\n- <form action=\"./upload\" method=\"post\" enctype=\"multipart/form-data\">\n- <div>Choose File(s): <input type=\"file\" name=\"file\" multiple /></div>\n- <div>Choose Directory: <input type=\"file\" name=\"folder\" webkitdirectory mozdirectory /></div>\n- <div><input type=\"submit\" value=\"Upload\" /></div>\n- </form>\n- </div>\n- <br/>\n- <div><a href=\"../{{workspaceHash}}/download-modules/queue\">Download Modules</a></div>\n- <br/>\n- <div><a href=\"../../workspace-{{workspaceHash}}/ide/\">Open in MPS</a></div>\n-</body>\n-</html>\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Added mbeddr and iets3 languages to the docker image
To allow working with modelix in an environment without access to
external maven repositories. |
426,496 | 23.02.2022 17:43:53 | -3,600 | 83f2eaabf32d85123b2d50374fbd80ecc7ecb901 | Maven was still trying to download artifacts that already exist in the local repository | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile-workspace-manager",
"new_path": "Dockerfile-workspace-manager",
"diff": "@@ -9,6 +9,12 @@ COPY bundled-maven-dependencies /bundled-maven-dependencies\nWORKDIR /bundled-maven-dependencies\nRUN mvn dependency:go-offline\n+# Delete all .repositories and.sha1 files to avoid requiring an internet connection\n+# https://manios.org/2019/08/21/force-maven-offline-execute-goal-dependencies\n+WORKDIR /root/.m2\n+RUN find -iname \"*.repositories\" -exec rm -f {} \\;\n+RUN find -iname \"*.sha1\" -exec rm -f {} \\;\n+\nWORKDIR /workspace-manager/\nEXPOSE 28104\nCOPY workspace-manager/build/libs/workspace-manager-latest-all.jar /workspace-manager/workspace-manager.jar\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/MavenDownloader.kt",
"diff": "@@ -23,17 +23,23 @@ import java.util.*\nclass MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\n- fun downloadFromMaven(coordinates: String, outputHandler: ((String)->Unit)? = null): File {\n+ fun downloadAndCopyFromMaven(coordinates: String, outputHandler: ((String)->Unit)? = null): File {\n+ if (workspace.mavenRepositories.isNotEmpty()) {\n+ downloadFromMaven(coordinates, outputHandler)\n+ }\n+ return copyArtifacts(coordinates, outputHandler)\n+ }\n+\n+ fun copyArtifacts(coordinates: String, outputHandler: ((String)->Unit)? = null): File {\nval request = DefaultInvocationRequest()\n- request.goals = listOf(\"dependency:get\")\n+ request.isOffline = true\n+ request.goals = listOf(\"dependency:copy\")\nrequest.isBatchMode = true\nval outputDir = File(workspaceDir, \"maven-\" + coordinates.replace(Regex(\"[^a-zA-Z0-9.]\"), \"_\"))\nif (outputDir.exists()) FileUtils.deleteDirectory(outputDir)\noutputDir.mkdirs()\nval properties = Properties()\n- properties[\"remoteRepositories\"] = workspace.mavenRepositories.joinToString(\",\") { it.url }\n- properties[\"transitive\"] = \"false\"\n- properties[\"dest\"] = outputDir.absolutePath\n+ properties[\"outputDirectory\"] = outputDir.absolutePath\nproperties[\"artifact\"] = addPackagingIfMissing(coordinates)\nrequest.properties = properties\n@@ -47,6 +53,19 @@ class MavenDownloader(val workspace: Workspace, val workspaceDir: File) {\nreturn outputDir\n}\n+ fun downloadFromMaven(coordinates: String, outputHandler: ((String)->Unit)? = null) {\n+ val request = DefaultInvocationRequest()\n+ request.goals = listOf(\"dependency:get\")\n+ request.isBatchMode = true\n+ val properties = Properties()\n+ properties[\"remoteRepositories\"] = workspace.mavenRepositories.joinToString(\",\") { it.url }\n+ properties[\"transitive\"] = \"false\"\n+ properties[\"artifact\"] = addPackagingIfMissing(coordinates)\n+ request.properties = properties\n+\n+ invokeMaven(request, outputHandler?.let { { outputHandler(it) } })\n+ }\n+\nprivate fun invokeMaven(request: DefaultInvocationRequest, outputHandler: InvocationOutputHandler?) {\nval invoker = DefaultInvoker()\nval candidates = mutableListOf(File(\"/usr/share/maven\"))\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -198,7 +198,7 @@ class WorkspaceManager {\nval workspacePath = getWorkspaceDirectory(workspace).toPath()\nval mavenFolders = workspace.mavenDependencies\n- .map { MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadFromMaven(it, job.outputHandler) }\n+ .map { MavenDownloader(workspace, getWorkspaceDirectory(workspace)).downloadAndCopyFromMaven(it, job.outputHandler) }\nval gitManagers = workspace.gitRepositories\n.map { it to GitRepositoryManager(it, it.credentials, getWorkspaceDirectory(workspace)) }\ngitManagers.forEach { it.second.updateRepo() }\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Maven was still trying to download artifacts that already exist in the local repository |
426,496 | 23.02.2022 21:17:10 | -3,600 | 68fb85cf3876a90ae9379cd291e3b9fb90983e57 | Don't use the itemis nexus
None of the builds was successful. It's sad. | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile-workspace-manager",
"new_path": "Dockerfile-workspace-manager",
"diff": "@@ -5,7 +5,8 @@ RUN apt install maven -y\nRUN apt install git -y\nRUN apt install ant -y\n-COPY bundled-maven-dependencies /bundled-maven-dependencies\n+COPY bundled-maven-dependencies/settings.xml /root/.m2/settings.xml\n+COPY bundled-maven-dependencies/pom.xml /bundled-maven-dependencies/pom.xml\nWORKDIR /bundled-maven-dependencies\nRUN mvn dependency:go-offline\n@@ -14,6 +15,7 @@ RUN mvn dependency:go-offline\nWORKDIR /root/.m2\nRUN find -iname \"*.repositories\" -exec rm -f {} \\;\nRUN find -iname \"*.sha1\" -exec rm -f {} \\;\n+RUN rm /root/.m2/settings.xml\nWORKDIR /workspace-manager/\nEXPOSE 28104\n"
},
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "import java.text.SimpleDateFormat\n+def getGithubCredentials() {\n+ if (project.hasProperty(\"gpr.user\") && project.hasProperty(\"gpr.key\")) {\n+ return new Tuple(project.findProperty(\"gpr.user\").toString(), project.findProperty(\"gpr.key\").toString())\n+ } else if (System.getenv(\"GITHUB_ACTOR\") != null && System.getenv(\"GITHUB_TOKEN\") != null) {\n+ return new Tuple(System.getenv(\"GITHUB_ACTOR\"), System.getenv(\"GITHUB_TOKEN\"))\n+ } else {\n+ logger.error(\"Please specify your github username (gpr.user) and access token (gpr.key) in ~/.gradle/gradle.properties\")\n+ return null\n+ }\n+}\n+\nbuildscript {\next.kotlinVersion = '1.4.32'\n@@ -42,6 +53,8 @@ plugins {\nid \"org.jetbrains.kotlin.plugin.serialization\" version \"1.5.30\" apply false\n}\n+def githubCredentials = getGithubCredentials()\n+\nif (System.getenv(\"NEXUS_USERNAME\") != null) ext.nexusUsername = System.getenv(\"NEXUS_USERNAME\")\nif (System.getenv(\"NEXUS_PASSWORD\") != null) ext.nexusPassword = System.getenv(\"NEXUS_PASSWORD\")\n@@ -107,34 +120,20 @@ allprojects {\nmavenCentral()\nmaven {\nurl = uri(\"https://maven.pkg.github.com/JetBrains/MPS-extensions\")\n- if (project.hasProperty(\"gpr.user\") && project.hasProperty(\"gpr.key\")) {\n- credentials {\n- username = project.findProperty(\"gpr.user\").toString()\n- password = project.findProperty(\"gpr.key\").toString()\n- }\n- } else if (System.getenv(\"GITHUB_ACTOR\") != null && System.getenv(\"GITHUB_TOKEN\") != null) {\n+ if (githubCredentials != null) {\ncredentials {\n- username = System.getenv(\"GITHUB_ACTOR\")\n- password = System.getenv(\"GITHUB_TOKEN\")\n+ username = githubCredentials[0]\n+ password = githubCredentials[1]\n}\n- } else {\n- logger.error(\"Please specify your github username (gpr.user) and access token (gpr.key) in ~/.gradle/gradle.properties\")\n}\n}\nmaven {\nurl = uri(\"https://maven.pkg.github.com/mbeddr/build.publish.mps\")\n- if (project.hasProperty(\"gpr.user\") && project.hasProperty(\"gpr.key\")) {\n- credentials {\n- username = project.findProperty(\"gpr.user\").toString()\n- password = project.findProperty(\"gpr.key\").toString()\n- }\n- } else if (System.getenv(\"GITHUB_ACTOR\") != null && System.getenv(\"GITHUB_TOKEN\") != null) {\n+ if (githubCredentials != null) {\ncredentials {\n- username = System.getenv(\"GITHUB_ACTOR\")\n- password = System.getenv(\"GITHUB_TOKEN\")\n+ username = githubCredentials[0]\n+ password = githubCredentials[1]\n}\n- } else {\n- logger.error(\"Please specify your github username (gpr.user) and access token (gpr.key) in ~/.gradle/gradle.properties\")\n}\n}\n//maven { url 'https://projects.itemis.de/nexus/content/repositories/mbeddr' }\n@@ -146,3 +145,8 @@ description = \"Cloud storage and web UI for MPS\"\ndefaultTasks 'assemble'\n+def mavenSettingsTemplateFile = new File(new File(\"bundled-maven-dependencies\"), \"settings-template.xml\")\n+def mavenSettingsFile = new File(new File(\"bundled-maven-dependencies\"), \"settings.xml\")\n+mavenSettingsFile.text = mavenSettingsTemplateFile.text\n+ .replace(\"{{username}}\", githubCredentials[0])\n+ .replace(\"{{password}}\", githubCredentials[1])\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "bundled-maven-dependencies/.gitignore",
"diff": "+settings.xml\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "bundled-maven-dependencies/pom.xml",
"new_path": "bundled-maven-dependencies/pom.xml",
"diff": "<repositories>\n<repository>\n- <id>itemis</id>\n- <name>itemis nexus</name>\n- <url>https://projects.itemis.de/nexus/content/repositories/mbeddr/</url>\n+ <id>github.mbeddr</id>\n+ <name>mbeddr on github</name>\n+ <url>https://maven.pkg.github.com/mbeddr/mbeddr.core</url>\n+ </repository>\n+ <repository>\n+ <id>github.mps-extensions</id>\n+ <name>MPS-extensions on github</name>\n+ <url>https://maven.pkg.github.com/JetBrains/MPS-extensions</url>\n+ </repository>\n+ <repository>\n+ <id>github.iets3os</id>\n+ <name>IETS3 opensource on github</name>\n+ <url>https://maven.pkg.github.com/IETS3/iets3.opensource</url>\n</repository>\n</repositories>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "bundled-maven-dependencies/settings-template.xml",
"diff": "+<settings xmlns=\"http://maven.apache.org/SETTINGS/1.1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+ xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd\">\n+ <servers>\n+ <server>\n+ <id>github.mbeddr</id>\n+ <username>{{username}}</username>\n+ <password>{{password}}</password>\n+ </server>\n+ <server>\n+ <id>github.mps-extensions</id>\n+ <username>{{username}}</username>\n+ <password>{{password}}</password>\n+ </server>\n+ <server>\n+ <id>github.iets3os</id>\n+ <username>{{username}}</username>\n+ <password>{{password}}</password>\n+ </server>\n+ </servers>\n+</settings>\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Don't use the itemis nexus
None of the builds was successful. It's sad. |
426,496 | 24.02.2022 11:22:46 | -3,600 | d1fd14526b872fbf35de75a068de8e6bbd2bf0e4 | configure the workspace client to connect to the model server | [
{
"change_type": "MODIFY",
"old_path": "instances-manager/src/main/java/org/modelix/instancesmanager/DeploymentManager.java",
"new_path": "instances-manager/src/main/java/org/modelix/instancesmanager/DeploymentManager.java",
"diff": "@@ -43,6 +43,8 @@ import java.util.Map;\nimport java.util.Set;\nimport java.util.concurrent.atomic.AtomicBoolean;\nimport java.util.concurrent.atomic.AtomicLong;\n+import java.util.regex.Matcher;\n+import java.util.regex.Pattern;\nimport java.util.stream.Collectors;\nimport java.util.stream.Stream;\n@@ -53,6 +55,7 @@ public class DeploymentManager {\npublic static final String INSTANCE_PER_USER_ANNOTATION_KEY = \"instance-per-user\";\npublic static final String MAX_UNASSIGNED_INSTANCES_ANNOTATION_KEY = \"max-unassigned-instances\";\npublic static final String PERSONAL_DEPLOYMENT_PREFIX = \"user-copy-\";\n+ public static final Pattern WORKSPACE_PATTERN = Pattern.compile(\"workspace-([a-f0-9]+)-([a-zA-Z0-9\\\\-_\\\\*]+)\");\nprivate Thread cleanupThread = new Thread() {\n@Override\n@@ -127,8 +130,7 @@ public class DeploymentManager {\nString originalDeploymentName = redirected.originalDeploymentName;\nString assignmentKey = originalDeploymentName;\n- String workspaceId = null;\n- if (originalDeploymentName.startsWith(\"workspace-\")) {\n+ if (WORKSPACE_PATTERN.matcher(originalDeploymentName).matches()) {\noriginalDeploymentName = \"workspace-client\";\n}\n@@ -246,8 +248,11 @@ public class DeploymentManager {\npublic boolean createDeployment(String originalDeploymentName, String personalDeploymentName) throws IOException, ApiException {\nString workspaceId = null;\n- if (originalDeploymentName.startsWith(\"workspace-\")) {\n- workspaceId = originalDeploymentName.substring(\"workspace-\".length());\n+ String workspaceHash = null;\n+ Matcher matcher = WORKSPACE_PATTERN.matcher(originalDeploymentName);\n+ if (matcher.matches()) {\n+ workspaceId = matcher.group(1);\n+ workspaceHash = matcher.group(2);\nif (!workspaceId.contains(\"*\")) workspaceId = workspaceId.substring(0, 5) + \"*\" + workspaceId.substring(5);\noriginalDeploymentName = \"workspace-client\";\n}\n@@ -279,6 +284,12 @@ public class DeploymentManager {\nif (workspaceId != null) {\ndeployment.getSpec().getTemplate().getSpec().getContainers().get(0)\n.addEnvItem(new V1EnvVar().name(\"modelix_workspace_id\").value(workspaceId));\n+ deployment.getSpec().getTemplate().getSpec().getContainers().get(0)\n+ .addEnvItem(new V1EnvVar().name(\"REPOSITORY_ID\").value(\"workspace_\" + workspaceId));\n+ }\n+ if (workspaceHash != null) {\n+ deployment.getSpec().getTemplate().getSpec().getContainers().get(0)\n+ .addEnvItem(new V1EnvVar().name(\"modelix_workspace_hash\").value(workspaceHash));\n}\nSystem.out.println(\"Creating deployment: \");\n"
},
{
"change_type": "MODIFY",
"old_path": "kubernetes/common/workspace-client-deployment.yaml",
"new_path": "kubernetes/common/workspace-client-deployment.yaml",
"diff": "@@ -32,6 +32,8 @@ spec:\nvalue: \"PROJECTOR\"\n- name: \"modelix_workspace_server\"\nvalue: \"http://workspace-manager:28104/\"\n+ - name: MODEL_URI\n+ value: http://model:28101/\nports:\n- containerPort: 8887\nvolumeMounts:\n@@ -48,14 +50,14 @@ spec:\nreadinessProbe:\nhttpGet:\npath: /\n- port: 8887\n+ port: 33333\ninitialDelaySeconds: 10\nperiodSeconds: 5\ntimeoutSeconds: 3\nlivenessProbe:\nhttpGet:\npath: /\n- port: 8887\n+ port: 33333\ninitialDelaySeconds: 120\nperiodSeconds: 20\ntimeoutSeconds: 10\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-client/src/main/kotlin/org/modelix/workspace/client/Main.kt",
"new_path": "workspace-client/src/main/kotlin/org/modelix/workspace/client/Main.kt",
"diff": "@@ -32,6 +32,8 @@ fun main(args: Array<String>) {\nval workspaceId = propertyOrEnv(\"modelix.workspace.id\")\n?: throw RuntimeException(\"modelix.workspace.id not specified\")\n+ val workspaceHash = propertyOrEnv(\"modelix.workspace.hash\")\n+ ?: throw RuntimeException(\"modelix.workspace.id not specified\")\nvar serverUrl = propertyOrEnv(\"modelix.workspace.server\", \"http://workspace-manager:28104/\")\nif (!serverUrl.endsWith(\"/\")) serverUrl += \"/\"\n@@ -41,13 +43,13 @@ fun main(args: Array<String>) {\nrunBlocking {\nvar printedLines = 0\nwhile (true) {\n- val statusString = httpClient.get<String>(serverUrl + \"$workspaceId/status\")\n+ val statusString = httpClient.get<String>(serverUrl + \"$workspaceHash/status\")\nval status = WorkspaceBuildStatus.valueOf(statusString.trim())\nwhen (status) {\n- WorkspaceBuildStatus.FailedZip -> throw RuntimeException(\"Workspace $workspaceId failed to create the ZIP file. Can't download modules.\")\n+ WorkspaceBuildStatus.FailedZip -> throw RuntimeException(\"Workspace $workspaceId / $workspaceHash failed to create the ZIP file. Can't download modules.\")\nWorkspaceBuildStatus.AllSuccessful, WorkspaceBuildStatus.ZipSuccessful -> break\nWorkspaceBuildStatus.New, WorkspaceBuildStatus.Queued, WorkspaceBuildStatus.Running, WorkspaceBuildStatus.FailedBuild -> {\n- val output = httpClient.get<String>(serverUrl + \"$workspaceId/output\")\n+ val output = httpClient.get<String>(serverUrl + \"$workspaceHash/output\")\nval lines = output.split('\\n').drop(printedLines)\nif (lines.isNotEmpty()) {\nprintedLines += lines.size\n@@ -58,7 +60,7 @@ fun main(args: Array<String>) {\n}\n}\n- httpClient.downloadFile(outputFile, \"${serverUrl}$workspaceId/download-modules/workspace.zip\")\n+ httpClient.downloadFile(outputFile, \"${serverUrl}$workspaceHash/download-modules/workspace.zip\")\n}\nZipUtil.explode(outputFile)\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManagerModule.kt",
"diff": "@@ -124,8 +124,13 @@ fun Application.workspaceManagerModule() {\n}\na {\nstyle = \"margin-left: 24px\"\n- href = \"../../workspace-$workspaceHash/ide/\"\n- text(\"Open in MPS\")\n+ href = \"../../workspace-${workspace.id}-$workspaceHash/project\"\n+ text(\"Open Web Interface\")\n+ }\n+ a {\n+ style = \"margin-left: 24px\"\n+ href = \"../../workspace-${workspace.id}-$workspaceHash/ide/\"\n+ text(\"Open MPS\")\n}\n}\nbr()\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | configure the workspace client to connect to the model server |
426,496 | 25.02.2022 14:30:45 | -3,600 | 9d4973bf89f26dfcb0ec3e8502a45913e61c700d | Workspace ID passed to MPS was wrong | [
{
"change_type": "MODIFY",
"old_path": "instances-manager/src/main/java/org/modelix/instancesmanager/DeploymentManager.java",
"new_path": "instances-manager/src/main/java/org/modelix/instancesmanager/DeploymentManager.java",
"diff": "@@ -253,7 +253,7 @@ public class DeploymentManager {\nif (matcher.matches()) {\nworkspaceId = matcher.group(1);\nworkspaceHash = matcher.group(2);\n- if (!workspaceId.contains(\"*\")) workspaceId = workspaceId.substring(0, 5) + \"*\" + workspaceId.substring(5);\n+ if (!workspaceHash.contains(\"*\")) workspaceHash = workspaceHash.substring(0, 5) + \"*\" + workspaceHash.substring(5);\noriginalDeploymentName = \"workspace-client\";\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Workspace ID passed to MPS was wrong |
426,496 | 25.02.2022 14:31:27 | -3,600 | c0bd0c9e547270e91a5873f46df57c5dfa853d17 | DevKits were not included in the libraries for the generator | [
{
"change_type": "MODIFY",
"old_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/EnvironmentSpec.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/EnvironmentSpec.kt",
"diff": "@@ -22,7 +22,17 @@ data class EnvironmentSpec(\nval libraries: List<LibrarySpec>,\nval projects: List<ProjectSpec>,\nval classPath: List<String>\n- )\n+ ) {\n+ fun debugString() = \"\"\"\n+ mpsHome: $mpsHome\n+ plugins:\n+ ${plugins.joinToString(\"\\n\") { \" \" + it.apply { \"id: $id, name: $name, path: $path\" } }}\n+ libraries:\n+ ${libraries.joinToString(\"\\n\") { \" \" + it.path }}\n+ classPath:\n+ ${classPath.joinToString(\"\\n\") { \" $it\" }}\n+ \"\"\".trimIndent()\n+}\n@Serializable\ndata class PluginSpec(val path: String, val id: String, val name: String)\n"
},
{
"change_type": "MODIFY",
"old_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/ModelImportMain.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/ModelImportMain.kt",
"diff": "@@ -26,9 +26,7 @@ object ModelImportMain {\nif (envFile == null) throw IllegalArgumentException(\"$ENVIRONMENT_ARG_KEY argument is missing\")\nval environmentSpec = Json.decodeFromString<EnvironmentSpec>(envFile.readText(StandardCharsets.UTF_8))\nprintln(\"*** Loading environment *** \")\n- Json {\n- prettyPrint = true\n- }.encodeToString(environmentSpec).let(::println)\n+ println(environmentSpec.debugString())\n//Thread.currentThread().contextClassLoader = URLClassLoader(environmentSpec.classPath.map { File(it).toURI().toURL() }.toTypedArray())\nval mpsEnvironment = EnvironmentLoader(environmentSpec).loadEnvironment()\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -29,6 +29,8 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\nval xml = generateXML()\nFileUtils.writeStringToFile(antScriptFile, xml, StandardCharsets.UTF_8)\n+ outputHandler?.let { it(xml) }\n+\nval ant = ProcessBuilder(getAntPath(), \"-f\", antScriptFile.canonicalPath).start()\nvar lastOutput = System.currentTimeMillis()\nval outputThread = Thread() {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"diff": "@@ -40,18 +40,43 @@ class ModulesMiner() {\nwhen (file.extension.lowercase()) {\n// see jetbrains.mps.project.MPSExtentions\n\"msd\", \"mpl\", \"devkit\" -> {\n- result.addModule(readModule(file, owner ?: SourceModuleOwner(origin.localModulePath(file))))\n+ val module = readModule(file, owner ?: SourceModuleOwner(origin.localModulePath(file)))\n+ dependenciesFromModels(module, file.parentFile)\n+ result.addModule(module)\n}\n\"jar\" -> {\nif (!file.nameWithoutExtension.endsWith(\"-src\")) {\nval libraryModuleOwner = owner ?: LibraryModuleOwner(origin.localModulePath(file))\n+ val modules: MutableMap<String, FoundModule> = HashMap()\nZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\nif (entry.name == \"META-INF/module.xml\") {\n- result.addModule(readModule(stream, libraryModuleOwner))\n+ val module = readModule(stream, libraryModuleOwner)\n+ result.addModule(module)\n+ modules[\"\"] = module\n}\nwhen (entry.name.substringAfterLast('.', \"\").lowercase()) {\n\"msd\", \"mpl\", \"devkit\" -> {\n- result.addModule(readModule(stream, libraryModuleOwner))\n+ val module = readModule(stream, libraryModuleOwner)\n+ result.addModule(module)\n+ modules[entry.name.substringBeforeLast(\"/\", \"\")] = module\n+ }\n+ }\n+ }\n+ if (modules.isNotEmpty()) {\n+ ZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\n+ when (entry.name.substringAfterLast('.', \"\").lowercase()) {\n+ \"mps\" -> {\n+ var module: FoundModule? = null\n+ var parentPath: String = entry.name.substringBeforeLast(\"/\", \"\")\n+ while (module == null) {\n+ module = modules[parentPath]\n+ if (parentPath == \"\") break\n+ parentPath = parentPath.substringBeforeLast(\"/\", \"\")\n+ }\n+ if (module != null) {\n+ dependenciesFromModel(stream, module)\n+ }\n+ }\n}\n}\n}\n@@ -133,6 +158,47 @@ class ModulesMiner() {\nreturn module\n}\n+ private fun dependenciesFromModels(module: FoundModule, file: File) {\n+ if (file.isFile) {\n+ if (file.extension == \"mps\") {\n+ FileInputStream(file).use {\n+ dependenciesFromModel(it, module)\n+ }\n+ }\n+ } else {\n+ file.listFiles()?.forEach { child ->\n+ dependenciesFromModels(module, child)\n+ }\n+ }\n+ }\n+\n+ /**\n+ * DevKits don't appear as a dependency in the module. The module only references languages.\n+ * That's why we also have to extract dependencies from the models.\n+ */\n+ private fun dependenciesFromModel(xmlStream: InputStream, module: FoundModule) {\n+ val xml = readXmlFile(xmlStream)\n+ val doc: Element = xml.documentElement\n+ val languages = doc.findTag(\"languages\") ?: return\n+ for (langOrDevkit in languages.childElements()) {\n+ when (langOrDevkit.tagName()) {\n+ \"use\" -> {\n+ val id = langOrDevkit.getAttribute(\"id\")\n+ if (id.isNotEmpty()) {\n+ module.addDependency(ModuleDependency(ModuleId(id), DependencyType.Generator, false))\n+ }\n+ }\n+ \"devkit\" -> {\n+ val ref = langOrDevkit.getAttribute(\"ref\")\n+ if (ref.isNotEmpty()) {\n+ val id = moduleIdFromReference(ref)\n+ module.addDependency(ModuleDependency(id, DependencyType.Generator, false))\n+ }\n+ }\n+ }\n+ }\n+ }\n+\nprivate fun extractModuleUUIDs(text: String): Set<String> {\nreturn Regex(\"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\")\n.findAll(text).filter {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/XmlUtils.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/XmlUtils.kt",
"diff": "@@ -53,6 +53,8 @@ fun Node.children(): List<Node> {\nreturn result\n}\n+fun Node.childElements(): List<Element> = children().filterIsInstance<Element>()\n+\nfun Element.newChild(tag: String, body: Element.()->Unit): Element {\nval child = ownerDocument.createElement(tag)\nappendChild(child)\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | DevKits were not included in the libraries for the generator |
426,496 | 25.02.2022 16:40:59 | -3,600 | 1d861f8e40d5ab9c80a89b91364f620fcad58165 | Plugin dependencies were not loaded during generation | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/FoundModules.kt",
"diff": "@@ -25,6 +25,22 @@ class FoundModules {\nreturn plugins[id]\n}\n+ fun getPluginWithDependencies(pluginId: String, result: MutableMap<String, PluginModuleOwner>) {\n+ if (result.containsKey(pluginId)) return\n+ val plugin = getPlugin(pluginId)\n+ if (plugin == null) {\n+ if (pluginId.startsWith(\"com.intellij\")) {\n+ return\n+ } else {\n+ throw RuntimeException(\"plugin not found: $pluginId\")\n+ }\n+ }\n+ result += pluginId to plugin\n+ for (dependency in plugin.pluginDependencies) {\n+ getPluginWithDependencies(dependency, result)\n+ }\n+ }\n+\nfun getModules(): Map<ModuleId, FoundModule> = modules\nfun addPlugin(plugin: PluginModuleOwner) {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"diff": "*/\npackage org.modelix.workspace.build\n+import org.modelix.headlessmps.PluginSpec\n+\nclass GenerationPlanBuilder(val availableModules: FoundModules) {\nval plan: GenerationPlan = GenerationPlan()\nprivate val processedModules: MutableSet<ModuleId> = HashSet()\n@@ -43,6 +45,8 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\nbuild(dependency)\n}\n+ val plugins: MutableMap<String, PluginModuleOwner> = LinkedHashMap()\n+\nwhen (val moduleOwner = module.owner) {\nis SourceModuleOwner -> {\nval index = currentProcessingModules.firstNotNullOfOrNull { forcedChunkIndex[module.moduleId] }\n@@ -51,9 +55,11 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\nplan.insertAt(index, module)\n}\nis LibraryModuleOwner -> plan.addLibrary(moduleOwner)\n- is PluginModuleOwner -> plan.addPlugin(moduleOwner)\n+ is PluginModuleOwner -> availableModules.getPluginWithDependencies(moduleOwner.pluginId, plugins)\nelse -> throw RuntimeException(\"Unknown owner: $moduleOwner\")\n}\n+\n+ plugins.values.forEach { plan.addPlugin(it) }\n} finally {\ncurrentProcessingModules.removeLast()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"diff": "@@ -19,6 +19,7 @@ import org.zeroturnaround.zip.ZipUtil\nimport java.io.File\nimport java.io.FileInputStream\nimport java.io.InputStream\n+import java.io.InputStreamReader\nimport java.util.zip.ZipEntry\nimport javax.xml.XMLConstants\nimport javax.xml.parsers.DocumentBuilderFactory\n@@ -45,7 +46,11 @@ class ModulesMiner() {\nresult.addModule(module)\n}\n\"jar\" -> {\n- if (!file.nameWithoutExtension.endsWith(\"-src\")) {\n+ if (file.name == \"mps-workbench.jar\" && file.parentFile.name == \"lib\") {\n+ // This MPS plugin seems to use some old way of packaging a plugin\n+ // The descriptor declares 'com.intellij' as the ID, but it's actually 'com.intellij.modules.mps'.\n+ result.addPlugin(PluginModuleOwner(origin.localModulePath(file), \"com.intellij.modules.mps\", \"MPS Workbench\", setOf()))\n+ } else if (!file.nameWithoutExtension.endsWith(\"-src\")) {\nval libraryModuleOwner = owner ?: LibraryModuleOwner(origin.localModulePath(file))\nval modules: MutableMap<String, FoundModule> = HashMap()\nZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\n@@ -92,8 +97,9 @@ class ModulesMiner() {\nif (file.name == \".mps\") {\nresult.projects += FoundProject(file.parentFile)\n} else {\n- val isPluginDir = File(File(file, \"META-INF\"), \"plugin.xml\").exists()\n- val pluginOwner = if (isPluginDir) PluginModuleOwner(origin.localModulePath(file)) else null\n+ val pluginXml = File(File(file, \"META-INF\"), \"plugin.xml\")\n+ val isPluginDir = pluginXml.exists()\n+ val pluginOwner = if (isPluginDir) PluginModuleOwner.fromPluginFolder(origin.localModulePath(file)) else null\nif (pluginOwner != null) modules.addPlugin(pluginOwner)\nfile.listFiles()?.forEach { child ->\ncollectModules(child, owner ?: pluginOwner, origin, result)\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/PluginModuleOwner.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/PluginModuleOwner.kt",
"diff": "@@ -15,20 +15,21 @@ package org.modelix.workspace.build\nimport java.io.ByteArrayInputStream\nimport java.io.File\n+import java.io.StringReader\nimport java.util.regex.Matcher\nimport java.util.regex.Pattern\n/**\n* Modules packaged as an IDEA plugin containing a META-INF/plugin.xml file.\n*/\n-class PluginModuleOwner(path: ModulePath) : ModuleOwner(path) {\n- var pluginId: String? = null\n- var name: String? = null\n- val pluginDependencies: MutableSet<String> = HashSet() // plugin IDs\n-\n- init {\n+class PluginModuleOwner(path: ModulePath, val pluginId: String, val name: String?, val pluginDependencies: Set<String>) : ModuleOwner(path) {\n+ companion object {\n+ fun fromPluginFolder(path: ModulePath): PluginModuleOwner {\nval pluginPath = path.getLocalAbsolutePath().toFile()\nval pluginDescriptorFile = File(File(pluginPath, \"META-INF\"), \"plugin.xml\")\n+ var pluginId: String? = null\n+ var name: String? = null\n+ val pluginDependencies: MutableSet<String> = HashSet()\nfor (line in pluginDescriptorFile.readLines()) {\nif (pluginId == null) {\nval idMatch = Regex(\"\"\".*<id>(.+)</id>.*\"\"\").matchEntire(line)\n@@ -43,7 +44,9 @@ class PluginModuleOwner(path: ModulePath) : ModuleOwner(path) {\n}\nif (pluginId == null) {\n- throw RuntimeException(\"Plugin has no ID: $pluginPath\")\n+ throw RuntimeException(\"Plugin has no ID: ${path.getLocalAbsolutePath()}\")\n+ }\n+ return PluginModuleOwner(path, pluginId, name, pluginDependencies)\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -359,7 +359,7 @@ class WorkspaceManager {\nprivate fun buildEnvironmentSpec(modules: FoundModules, classPath: List<String>): String {\nval mpsHome = modules.mpsHome ?: throw RuntimeException(\"mps.home not found\")\n- val plugins: MutableMap<String, PluginSpec> = LinkedHashMap()\n+ val plugins: MutableMap<String, PluginModuleOwner> = LinkedHashMap()\nval libraries = ArrayList<LibrarySpec>()\nval rootModuleIds = modules.getModules().values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toMutableSet()\n@@ -370,28 +370,17 @@ class WorkspaceManager {\nwhen (moduleOwner) {\nis PluginModuleOwner -> {\nval pluginId = moduleOwner.pluginId\n- ?: throw RuntimeException(\"Plugin has no ID: ${moduleOwner.path.getLocalAbsolutePath()}\")\n- pluginWithDependencies(pluginId, modules, plugins)\n+ modules.getPluginWithDependencies(pluginId, plugins)\n}\nis LibraryModuleOwner, is SourceModuleOwner -> libraries += LibrarySpec(moduleOwner.path.getLocalAbsolutePath().toString())\n}\n}\nval projects = modules.projects.map { ProjectSpec(it.path.canonicalPath, it.name) }\n- val spec = EnvironmentSpec(mpsHome.absolutePath, plugins.values.toList(), libraries, projects, classPath)\n+ val pluginSpecs = plugins.values.map { PluginSpec(it.path.getLocalAbsolutePath().toString(), it.pluginId, it.name ?: \"\") }\n+ val spec = EnvironmentSpec(mpsHome.absolutePath, pluginSpecs, libraries, projects, classPath)\nreturn Json.encodeToString(spec)\n}\n- private fun pluginWithDependencies(pluginId: String, modules: FoundModules, result: MutableMap<String, PluginSpec>) {\n- if (result.containsKey(pluginId)) return\n- val plugin = modules.getPlugin(pluginId)\n- if (plugin != null) {\n- result += pluginId to PluginSpec(plugin.path.getLocalAbsolutePath().toString(), pluginId, plugin.name ?: \"\")\n- for (dependency in plugin.pluginDependencies) {\n- pluginWithDependencies(dependency, modules, result)\n- }\n- }\n- }\n-\nprivate fun visitFiles(file: File, visitor: (File)->Unit) {\nvisitor(file)\nif (file.isDirectory) {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Plugin dependencies were not loaded during generation |
426,496 | 25.02.2022 16:41:40 | -3,600 | 27c764c14cd4ed8cba34669207fa0ca8afed9c9f | Some pathes in the gradle script were not relative to the project root | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -145,8 +145,8 @@ description = \"Cloud storage and web UI for MPS\"\ndefaultTasks 'assemble'\n-def mavenSettingsTemplateFile = new File(new File(\"bundled-maven-dependencies\"), \"settings-template.xml\")\n-def mavenSettingsFile = new File(new File(\"bundled-maven-dependencies\"), \"settings.xml\")\n+def mavenSettingsTemplateFile = new File(new File(project.rootDir, \"bundled-maven-dependencies\"), \"settings-template.xml\").absoluteFile\n+def mavenSettingsFile = new File(new File(project.rootDir, \"bundled-maven-dependencies\"), \"settings.xml\").absoluteFile\nmavenSettingsFile.text = mavenSettingsTemplateFile.text\n.replace(\"{{username}}\", githubCredentials[0])\n.replace(\"{{password}}\", githubCredentials[1])\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Some pathes in the gradle script were not relative to the project root |
426,496 | 25.02.2022 17:24:31 | -3,600 | 4180a1a06e7a475ebb10d19de3bd5b83ec09fa49 | Switching the git branch failed | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/GitRepositoryManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/GitRepositoryManager.kt",
"diff": "@@ -35,10 +35,11 @@ class GitRepositoryManager(val config: GitRepository, val encryptedCredentials:\nval existed = repoDirectory.exists()\nval git = openRepo()\nif (existed) {\n- git.checkout().setName(config.commitHash ?: config.branch).call()\n- if (config.commitHash == null) {\n- applyCredentials(git.pull()).call()\n- }\n+ applyCredentials(git.fetch()).call()\n+ git.checkout().setName(config.commitHash ?: (\"origin/\" + config.branch)).call()\n+// if (config.commitHash == null) {\n+// applyCredentials(git.pull()).call()\n+// }\n}\nreturn git.repository.exactRef(\"HEAD\").objectId.name\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Switching the git branch failed |
426,496 | 25.02.2022 17:25:47 | -3,600 | 0c8ac0ffa34e828240651577f6d906074ad66811 | Make the packaged modelix modules available to the generator | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"diff": "@@ -19,10 +19,7 @@ import org.zeroturnaround.zip.ZipUtil\nimport java.io.File\nimport java.io.FileInputStream\nimport java.io.InputStream\n-import java.io.InputStreamReader\nimport java.util.zip.ZipEntry\n-import javax.xml.XMLConstants\n-import javax.xml.parsers.DocumentBuilderFactory\nclass ModulesMiner() {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -213,6 +213,19 @@ class WorkspaceManager {\nvar modulesXml: String? = null\nval modulesMiner = ModulesMiner()\nmoduleFolders.forEach { modulesMiner.searchInFolder(it) }\n+\n+ // Modelix and MPS-extensions are required to run the importer\n+ val additionalFolders = ArrayList<File>()\n+ if (!modulesMiner.getModules().getModules().containsKey(org_modelix_model_mpsplugin)) {\n+ additionalFolders += File(File(\"..\"), \"mps\")\n+ additionalFolders += File(\"/languages/modelix\")\n+ }\n+ if (!modulesMiner.getModules().getModules().containsKey(org_modelix_model_api)) {\n+ additionalFolders += File(File(File(\"..\"), \"artifacts\"), \"de.itemis.mps.extensions\")\n+ additionalFolders += File(\"/languages/mps-extensions\")\n+ }\n+ additionalFolders.filter { it.exists() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it.toPath(), it.toPath())) }\n+\njob.runSafely(WorkspaceBuildStatus.FailedBuild) {\nval buildScriptGenerator = BuildScriptGenerator(modulesMiner)\njob.runSafely {\n@@ -240,18 +253,6 @@ class WorkspaceManager {\n}\n}\n- // Modelix and MPS-extensions are required to run the importer\n- val additionalFolders = ArrayList<File>()\n- if (!modulesMiner.getModules().getModules().containsKey(org_modelix_model_mpsplugin)) {\n- additionalFolders += File(File(\"..\"), \"mps\")\n- additionalFolders += File(\"/languages/modelix\")\n- }\n- if (!modulesMiner.getModules().getModules().containsKey(org_modelix_model_api)) {\n- additionalFolders += File(File(File(\"..\"), \"artifacts\"), \"de.itemis.mps.extensions\")\n- additionalFolders += File(\"/languages/mps-extensions\")\n- }\n- additionalFolders.filter { it.exists() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it.toPath(), it.toPath())) }\n-\njob.runSafely { importModulesToCloud(modulesMiner, job) }\nreturn downloadFile\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Make the packaged modelix modules available to the generator |
426,496 | 25.02.2022 18:22:40 | -3,600 | 991a14a7ddf849df118660cf5602c89473a061ea | Error stream was not redirected to the job output during generation
There were no error messages why the generation failed. | [
{
"change_type": "MODIFY",
"old_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/EnvironmentSpec.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/EnvironmentSpec.kt",
"diff": "@@ -26,9 +26,9 @@ data class EnvironmentSpec(\nfun debugString() = \"\"\"\nmpsHome: $mpsHome\nplugins:\n- ${plugins.joinToString(\"\\n\") { \" \" + it.apply { \"id: $id, name: $name, path: $path\" } }}\n+ ${plugins.joinToString(\"\\n\") { with(it) { \" id: $id, name: $name, path: $path\" } }}\nlibraries:\n- ${libraries.joinToString(\"\\n\") { \" \" + it.path }}\n+ ${libraries.joinToString(\"\\n\") { with(it) { \" $path\" } }}\nclassPath:\n${classPath.joinToString(\"\\n\") { \" $it\" }}\n\"\"\".trimIndent()\n"
},
{
"change_type": "MODIFY",
"old_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/JavaProcess.kt",
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/JavaProcess.kt",
"diff": "package org.modelix.headlessmps\nimport java.io.*\n-import java.util.concurrent.TimeUnit\n-import kotlin.math.max\nimport kotlin.reflect.KClass\n-class JavaProcess(val mainClass: KClass<*>) {\n+class JavaProcess(val mainClass: KClass<*>): ProcessExecutor() {\nval jvmArgs: MutableList<String> = ArrayList()\nval args: MutableList<String> = ArrayList()\nval classpath: MutableList<String> = System.getProperty(\"java.class.path\").split(File.pathSeparator).toMutableList()\n- var timeoutSeconds: Int = 120\n- var outputHandler: (String)->Unit = { println(it) }\n@Throws(IOException::class, InterruptedException::class)\nfun exec() {\n@@ -37,42 +33,13 @@ class JavaProcess(val mainClass: KClass<*>) {\nval command: MutableList<String> = ArrayList()\ncommand += javaBin\ncommand += jvmArgs\n+ if (classpath.isNotEmpty()) {\ncommand += \"-cp\"\ncommand += classpath.joinToString(File.pathSeparator)\n+ }\ncommand += className\ncommand += args\n- outputHandler(\"Running command: \" + command.joinToString(\" \"))\n- val process = ProcessBuilder(command).start()\n- val outputThread = StreamCopyThread(process.inputStream)\n- val errorOutputThread = StreamCopyThread(process.errorStream)\n- outputThread.start()\n- errorOutputThread.start()\n- while (!process.waitFor(1, TimeUnit.SECONDS)) {\n- val lastOutput = max(outputThread.lastOutput, errorOutputThread.lastOutput)\n- if (System.currentTimeMillis() - lastOutput > timeoutSeconds * 1000) {\n- process.destroy()\n- process.waitFor(10, TimeUnit.SECONDS)\n- if (process.isAlive) process.destroyForcibly()\n- outputThread.interrupt()\n- errorOutputThread.interrupt()\n- throw RuntimeException(\"Java process timed out\")\n- }\n- }\n- val exitValue = process.exitValue()\n- if (exitValue != 0) throw RuntimeException(\"Java process failed with exit value $exitValue\")\n- }\n-\n- inner class StreamCopyThread(private val stream: InputStream) : Thread() {\n- var lastOutput: Long = System.currentTimeMillis()\n- override fun run() {\n- val reader = BufferedReader(InputStreamReader(stream))\n- var line = reader.readLine()\n- while (line != null) {\n- lastOutput = System.currentTimeMillis()\n- outputHandler(line)\n- line = reader.readLine()\n- }\n- }\n+ exec(command)\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "headless-mps/src/main/kotlin/org/modelix/headlessmps/ProcessExecutor.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.headlessmps\n+\n+import java.io.*\n+import java.util.concurrent.TimeUnit\n+import kotlin.math.max\n+\n+open class ProcessExecutor() {\n+ var outputHandler: (String)->Unit = { println(it) }\n+ var timeoutSeconds: Int = 120\n+\n+ @Throws(IOException::class, InterruptedException::class)\n+ fun exec(command: List<String>) {\n+ outputHandler(\"Running command: \" + command.joinToString(\" \"))\n+ val process = ProcessBuilder(command).start()\n+ val outputThread = StreamCopyThread(process.inputStream)\n+ val errorOutputThread = StreamCopyThread(process.errorStream)\n+ outputThread.start()\n+ errorOutputThread.start()\n+ while (!process.waitFor(1, TimeUnit.SECONDS)) {\n+ val lastOutput = max(outputThread.lastOutput, errorOutputThread.lastOutput)\n+ if (System.currentTimeMillis() - lastOutput > timeoutSeconds * 1000) {\n+ process.destroy()\n+ process.waitFor(10, TimeUnit.SECONDS)\n+ if (process.isAlive) process.destroyForcibly()\n+ outputThread.interrupt()\n+ errorOutputThread.interrupt()\n+ throw RuntimeException(\"Process timed out\")\n+ }\n+ }\n+ val exitValue = process.exitValue()\n+ if (exitValue != 0) throw RuntimeException(\"Process failed with exit value $exitValue\")\n+ }\n+\n+ inner class StreamCopyThread(private val stream: InputStream) : Thread() {\n+ var lastOutput: Long = System.currentTimeMillis()\n+ override fun run() {\n+ val reader = BufferedReader(InputStreamReader(stream))\n+ var line = reader.readLine()\n+ while (line != null) {\n+ lastOutput = System.currentTimeMillis()\n+ outputHandler(line)\n+ line = reader.readLine()\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "package org.modelix.workspace.build\nimport org.apache.commons.io.FileUtils\n+import org.modelix.headlessmps.ProcessExecutor\nimport org.w3c.dom.Document\nimport java.io.BufferedReader\nimport java.io.File\n@@ -31,30 +32,9 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\noutputHandler?.let { it(xml) }\n- val ant = ProcessBuilder(getAntPath(), \"-f\", antScriptFile.canonicalPath).start()\n- var lastOutput = System.currentTimeMillis()\n- val outputThread = Thread() {\n- val reader = BufferedReader(InputStreamReader(ant.inputStream))\n- var line = reader.readLine()\n- while (line != null) {\n- lastOutput = System.currentTimeMillis()\n- if (outputHandler != null) {\n- outputHandler(line)\n- } else {\n- println(line)\n- }\n- line = reader.readLine()\n- }\n- }\n- outputThread.start()\n- while (!ant.waitFor(10, TimeUnit.SECONDS)) {\n- if (System.currentTimeMillis() - lastOutput > 120_000) {\n- outputThread.interrupt()\n- throw RuntimeException(\"Generating MPS modules timed out\")\n- }\n- }\n- val exitValue = ant.exitValue()\n- if (exitValue != 0) throw RuntimeException(\"Generating MPS modules failed with exit value $exitValue\")\n+ val ant = ProcessExecutor()\n+ outputHandler?.let { ant.outputHandler = it }\n+ ant.exec(listOf(getAntPath(), \"-f\", antScriptFile.canonicalPath))\n}\nfun getAntPath(): String {\n@@ -121,7 +101,7 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\nsetAttribute(\"fork\", \"true\")\nsetAttribute(\"targetJavaVersion\", \"11\")\nsetAttribute(\"skipUnmodifiedModels\", \"false\")\n- setAttribute(\"logLevel\", \"warn\")\n+ setAttribute(\"logLevel\", \"debug\")\nfor (plugin in plan.getPlugins()) {\nnewChild(\"plugin\") {\nsetAttribute(\"path\", plugin.path.getLocalAbsolutePath().pathString)\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/GenerationPlanBuilder.kt",
"diff": "*/\npackage org.modelix.workspace.build\n-import org.modelix.headlessmps.PluginSpec\n-\nclass GenerationPlanBuilder(val availableModules: FoundModules) {\nval plan: GenerationPlan = GenerationPlan()\nprivate val processedModules: MutableSet<ModuleId> = HashSet()\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Error stream was not redirected to the job output during generation
There were no error messages why the generation failed. |
426,496 | 25.02.2022 19:02:07 | -3,600 | 4122ec13faf045707a3f6282c13413a0aaff2093 | Generation failed if ModuleReferenceExpression cannot resolve the module
This is tricky, because the dependency is not recorded in the module or
model dependencies. This means we have to search the model for instances
of ModuleReferenceExpression (on XML level) and extract the ID. | [
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/ModulesMiner.kt",
"diff": "@@ -182,7 +182,8 @@ class ModulesMiner() {\nprivate fun dependenciesFromModel(xmlStream: InputStream, module: FoundModule) {\nval xml = readXmlFile(xmlStream)\nval doc: Element = xml.documentElement\n- val languages = doc.findTag(\"languages\") ?: return\n+ val languages = doc.findTag(\"languages\")\n+ if (languages != null) {\nfor (langOrDevkit in languages.childElements()) {\nwhen (langOrDevkit.tagName()) {\n\"use\" -> {\n@@ -202,6 +203,35 @@ class ModulesMiner() {\n}\n}\n+ val registry = doc.findTag(\"registry\")\n+ if (registry != null) {\n+ // jetbrains.mps.lang.smodel\n+ val smodelLang = registry.childElements().find { it.getAttribute(\"id\") == \"7866978e-a0f0-4cc7-81bc-4d213d9375e1\" }\n+ if (smodelLang != null) {\n+ run {\n+ val moduleReferenceExpression = smodelLang.childElements().find { it.getAttribute(\"id\") == \"4040588429969021681\" } ?: return@run\n+ val conceptIndex = moduleReferenceExpression.getAttribute(\"index\")\n+ val moduleIdProperty = moduleReferenceExpression.childElements().find { it.getAttribute(\"id\") == \"4040588429969021683\" } ?: return@run\n+ val propertyIndex = moduleIdProperty.getAttribute(\"index\")\n+ visitMPSNodes(doc) { mpsNode ->\n+ if (mpsNode.getAttribute(\"concept\") != conceptIndex) return@visitMPSNodes\n+ val property = mpsNode.childElements().find { it.tagName == \"property\" && it.getAttribute(\"role\") == propertyIndex } ?: return@visitMPSNodes\n+ val moduleId = property.getAttribute(\"value\")\n+ if (moduleId.isEmpty()) return@visitMPSNodes\n+ module.addDependency(ModuleDependency(ModuleId(moduleId), DependencyType.Model, true))\n+ }\n+ }\n+ }\n+ }\n+ }\n+\n+ private fun visitMPSNodes(parent: Element, visitor: (Element)->Unit) {\n+ if (parent.tagName == \"node\") visitor(parent)\n+ for (childElement in parent.childElements()) {\n+ visitMPSNodes(childElement, visitor)\n+ }\n+ }\n+\nprivate fun extractModuleUUIDs(text: String): Set<String> {\nreturn Regex(\"[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\")\n.findAll(text).filter {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Generation failed if ModuleReferenceExpression cannot resolve the module
This is tricky, because the dependency is not recorded in the module or
model dependencies. This means we have to search the model for instances
of ModuleReferenceExpression (on XML level) and extract the ID. |
426,496 | 26.02.2022 12:40:51 | -3,600 | e6278926775c099fc1c9a35019b1a2d7e4f772ac | Memory for the generator increased to 2 GB | [
{
"change_type": "MODIFY",
"old_path": "kubernetes/common/workspace-manager-deployment.yaml",
"new_path": "kubernetes/common/workspace-manager-deployment.yaml",
"diff": "@@ -34,10 +34,10 @@ spec:\nname: \"jvm-debug\"\nresources:\nrequests:\n- memory: \"1.5Gi\"\n+ memory: \"3Gi\"\ncpu: \"0.1\"\nlimits:\n- memory: \"1.5Gi\"\n+ memory: \"3Gi\"\ncpu: \"1.0\"\nreadinessProbe:\nhttpGet:\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/build/BuildScriptGenerator.kt",
"diff": "@@ -101,7 +101,7 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\nsetAttribute(\"fork\", \"true\")\nsetAttribute(\"targetJavaVersion\", \"11\")\nsetAttribute(\"skipUnmodifiedModels\", \"false\")\n- setAttribute(\"logLevel\", \"debug\")\n+ setAttribute(\"logLevel\", \"warn\")\nfor (plugin in plan.getPlugins()) {\nnewChild(\"plugin\") {\nsetAttribute(\"path\", plugin.path.getLocalAbsolutePath().pathString)\n@@ -126,7 +126,7 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\nsetAttribute(\"value\", \"-ea\")\n}\nnewChild(\"arg\") {\n- setAttribute(\"value\", \"-Xmx1024m\")\n+ setAttribute(\"value\", \"-Xmx2G\")\n}\n}\n// newChild(\"macro\") {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Memory for the generator increased to 2 GB |
426,496 | 26.02.2022 12:41:31 | -3,600 | c1c83e6ecf9b3079f0e9fadd0e385ceb7de2b7d9 | Model importer was exiting to early | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"diff": "<reference id=\"1153944258490\" name=\"variable\" index=\"2Gs0qQ\" />\n</concept>\n<concept id=\"1235566554328\" name=\"jetbrains.mps.baseLanguage.collections.structure.AnyOperation\" flags=\"nn\" index=\"2HwmR7\" />\n+ <concept id=\"1235566831861\" name=\"jetbrains.mps.baseLanguage.collections.structure.AllOperation\" flags=\"nn\" index=\"2HxqBE\" />\n<concept id=\"1235573135402\" name=\"jetbrains.mps.baseLanguage.collections.structure.SingletonSequenceCreator\" flags=\"nn\" index=\"2HTt$P\">\n<child id=\"1235573175711\" name=\"elementType\" index=\"2HTBi0\" />\n<child id=\"1235573187520\" name=\"singletonValue\" index=\"2HTEbv\" />\n</node>\n</node>\n<node concept=\"2tJIrI\" id=\"y4L82E2Bqa\" role=\"jymVt\" />\n+ <node concept=\"3clFb_\" id=\"Vwvkv3TGQf\" role=\"jymVt\">\n+ <property role=\"TrG5h\" value=\"isDone\" />\n+ <node concept=\"10P_77\" id=\"Vwvkv3TOWL\" role=\"3clF45\" />\n+ <node concept=\"3Tm1VV\" id=\"Vwvkv3TGQi\" role=\"1B3o_S\" />\n+ <node concept=\"3clFbS\" id=\"Vwvkv3TGQj\" role=\"3clF47\">\n+ <node concept=\"3clFbF\" id=\"Vwvkv3TS4r\" role=\"3cqZAp\">\n+ <node concept=\"1Wc70l\" id=\"Vwvkv3TZ9v\" role=\"3clFbG\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3TZZg\" role=\"3uHU7w\">\n+ <node concept=\"1rXfSq\" id=\"Vwvkv3TZGP\" role=\"2Oq$k0\">\n+ <ref role=\"37wK5l\" node=\"74bn2Kw$LD4\" resolve=\"getOwnedBindings\" />\n+ </node>\n+ <node concept=\"2HxqBE\" id=\"Vwvkv3U0Bf\" role=\"2OqNvi\">\n+ <node concept=\"1bVj0M\" id=\"Vwvkv3U0Bh\" role=\"23t8la\">\n+ <node concept=\"3clFbS\" id=\"Vwvkv3U0Bi\" role=\"1bW5cS\">\n+ <node concept=\"3clFbF\" id=\"Vwvkv3U1ig\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3U1t1\" role=\"3clFbG\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3U1if\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"Vwvkv3U0Bj\" resolve=\"it\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3U1$C\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" node=\"Vwvkv3TGQf\" resolve=\"isDone\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"Rh6nW\" id=\"Vwvkv3U0Bj\" role=\"1bW2Oz\">\n+ <property role=\"TrG5h\" value=\"it\" />\n+ <node concept=\"2jxLKc\" id=\"Vwvkv3U0Bk\" role=\"1tU5fm\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"1Wc70l\" id=\"Vwvkv3TW5q\" role=\"3uHU7B\">\n+ <node concept=\"3fqX7Q\" id=\"Vwvkv3TVz6\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3TVz8\" role=\"3fr31v\">\n+ <ref role=\"3cqZAo\" node=\"4_k_9wJs5xB\" resolve=\"isSynchronizing\" />\n+ </node>\n+ </node>\n+ <node concept=\"3clFbC\" id=\"Vwvkv3TYz5\" role=\"3uHU7w\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3TWye\" role=\"3uHU7B\">\n+ <ref role=\"3cqZAo\" node=\"y4L82E25Iw\" resolve=\"initialSyncDirection\" />\n+ </node>\n+ <node concept=\"10Nm6u\" id=\"Vwvkv3TYJk\" role=\"3uHU7w\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2tJIrI\" id=\"Vwvkv3TDHa\" role=\"jymVt\" />\n<node concept=\"3clFb_\" id=\"6hBdEE_lC8I\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"getBranch\" />\n<node concept=\"3uibUv\" id=\"6hBdEE_lKA9\" role=\"3clF45\">\n"
},
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.plugin.mps",
"diff": "<import index=\"i9so\" ref=\"r:9e5578e0-37f0-4c9b-a301-771bcb453678(jetbrains.mps.make.script)\" />\n<import index=\"z1c5\" ref=\"86441d7a-e194-42da-81a5-2161ec62a379/java:jetbrains.mps.project(MPS.Workbench/)\" />\n<import index=\"1ctc\" ref=\"6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.stream(JDK/)\" />\n+ <import index=\"hvt5\" ref=\"0a2651ab-f212-45c2-a2f0-343e76cbc26b/java:org.modelix.model(org.modelix.model.client/)\" />\n<import index=\"guwi\" ref=\"6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)\" implicit=\"true\" />\n<import index=\"71xd\" ref=\"742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)\" implicit=\"true\" />\n- <import index=\"hvt5\" ref=\"0a2651ab-f212-45c2-a2f0-343e76cbc26b/java:org.modelix.model(org.modelix.model.client/)\" implicit=\"true\" />\n<import index=\"tprs\" ref=\"r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)\" implicit=\"true\" />\n<import index=\"tpcu\" ref=\"r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)\" implicit=\"true\" />\n<import index=\"mk90\" ref=\"6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.progress(MPS.Core/)\" implicit=\"true\" />\n<child id=\"1199569906740\" name=\"parameter\" index=\"1bW2Oz\" />\n<child id=\"1199569916463\" name=\"body\" index=\"1bW5cS\" />\n</concept>\n+ <concept id=\"1225797177491\" name=\"jetbrains.mps.baseLanguage.closures.structure.InvokeFunctionOperation\" flags=\"nn\" index=\"1Bd96e\" />\n</language>\n<language id=\"f2801650-65d5-424e-bb1b-463a8781b786\" name=\"jetbrains.mps.baseLanguage.javadoc\">\n<concept id=\"6832197706140518104\" name=\"jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference\" flags=\"ng\" index=\"zr_55\" />\n<ref role=\"37wK5l\" node=\"2pMrK1SotOq\" resolve=\"withTheOnlyProject\" />\n<node concept=\"1bVj0M\" id=\"6dPmVFx8vRS\" role=\"37wK5m\">\n<node concept=\"3clFbS\" id=\"6dPmVFx8vRT\" role=\"1bW5cS\">\n+ <node concept=\"3clFbF\" id=\"Vwvkv3YdEt\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3YdEq\" role=\"3clFbG\">\n+ <node concept=\"10M0yZ\" id=\"Vwvkv3YdEr\" role=\"2Oq$k0\">\n+ <ref role=\"1PxDUh\" to=\"wyt6:~System\" resolve=\"System\" />\n+ <ref role=\"3cqZAo\" to=\"wyt6:~System.out\" resolve=\"out\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3YdEs\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"guwi:~PrintStream.println(java.lang.String)\" resolve=\"println\" />\n+ <node concept=\"3cpWs3\" id=\"Vwvkv3YjQO\" role=\"37wK5m\">\n+ <node concept=\"Xl_RD\" id=\"Vwvkv3Yk7G\" role=\"3uHU7w\">\n+ <property role=\"Xl_RC\" value=\" opened\" />\n+ </node>\n+ <node concept=\"3cpWs3\" id=\"Vwvkv3Yhni\" role=\"3uHU7B\">\n+ <node concept=\"Xl_RD\" id=\"Vwvkv3Yf3j\" role=\"3uHU7B\">\n+ <property role=\"Xl_RC\" value=\"Project \" />\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3Yim0\" role=\"3uHU7w\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3YhCe\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"6dPmVFx8$u9\" resolve=\"project\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3Yj8n\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"z1c4:~Project.getName()\" resolve=\"getName\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2Gpval\" id=\"Vwvkv3Yq41\" role=\"3cqZAp\">\n+ <node concept=\"2GrKxI\" id=\"Vwvkv3Yq43\" role=\"2Gsz3X\">\n+ <property role=\"TrG5h\" value=\"module\" />\n+ </node>\n+ <node concept=\"3clFbS\" id=\"Vwvkv3Yq47\" role=\"2LFqv$\">\n+ <node concept=\"3clFbF\" id=\"Vwvkv3Ys5i\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3Ys5f\" role=\"3clFbG\">\n+ <node concept=\"10M0yZ\" id=\"Vwvkv3Ys5g\" role=\"2Oq$k0\">\n+ <ref role=\"1PxDUh\" to=\"wyt6:~System\" resolve=\"System\" />\n+ <ref role=\"3cqZAo\" to=\"wyt6:~System.out\" resolve=\"out\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3Ys5h\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"guwi:~PrintStream.println(java.lang.String)\" resolve=\"println\" />\n+ <node concept=\"3cpWs3\" id=\"Vwvkv3YyBd\" role=\"37wK5m\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3Y_FQ\" role=\"3uHU7w\">\n+ <node concept=\"2GrUjf\" id=\"Vwvkv3Y$Dy\" role=\"2Oq$k0\">\n+ <ref role=\"2Gs0qQ\" node=\"Vwvkv3Yq43\" resolve=\"module\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3YAFA\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"lui2:~SModule.getModuleName()\" resolve=\"getModuleName\" />\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"Vwvkv3YtzZ\" role=\"3uHU7B\">\n+ <property role=\"Xl_RC\" value=\"Project module: \" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3YmIm\" role=\"2GsD0m\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3Ymh2\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"6dPmVFx8$u9\" resolve=\"project\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3YnQe\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"z1c4:~IProject.getProjectModules()\" resolve=\"getProjectModules\" />\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"3cpWs8\" id=\"6dPmVFxaEAO\" role=\"3cqZAp\">\n<node concept=\"3cpWsn\" id=\"6dPmVFxaEAP\" role=\"3cpWs9\">\n<property role=\"TrG5h\" value=\"repositoryId\" />\n</node>\n</node>\n<node concept=\"3clFbH\" id=\"6dPmVFxaMH6\" role=\"3cqZAp\" />\n- <node concept=\"3clFbF\" id=\"6dPmVFxaDvy\" role=\"3cqZAp\">\n- <node concept=\"2OqwBi\" id=\"6dPmVFxaDY3\" role=\"3clFbG\">\n- <node concept=\"37vLTw\" id=\"6dPmVFxaDvt\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"6dPmVFx9X_d\" resolve=\"connection\" />\n- </node>\n- <node concept=\"liA8E\" id=\"6dPmVFxaEnB\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"csg2:6dPmVFxbNHl\" resolve=\"addBinding\" />\n- <node concept=\"37vLTw\" id=\"6dPmVFxaF_L\" role=\"37wK5m\">\n- <ref role=\"3cqZAo\" node=\"6dPmVFxaEAP\" resolve=\"repositoryId\" />\n+ <node concept=\"3cpWs8\" id=\"Vwvkv3Xp_8\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"Vwvkv3Xp_9\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"binding\" />\n+ <node concept=\"3uibUv\" id=\"Vwvkv3Xppu\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"csg2:7ZZZU$ltp0c\" resolve=\"ProjectBinding\" />\n</node>\n- <node concept=\"2ShNRf\" id=\"6dPmVFxaHbI\" role=\"37wK5m\">\n- <node concept=\"1pGfFk\" id=\"6dPmVFxaJnJ\" role=\"2ShVmc\">\n+ <node concept=\"2ShNRf\" id=\"Vwvkv3Xp_a\" role=\"33vP2m\">\n+ <node concept=\"1pGfFk\" id=\"Vwvkv3Xp_b\" role=\"2ShVmc\">\n<ref role=\"37wK5l\" to=\"csg2:7ZZZU$ltqnp\" resolve=\"ProjectBinding\" />\n- <node concept=\"10QFUN\" id=\"6dPmVFxbE28\" role=\"37wK5m\">\n- <node concept=\"37vLTw\" id=\"6dPmVFxbE27\" role=\"10QFUP\">\n+ <node concept=\"10QFUN\" id=\"Vwvkv3Xp_c\" role=\"37wK5m\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3Xp_d\" role=\"10QFUP\">\n<ref role=\"3cqZAo\" node=\"6dPmVFx8$u9\" resolve=\"project\" />\n</node>\n- <node concept=\"3uibUv\" id=\"6dPmVFxbE23\" role=\"10QFUM\">\n+ <node concept=\"3uibUv\" id=\"Vwvkv3Xp_e\" role=\"10QFUM\">\n<ref role=\"3uigEE\" to=\"z1c3:~MPSProject\" resolve=\"MPSProject\" />\n</node>\n</node>\n- <node concept=\"37vLTw\" id=\"6dPmVFxby19\" role=\"37wK5m\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3Xp_f\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"6dPmVFxbwmZ\" resolve=\"projectNodeId\" />\n</node>\n- <node concept=\"Rm8GO\" id=\"6dPmVFxaLFI\" role=\"37wK5m\">\n+ <node concept=\"Rm8GO\" id=\"Vwvkv3Xp_g\" role=\"37wK5m\">\n<ref role=\"Rm8GQ\" to=\"csg2:4_k_9wJhglC\" resolve=\"TO_CLOUD\" />\n<ref role=\"1Px2BO\" to=\"csg2:4_k_9wJhes5\" resolve=\"SyncDirection\" />\n</node>\n</node>\n</node>\n- <node concept=\"1bVj0M\" id=\"6dPmVFxc6bw\" role=\"37wK5m\">\n- <node concept=\"3clFbS\" id=\"6dPmVFxc6by\" role=\"1bW5cS\">\n- <node concept=\"3clFbF\" id=\"6dPmVFxck$4\" role=\"3cqZAp\">\n- <node concept=\"2OqwBi\" id=\"6dPmVFxck$5\" role=\"3clFbG\">\n- <node concept=\"10M0yZ\" id=\"6dPmVFxck$6\" role=\"2Oq$k0\">\n- <ref role=\"1PxDUh\" to=\"wyt6:~System\" resolve=\"System\" />\n- <ref role=\"3cqZAo\" to=\"wyt6:~System.out\" resolve=\"out\" />\n</node>\n- <node concept=\"liA8E\" id=\"6dPmVFxck$7\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"guwi:~PrintStream.println(java.lang.String)\" resolve=\"println\" />\n- <node concept=\"Xl_RD\" id=\"6dPmVFxck$8\" role=\"37wK5m\">\n- <property role=\"Xl_RC\" value=\"<MODEL IMPORT COMPLETED SUCCESSFULLY>\" />\n</node>\n+ <node concept=\"3clFbF\" id=\"6dPmVFxaDvy\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"6dPmVFxaDY3\" role=\"3clFbG\">\n+ <node concept=\"37vLTw\" id=\"6dPmVFxaDvt\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"6dPmVFx9X_d\" resolve=\"connection\" />\n</node>\n+ <node concept=\"liA8E\" id=\"6dPmVFxaEnB\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"csg2:6dPmVFxbNHl\" resolve=\"addBinding\" />\n+ <node concept=\"37vLTw\" id=\"6dPmVFxaF_L\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"6dPmVFxaEAP\" resolve=\"repositoryId\" />\n</node>\n+ <node concept=\"37vLTw\" id=\"Vwvkv3Xp_h\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"Vwvkv3Xp_9\" resolve=\"binding\" />\n</node>\n+ <node concept=\"1bVj0M\" id=\"6dPmVFxc6bw\" role=\"37wK5m\">\n+ <property role=\"3yWfEV\" value=\"true\" />\n+ <node concept=\"3clFbS\" id=\"6dPmVFxc6by\" role=\"1bW5cS\">\n<node concept=\"3clFbF\" id=\"2ti6ENSLqjV\" role=\"3cqZAp\">\n<node concept=\"1rXfSq\" id=\"2ti6ENSLqjT\" role=\"3clFbG\">\n<ref role=\"37wK5l\" node=\"2ti6ENSKWd_\" resolve=\"waitForWriteToModelServer\" />\n+ <node concept=\"37vLTw\" id=\"Vwvkv3XqMY\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"Vwvkv3Xp_9\" resolve=\"binding\" />\n+ </node>\n<node concept=\"2OqwBi\" id=\"2ti6ENSLqJ3\" role=\"37wK5m\">\n<node concept=\"37vLTw\" id=\"2ti6ENSLqJ4\" role=\"2Oq$k0\">\n<ref role=\"3cqZAo\" node=\"6dPmVFx9X_d\" resolve=\"connection\" />\n<node concept=\"1bVj0M\" id=\"2ti6ENSLrOP\" role=\"37wK5m\">\n<property role=\"3yWfEV\" value=\"true\" />\n<node concept=\"3clFbS\" id=\"2ti6ENSLrOR\" role=\"1bW5cS\">\n+ <node concept=\"3clFbF\" id=\"6dPmVFxck$4\" role=\"3cqZAp\">\n+ <node concept=\"2OqwBi\" id=\"6dPmVFxck$5\" role=\"3clFbG\">\n+ <node concept=\"10M0yZ\" id=\"6dPmVFxck$6\" role=\"2Oq$k0\">\n+ <ref role=\"1PxDUh\" to=\"wyt6:~System\" resolve=\"System\" />\n+ <ref role=\"3cqZAo\" to=\"wyt6:~System.out\" resolve=\"out\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"6dPmVFxck$7\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"guwi:~PrintStream.println(java.lang.String)\" resolve=\"println\" />\n+ <node concept=\"Xl_RD\" id=\"6dPmVFxck$8\" role=\"37wK5m\">\n+ <property role=\"Xl_RC\" value=\"<MODEL IMPORT COMPLETED SUCCESSFULLY>\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"3clFbF\" id=\"2ti6ENSI$I3\" role=\"3cqZAp\">\n<node concept=\"2OqwBi\" id=\"2ti6ENSI_Jf\" role=\"3clFbG\">\n<node concept=\"2YIFZM\" id=\"2ti6ENSI_4S\" role=\"2Oq$k0\">\n<node concept=\"2tJIrI\" id=\"2ti6ENSKTCd\" role=\"jymVt\" />\n<node concept=\"3clFb_\" id=\"2ti6ENSKWd_\" role=\"jymVt\">\n<property role=\"TrG5h\" value=\"waitForWriteToModelServer\" />\n+ <node concept=\"37vLTG\" id=\"Vwvkv3Tumv\" role=\"3clF46\">\n+ <property role=\"TrG5h\" value=\"binding\" />\n+ <node concept=\"3uibUv\" id=\"Vwvkv3TwPw\" role=\"1tU5fm\">\n+ <ref role=\"3uigEE\" to=\"csg2:2FX9uaKMyso\" resolve=\"Binding\" />\n+ </node>\n+ </node>\n<node concept=\"37vLTG\" id=\"2ti6ENSLfKm\" role=\"3clF46\">\n<property role=\"TrG5h\" value=\"client\" />\n<node concept=\"3uibUv\" id=\"2ti6ENSL$M0\" role=\"1tU5fm\">\n<node concept=\"3clFbS\" id=\"2ti6ENSMkwR\" role=\"1zc67A\" />\n</node>\n<node concept=\"3clFbS\" id=\"2ti6ENSMkrK\" role=\"1zxBo7\">\n+ <node concept=\"3cpWs8\" id=\"Vwvkv3ZG32\" role=\"3cqZAp\">\n+ <node concept=\"3cpWsn\" id=\"Vwvkv3ZG33\" role=\"3cpWs9\">\n+ <property role=\"TrG5h\" value=\"condition\" />\n+ <node concept=\"1ajhzC\" id=\"Vwvkv3ZG30\" role=\"1tU5fm\">\n+ <node concept=\"10P_77\" id=\"Vwvkv3ZG31\" role=\"1ajl9A\" />\n+ </node>\n+ <node concept=\"1bVj0M\" id=\"Vwvkv3ZG34\" role=\"33vP2m\">\n+ <node concept=\"3clFbS\" id=\"Vwvkv3ZG35\" role=\"1bW5cS\">\n+ <node concept=\"3clFbF\" id=\"Vwvkv3ZG36\" role=\"3cqZAp\">\n+ <node concept=\"1Wc70l\" id=\"Vwvkv3ZJdP\" role=\"3clFbG\">\n+ <node concept=\"1Wc70l\" id=\"Vwvkv3ZICk\" role=\"3uHU7B\">\n+ <node concept=\"3clFbC\" id=\"Vwvkv3ZHbN\" role=\"3uHU7B\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3ZG3e\" role=\"3uHU7B\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3ZG3f\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"2ti6ENSLfKm\" resolve=\"client\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3ZG3g\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"hvt5:~IKeyValueStore.getPendingSize()\" resolve=\"getPendingSize\" />\n+ </node>\n+ </node>\n+ <node concept=\"3cmrfG\" id=\"Vwvkv3ZG3h\" role=\"3uHU7w\">\n+ <property role=\"3cmrfH\" value=\"0\" />\n+ </node>\n+ </node>\n+ <node concept=\"3clFbC\" id=\"Vwvkv3ZHP9\" role=\"3uHU7w\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3ZG3j\" role=\"3uHU7B\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3ZG3k\" role=\"2Oq$k0\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3ZG3l\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"2ti6ENSLfKm\" resolve=\"client\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3ZG3m\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"5440:~IModelClient.getAsyncStore()\" resolve=\"getAsyncStore\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3ZG3n\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"hvt5:~IKeyValueStore.getPendingSize()\" resolve=\"getPendingSize\" />\n+ </node>\n+ </node>\n+ <node concept=\"3cmrfG\" id=\"Vwvkv3ZG3o\" role=\"3uHU7w\">\n+ <property role=\"3cmrfH\" value=\"0\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3ZG39\" role=\"3uHU7w\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3ZG3a\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"Vwvkv3Tumv\" resolve=\"binding\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"Vwvkv3ZG3b\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"csg2:Vwvkv3TGQf\" resolve=\"isDone\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n<node concept=\"2$JKZl\" id=\"2ti6ENSLn6v\" role=\"3cqZAp\">\n<node concept=\"3clFbS\" id=\"2ti6ENSLn6x\" role=\"2LFqv$\">\n<node concept=\"3clFbF\" id=\"2ti6ENSL7Vd\" role=\"3cqZAp\">\n<ref role=\"37wK5l\" to=\"wyt6:~Thread.sleep(long)\" resolve=\"sleep\" />\n<ref role=\"1Pybhc\" to=\"wyt6:~Thread\" resolve=\"Thread\" />\n<node concept=\"3cmrfG\" id=\"2ti6ENSL85J\" role=\"37wK5m\">\n- <property role=\"3cmrfH\" value=\"100\" />\n+ <property role=\"3cmrfH\" value=\"1000\" />\n</node>\n</node>\n</node>\n+ <node concept=\"3clFbJ\" id=\"Vwvkv3ZJWd\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"Vwvkv3ZJWf\" role=\"3clFbx\">\n+ <node concept=\"3N13vt\" id=\"Vwvkv3ZLm3\" role=\"3cqZAp\" />\n</node>\n- <node concept=\"22lmx$\" id=\"2ti6ENSLD59\" role=\"2$JKZa\">\n- <node concept=\"3eOSWO\" id=\"2ti6ENSLF7D\" role=\"3uHU7w\">\n- <node concept=\"3cmrfG\" id=\"2ti6ENSLFdp\" role=\"3uHU7w\">\n- <property role=\"3cmrfH\" value=\"0\" />\n+ <node concept=\"3fqX7Q\" id=\"Vwvkv3ZKTi\" role=\"3clFbw\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3ZKTk\" role=\"3fr31v\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3ZKTl\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"Vwvkv3ZG33\" resolve=\"condition\" />\n</node>\n- <node concept=\"2OqwBi\" id=\"2ti6ENSLDW7\" role=\"3uHU7B\">\n- <node concept=\"2OqwBi\" id=\"2ti6ENSLD_6\" role=\"2Oq$k0\">\n- <node concept=\"37vLTw\" id=\"2ti6ENSLDiC\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"2ti6ENSLfKm\" resolve=\"client\" />\n+ <node concept=\"1Bd96e\" id=\"Vwvkv3ZKTm\" role=\"2OqNvi\" />\n</node>\n- <node concept=\"liA8E\" id=\"2ti6ENSLDKQ\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"5440:~IModelClient.getAsyncStore()\" resolve=\"getAsyncStore\" />\n</node>\n</node>\n- <node concept=\"liA8E\" id=\"2ti6ENSLEef\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"hvt5:~IKeyValueStore.getPendingSize()\" resolve=\"getPendingSize\" />\n+ <node concept=\"3clFbF\" id=\"Vwvkv3ZLpH\" role=\"3cqZAp\">\n+ <node concept=\"2YIFZM\" id=\"Vwvkv3ZLpI\" role=\"3clFbG\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Thread.sleep(long)\" resolve=\"sleep\" />\n+ <ref role=\"1Pybhc\" to=\"wyt6:~Thread\" resolve=\"Thread\" />\n+ <node concept=\"3cmrfG\" id=\"Vwvkv3ZLpJ\" role=\"37wK5m\">\n+ <property role=\"3cmrfH\" value=\"1000\" />\n</node>\n</node>\n</node>\n- <node concept=\"3eOSWO\" id=\"2ti6ENSLo4N\" role=\"3uHU7B\">\n- <node concept=\"2OqwBi\" id=\"2ti6ENSLfhp\" role=\"3uHU7B\">\n- <node concept=\"37vLTw\" id=\"2ti6ENSLioN\" role=\"2Oq$k0\">\n- <ref role=\"3cqZAo\" node=\"2ti6ENSLfKm\" resolve=\"client\" />\n+ <node concept=\"3clFbJ\" id=\"Vwvkv3ZLDn\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"Vwvkv3ZLDo\" role=\"3clFbx\">\n+ <node concept=\"3N13vt\" id=\"Vwvkv3ZLDp\" role=\"3cqZAp\" />\n</node>\n- <node concept=\"liA8E\" id=\"2ti6ENSLfht\" role=\"2OqNvi\">\n- <ref role=\"37wK5l\" to=\"hvt5:~IKeyValueStore.getPendingSize()\" resolve=\"getPendingSize\" />\n+ <node concept=\"3fqX7Q\" id=\"Vwvkv3ZLDq\" role=\"3clFbw\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3ZLDr\" role=\"3fr31v\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3ZLDs\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"Vwvkv3ZG33\" resolve=\"condition\" />\n</node>\n+ <node concept=\"1Bd96e\" id=\"Vwvkv3ZLDt\" role=\"2OqNvi\" />\n</node>\n- <node concept=\"3cmrfG\" id=\"2ti6ENSLoaz\" role=\"3uHU7w\">\n- <property role=\"3cmrfH\" value=\"0\" />\n</node>\n</node>\n+ <node concept=\"3clFbF\" id=\"Vwvkv3ZLNT\" role=\"3cqZAp\">\n+ <node concept=\"2YIFZM\" id=\"Vwvkv3ZLNU\" role=\"3clFbG\">\n+ <ref role=\"37wK5l\" to=\"wyt6:~Thread.sleep(long)\" resolve=\"sleep\" />\n+ <ref role=\"1Pybhc\" to=\"wyt6:~Thread\" resolve=\"Thread\" />\n+ <node concept=\"3cmrfG\" id=\"Vwvkv3ZLNV\" role=\"37wK5m\">\n+ <property role=\"3cmrfH\" value=\"1000\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3clFbJ\" id=\"Vwvkv3ZLNM\" role=\"3cqZAp\">\n+ <node concept=\"3clFbS\" id=\"Vwvkv3ZLNN\" role=\"3clFbx\">\n+ <node concept=\"3N13vt\" id=\"Vwvkv3ZLNO\" role=\"3cqZAp\" />\n+ </node>\n+ <node concept=\"3fqX7Q\" id=\"Vwvkv3ZLNP\" role=\"3clFbw\">\n+ <node concept=\"2OqwBi\" id=\"Vwvkv3ZLNQ\" role=\"3fr31v\">\n+ <node concept=\"37vLTw\" id=\"Vwvkv3ZLNR\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"Vwvkv3ZG33\" resolve=\"condition\" />\n+ </node>\n+ <node concept=\"1Bd96e\" id=\"Vwvkv3ZLNS\" role=\"2OqNvi\" />\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"3zACq4\" id=\"Vwvkv3ZM8p\" role=\"3cqZAp\" />\n+ </node>\n+ <node concept=\"3clFbT\" id=\"Vwvkv3ZJEW\" role=\"2$JKZa\">\n+ <property role=\"3clFbU\" value=\"true\" />\n</node>\n</node>\n<node concept=\"3clFbF\" id=\"2ti6ENSLoFc\" role=\"3cqZAp\">\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Model importer was exiting to early |
426,496 | 27.02.2022 11:24:58 | -3,600 | bfb29fceb7e1d32fd0b964cbb9a6d3b0eb651c89 | Mutliple versions of the headless-mps jar were on the class path | [
{
"change_type": "MODIFY",
"old_path": "headless-mps/build.gradle.kts",
"new_path": "headless-mps/build.gradle.kts",
"diff": "@@ -30,6 +30,6 @@ val copyDependencies = task(\"copyDependencies\", Copy::class) {\ninto(File(File(\"build\"), \"libs\"))\n}\n-tasks.getByName(\"assemble\") {\n+tasks.getByName(\"jar\") {\ndependsOn(copyDependencies)\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "update-workspace-manager.sh",
"new_path": "update-workspace-manager.sh",
"diff": "@@ -4,6 +4,6 @@ set -e\nrm -f modelix.version\n-./gradlew :workspace-manager:clean :workspace-manager:assemble\n+./gradlew :headless-mps:clean :workspace-manager:clean :workspace-manager:assemble\n./docker-build-workspace-manager.sh\nkubectl apply -f kubernetes/common/workspace-manager-deployment.yaml -f kubernetes/common/workspace-manager-service.yaml\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Mutliple versions of the headless-mps jar were on the class path |
426,496 | 28.02.2022 08:34:53 | -3,600 | 95312fdf123531af856213401f957e26ee17ffd9 | Use java 11 on github action
Switching to 13 before was an attempt to fix issues with connecting to
the itemis nexus. | [
{
"change_type": "MODIFY",
"old_path": ".github/workflows/integrationtests.yml",
"new_path": ".github/workflows/integrationtests.yml",
"diff": "@@ -22,10 +22,10 @@ jobs:\ngradle-runIntegrationTests-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}\ngradle-runIntegrationTests-\ngradle-\n- - name: Set up JDK 13\n+ - name: Set up JDK 11\nuses: actions/setup-java@v1\nwith:\n- java-version: 13\n+ java-version: 11\n- name: Integration Tests\nenv:\nGITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/modelclient.yml",
"new_path": ".github/workflows/modelclient.yml",
"diff": "@@ -22,10 +22,10 @@ jobs:\ngradle-build-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}\ngradle-build-\ngradle-\n- - name: Set up JDK 13\n+ - name: Set up JDK 11\nuses: actions/setup-java@v1\nwith:\n- java-version: 13\n+ java-version: 11\n- name: Assemble\nenv:\nGITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/modelserver.yml",
"new_path": ".github/workflows/modelserver.yml",
"diff": "@@ -12,10 +12,10 @@ jobs:\nsteps:\n- uses: actions/checkout@v1\n- - name: Set up JDK 13\n+ - name: Set up JDK 11\nuses: actions/setup-java@v1\nwith:\n- java-version: 13\n+ java-version: 11\n- uses: actions/[email protected]\nwith:\npath: |\n@@ -37,10 +37,10 @@ jobs:\nsteps:\n- uses: actions/checkout@v1\n- - name: Set up JDK 13\n+ - name: Set up JDK 11\nuses: actions/setup-java@v1\nwith:\n- java-version: 13\n+ java-version: 11\n- uses: actions/[email protected]\nwith:\npath: |\n@@ -62,10 +62,10 @@ jobs:\nsteps:\n- uses: actions/checkout@v1\n- - name: Set up JDK 13\n+ - name: Set up JDK 11\nuses: actions/setup-java@v1\nwith:\n- java-version: 13\n+ java-version: 11\n- uses: actions/[email protected]\nwith:\npath: |\n@@ -87,10 +87,10 @@ jobs:\nsteps:\n- uses: actions/checkout@v1\n- - name: Set up JDK 13\n+ - name: Set up JDK 11\nuses: actions/setup-java@v1\nwith:\n- java-version: 13\n+ java-version: 11\n- uses: actions/[email protected]\nwith:\npath: |\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/overallbuild.yml",
"new_path": ".github/workflows/overallbuild.yml",
"diff": "@@ -12,10 +12,10 @@ jobs:\nsteps:\n- uses: actions/checkout@v1\n- - name: Set up JDK 13\n+ - name: Set up JDK 11\nuses: actions/setup-java@v1\nwith:\n- java-version: 13\n+ java-version: 11\n- uses: actions/[email protected]\nwith:\npath: |\n"
},
{
"change_type": "MODIFY",
"old_path": ".github/workflows/publish.yml",
"new_path": ".github/workflows/publish.yml",
"diff": "@@ -10,10 +10,10 @@ jobs:\nruns-on: ubuntu-latest\nsteps:\n- uses: actions/checkout@v1\n- - name: Set up JDK 13\n+ - name: Set up JDK 11\nuses: actions/setup-java@v1\nwith:\n- java-version: 13\n+ java-version: 11\n- name: Use tag as version\nrun: echo \"${GITHUB_REF#refs/*/}\" > modelix.version\n- name: Build and Publish\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Use java 11 on github action
Switching to 13 before was an attempt to fix issues with connecting to
the itemis nexus. |
426,496 | 28.02.2022 08:36:06 | -3,600 | 869280c2f411e8bfca8241208338e9683b740a0f | gradle-build-plugin: Allow specifying the paths to search for modules | [
{
"change_type": "MODIFY",
"old_path": "gradle-build-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildPlugin.java",
"new_path": "gradle-build-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildPlugin.java",
"diff": "@@ -15,6 +15,7 @@ package org.modelix.gradle.mpsbuild;\nimport org.apache.commons.io.FileUtils;\nimport org.gradle.api.Action;\n+import org.gradle.api.GradleException;\nimport org.gradle.api.Plugin;\nimport org.gradle.api.Project;\nimport org.gradle.api.Task;\n@@ -68,16 +69,21 @@ public class MPSBuildPlugin implements Plugin<Project> {\nTask generatorAntScript = project.getTasks().create(\"generatorAntScript\");\nAction<Task> action = task -> {\nModulesMiner modulesMiner = new ModulesMiner();\n- File modulesFolder = project.getProjectDir();\n- System.out.println(\"Searching for modules in \" + modulesFolder.getAbsolutePath());\n- modulesMiner.searchInFolder(modulesFolder);\n+ for (Path modulePath : settings.resolveModulePaths(project.getProjectDir().toPath())) {\n+ System.out.println(\"Searching for modules in \" + modulePath);\n+ modulesMiner.searchInFolder(modulePath.toFile());\n+ }\n+ System.out.println(\"Found modules:\");\nfor (FoundModule module : modulesMiner.getModules().getModules().values()) {\n- System.out.println(\"Module found: \" + module.getOwner().getPath().getLocalAbsolutePath());\n+ System.out.println(\" \" + module.getOwner().getPath().getLocalAbsolutePath());\n}\n- String mpsPath = settings.getMpsPath();\n+ String mpsPath = settings.getMpsHome();\nif (mpsPath != null) {\nFile mpsHome = project.getProjectDir().toPath().resolve(Path.of(mpsPath)).normalize().toFile();\nSystem.out.println(\"mps.home = \" + mpsHome);\n+ if (!mpsHome.exists()) {\n+ throw new RuntimeException(mpsHome + \" doesn't exist\");\n+ }\nmodulesMiner.searchInFolder(mpsHome);\n}\nBuildScriptGenerator generator = new BuildScriptGenerator(modulesMiner, null);\n"
},
{
"change_type": "MODIFY",
"old_path": "gradle-build-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildSettings.java",
"new_path": "gradle-build-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildSettings.java",
"diff": "package org.modelix.gradle.mpsbuild;\nimport java.io.File;\n+import java.nio.file.Path;\n+import java.util.ArrayList;\n+import java.util.Collections;\n+import java.util.List;\n+import java.util.Set;\n+import java.util.stream.Collectors;\npublic class MPSBuildSettings {\n- private String mpsPath = null;\n- private boolean debug = false;\n+ private String mpsHome = null;\n+ private List<String> modules = new ArrayList<>();\npublic boolean usingExistingMps() {\n- return getMpsPath() != null;\n+ return getMpsHome() != null;\n}\npublic void validate() {\n// nothing to check at the moment\n}\n- public String getMpsPath() {\n- return this.mpsPath;\n+ public String getMpsHome() {\n+ return this.mpsHome;\n}\n- public void setMpsPath(String mpsPath) {\n- this.mpsPath = mpsPath;\n+ public void setMpsHome(String mpsHome) {\n+ this.mpsHome = mpsHome;\n}\n- public boolean isDebug() {\n- return debug;\n+ public void modules(String path) {\n+ this.modules.add(path);\n}\n- public void setDebug(boolean debug) {\n- this.debug = debug;\n+ public List<Path> resolveModulePaths(Path workdir) {\n+ if (modules.isEmpty()) return Collections.singletonList(workdir);\n+ return modules.stream().map(path -> workdir.resolve(path).normalize()).distinct().collect(Collectors.toList());\n}\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | gradle-build-plugin: Allow specifying the paths to search for modules |
426,496 | 28.02.2022 08:41:27 | -3,600 | 43ee35f17744f6ed71a9d40b29e83aed00684a7d | Renamed gradle-build-plugin to gradle-mpsbuild-plugin
It was a bit too generic before. | [
{
"change_type": "MODIFY",
"old_path": ".idea/gradle.xml",
"new_path": ".idea/gradle.xml",
"diff": "<option name=\"modules\">\n<set>\n<option value=\"$PROJECT_DIR$\" />\n- <option value=\"$PROJECT_DIR$/gradle-build-plugin\" />\n+ <option value=\"$PROJECT_DIR$/gradle-mpsbuild-plugin\" />\n<option value=\"$PROJECT_DIR$/gradle-plugin\" />\n<option value=\"$PROJECT_DIR$/graphql-server\" />\n<option value=\"$PROJECT_DIR$/headless-mps\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "generator-test-project/build.gradle",
"new_path": "generator-test-project/build.gradle",
"diff": "buildscript {\nrepositories {\n+ maven {\n+ url = uri(\"https://maven.pkg.github.com/modelix/modelix\")\n+ if (project.hasProperty(\"gpr.user\") && project.hasProperty(\"gpr.key\")) {\n+ credentials {\n+ username = project.findProperty(\"gpr.user\").toString()\n+ password = project.findProperty(\"gpr.key\").toString()\n+ }\n+ } else {\n+ logger.error(\"Please specify your github username (gpr.user) and access token (gpr.key) in ~/.gradle/gradle.properties\")\n+ }\n+ }\nmavenCentral()\nmavenLocal()\n}\ndependencies {\n- classpath group: 'org.modelix', name: 'gradle-build-plugin', version: '2020.3.5-202202271614-SNAPSHOT'\n+ classpath group: 'org.modelix', name: 'gradle-mpsbuild-plugin', version: '0.0.92'\n}\n}\n@@ -15,8 +26,10 @@ repositories {\n}\n-apply plugin: 'modelix-gradle-build-plugin'\n+apply plugin: 'modelix-gradle-mpsbuild-plugin'\nmpsBuild {\n- mpsPath = \"../artifacts/mps\"\n+ mpsHome \"../artifacts/mps\"\n+ modules \"languages\"\n+ modules \"solutions\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "generator-test-project/settings.gradle",
"new_path": "generator-test-project/settings.gradle",
"diff": "-rootProject.name = 'modelix-gradle-build-plugin-test'\n+rootProject.name = 'modelix-gradle-mpsbuild-plugin-test'\n"
},
{
"change_type": "RENAME",
"old_path": "gradle-build-plugin/build.gradle",
"new_path": "gradle-mpsbuild-plugin/build.gradle",
"diff": "@@ -52,7 +52,7 @@ publishing {\n}*/\n}\npublications {\n- modelixGradleBuildPlugin(MavenPublication) {\n+ modelixGradleMPSBuildPlugin(MavenPublication) {\ngroupId project.group\nversion project.version\n"
},
{
"change_type": "RENAME",
"old_path": "gradle-build-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildPlugin.java",
"new_path": "gradle-mpsbuild-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildPlugin.java",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "gradle-build-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildSettings.java",
"new_path": "gradle-mpsbuild-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildSettings.java",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "gradle-build-plugin/src/main/resources/META-INF/gradle-plugins/modelix-gradle-build-plugin.properties",
"new_path": "gradle-mpsbuild-plugin/src/main/resources/META-INF/gradle-plugins/modelix-gradle-build-plugin.properties",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "gradle-build-plugin/src/main/resources/log4j.xml",
"new_path": "gradle-mpsbuild-plugin/src/main/resources/log4j.xml",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "settings.gradle",
"new_path": "settings.gradle",
"diff": "@@ -13,5 +13,5 @@ include 'graphql-server'\ninclude 'workspace-manager'\ninclude 'workspace-client'\ninclude 'headless-mps'\n-include 'gradle-build-plugin'\n+include 'gradle-mpsbuild-plugin'\ninclude 'mps-build-tools'\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Renamed gradle-build-plugin to gradle-mpsbuild-plugin
It was a bit too generic before. |
426,496 | 28.02.2022 14:39:50 | -3,600 | ec1945af316196a75a36a9943d5adfeef6b6df6e | Projector appeared frozen while trying to download pako.min.js
It is now packaged into projector so that we don't have to wait for
a timeout of the connection to the CDN. | [
{
"change_type": "MODIFY",
"old_path": "Dockerfile-projector-base",
"new_path": "Dockerfile-projector-base",
"diff": "-FROM modelix/projector-mps:2020.3.5\n+FROM modelix/projector-mps:2020.3.5-202202281349\nUSER root\nCOPY install-plugins.sh /\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker-build-projector-mps.sh",
"diff": "+#!/bin/sh\n+\n+set -e\n+\n+# read variables from mps-version.properties\n+while IFS='=' read -r key value\n+do\n+ echo \"$key=$value\"\n+ eval \"${key}\"=\\${value}\n+done < \"mps-version.properties\"\n+echo \"MPS Version: $mpsVersion\"\n+echo \"MPS Major Version: $mpsMajorVersion\"\n+echo \"MPS Minor Version: $mpsMinorVersion\"\n+\n+modelixVersion=$( ./modelix-version.sh )\n+echo \"Modelix Version: $modelixVersion\"\n+\n+TIMESTAMP=\"$(date +\"%Y%m%d%H%M\")\"\n+\n+(\n+ cd ../\n+ if [ -d ./projector-server ]; then\n+ (\n+ cd projector-server\n+ git reset --hard\n+ git clean -xdf\n+ git pull\n+ )\n+ else\n+ git clone https://github.com/JetBrains/projector-server.git\n+ fi\n+ if [ -d ./projector-client ]; then\n+ (\n+ cd projector-client\n+ git reset --hard\n+ git clean -xdf\n+ git pull\n+\n+ # If the internet connection is restricted trying to downloading pako.min.js causes the browser to do nothing\n+ # until the connection times out. This appears like the link for opening a node in projector is broken.\n+ cd projector-client-web/src/main/resources\n+ wget https://cdn.jsdelivr.net/pako/1.0.3/pako.min.js\n+ sed -i.bak -E \"s/https:\\/\\/cdn.jsdelivr.net\\/pako\\/1.0.3\\/pako.min.js/pako.min.js/\" index.html\n+ )\n+ else\n+ git clone https://github.com/JetBrains/projector-client.git\n+ fi\n+ if [ -d ./projector-docker ]; then\n+ (\n+ cd projector-docker\n+ git reset --hard\n+ git clean -xdf\n+ git pull\n+ )\n+ else\n+ git clone https://github.com/JetBrains/projector-docker.git\n+ fi\n+\n+ cd projector-docker\n+ ./build-container.sh \"projector-mps\" \"https://download.jetbrains.com/mps/${mpsMajorVersion}/MPS-${mpsVersion}.tar.gz\"\n+)\n+\n+\n+docker tag projector-mps:latest \"modelix/projector-mps:${mpsMajorVersion}\"\n+docker push \"modelix/projector-mps:${mpsMajorVersion}\"\n+docker tag projector-mps:latest \"modelix/projector-mps:${mpsVersion}\"\n+docker push \"modelix/projector-mps:${mpsVersion}\"\n+docker tag projector-mps:latest \"modelix/projector-mps:${mpsVersion}-$TIMESTAMP\"\n+docker push \"modelix/projector-mps:${mpsVersion}-$TIMESTAMP\"\n+#docker tag projector-mps:latest \"modelix/projector-mps:${modelixVersion}\"\n+#docker push \"modelix/projector-mps:${modelixVersion}\"\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Projector appeared frozen while trying to download pako.min.js
It is now packaged into projector so that we don't have to wait for
a timeout of the connection to the CDN. |
426,496 | 28.02.2022 14:41:19 | -3,600 | 655f154f9acdb57877e34faef8b1cdb4973d5798 | <usedDevKit> in a solution file was not processed yet | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -129,7 +129,7 @@ class ModulesMiner() {\nif (node is Element) {\n// Why not just use the extracted UUIDs? Because there are also foreign IDs that are not UUIDs.\nwhen (node.tagName) {\n- \"dependency\", \"extendedLanguage\", \"extendedDevKit\", \"usedLanguage\", \"exported-solution\" -> {\n+ \"dependency\", \"extendedLanguage\", \"extendedDevKit\", \"usedLanguage\", \"exported-solution\", \"usedDevKit\" -> {\nval text = node.children().filterIsInstance<Text>().first().wholeText\naddDependency(moduleIdFromReference(text), DependencyType.Classpath, false)\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | <usedDevKit> in a solution file was not processed yet |
426,496 | 28.02.2022 14:57:31 | -3,600 | 8c6fb4dd7beb4c9a7555d9951c98ec84601922c7 | Include module name in the error message about missing dependencies | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"diff": "@@ -68,7 +68,7 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\n// if (dep.id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\nval resolved = availableModules.getModules()[dep.id]\nif (resolved == null && !dep.ignoreIfMissing) {\n- throw RuntimeException(\"Dependency ${dep.id} not found (used by ${usedBy.name})\")\n+ throw RuntimeException(\"Dependency ${dep.id}(${dep.moduleName}) not found (used by ${usedBy.name})\")\n}\nreturn resolved\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModuleDependency.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModuleDependency.kt",
"diff": "*/\npackage org.modelix.buildtools\n-data class ModuleDependency(val id: ModuleId, val type: DependencyType, val ignoreIfMissing: Boolean) {\n+data class ModuleDependency(val id: ModuleId, val moduleName: String?, val type: DependencyType, val ignoreIfMissing: Boolean) {\n+ constructor(idAndName: ModuleIdAndName, type: DependencyType, ignoreIfMissing: Boolean): this(idAndName.id, idAndName.name, type, ignoreIfMissing)\n+ constructor(id: ModuleId, type: DependencyType, ignoreIfMissing: Boolean): this(id, null, type, ignoreIfMissing)\n}\nenum class DependencyType {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModuleIdAndName.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.buildtools\n+\n+class ModuleIdAndName(val id: ModuleId, val name: String?) {\n+ override fun toString(): String {\n+ return \"$id($name)\"\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -121,9 +121,9 @@ class ModulesMiner() {\nvar name = doc.getAttribute(\"name\")\nif (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\nval module = FoundModule(uuid, name, owner)\n- val addDependency = { moduleId: ModuleId, type: DependencyType, ignoreIfMissing: Boolean ->\n- missedUUIDs -= moduleId.id\n- module.addDependency(ModuleDependency(moduleId, type, ignoreIfMissing))\n+ val addDependency = { moduleIdAndName: ModuleIdAndName, type: DependencyType, ignoreIfMissing: Boolean ->\n+ missedUUIDs -= moduleIdAndName.id.id\n+ module.addDependency(ModuleDependency(moduleIdAndName, type, ignoreIfMissing))\n}\ndoc.visitAll { node ->\nif (node is Element) {\n@@ -136,7 +136,7 @@ class ModulesMiner() {\n\"module\" -> {\nif (node.parentTagName() == \"dependencyVersions\") {\n//addDependency(moduleIdFromReference(node.getAttribute(\"reference\")), DependencyType.Model, true)\n- missedUUIDs -= moduleIdFromReference(node.getAttribute(\"reference\")).id\n+ missedUUIDs -= moduleIdFromReference(node.getAttribute(\"reference\")).id.id\n} else if (node.parentTagName() == \"dependencies\") {\naddDependency(moduleIdFromReference(node.getAttribute(\"ref\")), DependencyType.Model, false)\n}\n@@ -152,7 +152,7 @@ class ModulesMiner() {\naddDependency(moduleIdFromReference(node.getAttribute(\"name\")), DependencyType.Classpath, false)\n}\n\"generator\" -> {\n- missedUUIDs -= moduleIdFromReference(node.getAttribute(\"generatorUID\")).id\n+ missedUUIDs -= moduleIdFromReference(node.getAttribute(\"generatorUID\")).id.id\n}\n}\n}\n@@ -191,14 +191,14 @@ class ModulesMiner() {\n\"use\" -> {\nval id = langOrDevkit.getAttribute(\"id\")\nif (id.isNotEmpty()) {\n- module.addDependency(ModuleDependency(ModuleId(id), DependencyType.Generator, false))\n+ module.addDependency(ModuleDependency(ModuleId(id), null, DependencyType.Generator, false))\n}\n}\n\"devkit\" -> {\nval ref = langOrDevkit.getAttribute(\"ref\")\nif (ref.isNotEmpty()) {\n- val id = moduleIdFromReference(ref)\n- module.addDependency(ModuleDependency(id, DependencyType.Generator, false))\n+ val idAndName = moduleIdFromReference(ref)\n+ module.addDependency(ModuleDependency(idAndName, DependencyType.Generator, false))\n}\n}\n}\n@@ -243,15 +243,17 @@ class ModulesMiner() {\n}.map { it.value }.toSet()\n}\n- private fun moduleIdFromReference(text: String): ModuleId {\n+ private fun moduleIdFromReference(text: String): ModuleIdAndName {\n// 1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)\n- val matchResult = Regex(\"\"\"~?(.+)\\(.+\\)\"\"\").matchEntire(text)\n- return ModuleId(if (matchResult != null) matchResult.groupValues[1] else text)\n+ val matchResult = Regex(\"\"\"~?(.+)\\((.+)\\)\"\"\").matchEntire(text)\n+ if (matchResult == null) return ModuleIdAndName(ModuleId(text), null)\n+ return ModuleIdAndName(ModuleId(matchResult.groupValues[1]), matchResult.groupValues[2])\n}\n- private fun moduleIdFromLanguageRef(text: String): ModuleId {\n+ private fun moduleIdFromLanguageRef(text: String): ModuleIdAndName {\n// l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage\n- val matchResult = Regex(\"\"\"l:(.+):.+\"\"\").matchEntire(text)\n- return ModuleId(if (matchResult != null) matchResult.groupValues[1] else text)\n+ val matchResult = Regex(\"\"\"l:(.+):(.+)\"\"\").matchEntire(text)\n+ if (matchResult == null) return ModuleIdAndName(ModuleId(text), null)\n+ return ModuleIdAndName(ModuleId(matchResult.groupValues[1]), matchResult.groupValues[2])\n}\n}\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Include module name in the error message about missing dependencies |
426,496 | 28.02.2022 16:01:26 | -3,600 | f26e50e6a9323de68370d9e25364f242360608c4 | In the workspace definition modules can be excluded from generation | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"diff": "@@ -15,15 +15,11 @@ package org.modelix.buildtools\nimport org.modelix.headlessmps.ProcessExecutor\nimport org.w3c.dom.Document\n-import java.io.BufferedReader\nimport java.io.File\n-import java.io.InputStreamReader\n-import java.nio.charset.StandardCharsets\n-import java.util.concurrent.TimeUnit\nimport javax.xml.parsers.DocumentBuilderFactory\nimport kotlin.io.path.pathString\n-class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate: List<ModuleId>? = null) {\n+class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate: List<ModuleId>? = null, val ignoredModules: Set<ModuleId> = HashSet()) {\nfun buildModules(antScriptFile: File = File.createTempFile(\"mps-build-script\", \".xml\", File(\".\")), outputHandler: ((String)->Unit)? = null) {\nval xml = generateXML()\n@@ -46,7 +42,9 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\n}\nfun generateAnt(): Document {\n- val plan = generatePlan(modulesToGenerate ?: modulesMiner.getModules().getModules().values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toList())\n+ val modulesToGenerate_ = modulesToGenerate\n+ ?: modulesMiner.getModules().getModules().values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toList()\n+ val plan = generatePlan(modulesToGenerate_ - ignoredModules.toSet())\nval dbf = DocumentBuilderFactory.newInstance()\nval db = dbf.newDocumentBuilder()\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"diff": "@@ -68,7 +68,7 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\n// if (dep.id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\nval resolved = availableModules.getModules()[dep.id]\nif (resolved == null && !dep.ignoreIfMissing) {\n- throw RuntimeException(\"Dependency ${dep.id}(${dep.moduleName}) not found (used by ${usedBy.name})\")\n+ throw RuntimeException(\"Dependency ${dep.id}(${dep.moduleName}) not found (used by ${usedBy.name}(${usedBy.moduleId}))\")\n}\nreturn resolved\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/Workspace.kt",
"diff": "@@ -29,7 +29,8 @@ data class Workspace(var id: String,\nval gitRepositories: List<GitRepository> = listOf(),\nval mavenRepositories: List<MavenRepository> = listOf(),\nvar mavenDependencies: List<String> = listOf(),\n- val uploads: MutableList<String> = ArrayList())\n+ val uploads: MutableList<String> = ArrayList(),\n+ val ignoredModules: List<String> = ArrayList())\n@JvmInline\nvalue class WorkspaceHash(val hash: String) {\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"new_path": "workspace-manager/src/main/kotlin/org/modelix/workspace/manager/WorkspaceManager.kt",
"diff": "@@ -227,7 +227,7 @@ class WorkspaceManager {\nadditionalFolders.filter { it.exists() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it.toPath(), it.toPath())) }\njob.runSafely(WorkspaceBuildStatus.FailedBuild) {\n- val buildScriptGenerator = BuildScriptGenerator(modulesMiner)\n+ val buildScriptGenerator = BuildScriptGenerator(modulesMiner, ignoredModules = workspace.ignoredModules.map { ModuleId(it) }.toSet())\njob.runSafely {\nmodulesXml = xmlToString(buildModulesXml(buildScriptGenerator.modulesMiner.getModules()))\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | In the workspace definition modules can be excluded from generation |
426,496 | 28.02.2022 16:15:39 | -3,600 | 20b7b81e7f4c594a5a957a8ba692d0254b0b702c | Instead of <language slang="..." /> there is also <language id="..." fqName="..."/>
There is one solution that uses this different persistence in <languageVersions>. | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -143,7 +143,16 @@ class ModulesMiner() {\n}\n\"language\" -> {\nif (node.parentTagName() == \"languageVersions\") {\n- addDependency(moduleIdFromLanguageRef(node.getAttribute(\"slang\")), DependencyType.Generator, true)\n+ val slang = node.getAttribute(\"slang\")\n+ if (slang.isNotEmpty()) {\n+ addDependency(moduleIdFromLanguageRef(slang), DependencyType.Generator, true)\n+ } else {\n+ val id = node.getAttribute(\"id\")\n+ if (id.isNotEmpty()) {\n+ val fqName = node.getAttribute(\"fqName\")\n+ addDependency(ModuleIdAndName(ModuleId(id), fqName), DependencyType.Generator, true)\n+ }\n+ }\n} else if (node.parentTagName() == \"uses\") {\naddDependency(moduleIdFromLanguageRef(node.getAttribute(\"id\")), DependencyType.Generator, false)\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Instead of <language slang="..." /> there is also <language id="..." fqName="..."/>
There is one solution that uses this different persistence in <languageVersions>. |
426,496 | 28.02.2022 18:39:05 | -3,600 | 54904e43705a8d0bcf618d41a9ce0817b206384e | In the workspace definition modules can be excluded from generation (2) | [
{
"change_type": "MODIFY",
"old_path": "gradle-mpsbuild-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildPlugin.java",
"new_path": "gradle-mpsbuild-plugin/src/main/java/org/modelix/gradle/mpsbuild/MPSBuildPlugin.java",
"diff": "@@ -86,7 +86,7 @@ public class MPSBuildPlugin implements Plugin<Project> {\n}\nmodulesMiner.searchInFolder(mpsHome);\n}\n- BuildScriptGenerator generator = new BuildScriptGenerator(modulesMiner, null);\n+ BuildScriptGenerator generator = new BuildScriptGenerator(modulesMiner, null, Collections.emptySet());\nString xml = generator.generateXML();\ntry {\nFileUtils.writeStringToFile(antScriptFile, xml, StandardCharsets.UTF_8);\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | In the workspace definition modules can be excluded from generation (2) |
426,496 | 01.03.2022 08:09:42 | -3,600 | 31641862f56912534f27eca73625daae8d57ea5a | Ignored modules also don't throw an exception if they are missing
Before only the generator wasn't executed for them, but now also
a dependency to them is ignored. | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"diff": "@@ -149,7 +149,7 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\n}\nfun generatePlan(modulesToGenerate: List<ModuleId>): GenerationPlan {\n- val planBuilder = GenerationPlanBuilder(modulesMiner.getModules())\n+ val planBuilder = GenerationPlanBuilder(modulesMiner.getModules(), ignoredModules)\nplanBuilder.build(modulesToGenerate.mapNotNull { modulesMiner.getModules().getModules()[it] })\nreturn planBuilder.plan\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"diff": "*/\npackage org.modelix.buildtools\n-class GenerationPlanBuilder(val availableModules: FoundModules) {\n+class GenerationPlanBuilder(val availableModules: FoundModules, val ignoredModules: Set<ModuleId>) {\nval plan: GenerationPlan = GenerationPlan()\nprivate val processedModules: MutableSet<ModuleId> = HashSet()\nprivate val currentProcessingModules: MutableList<ModuleId> = ArrayList()\n@@ -67,7 +67,7 @@ class GenerationPlanBuilder(val availableModules: FoundModules) {\n// jetbrains.mps.lang.docComment doesn't exist (referenced in jetbrains.mps.lang.text)\n// if (dep.id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\nval resolved = availableModules.getModules()[dep.id]\n- if (resolved == null && !dep.ignoreIfMissing) {\n+ if (resolved == null && !(dep.ignoreIfMissing || ignoredModules.contains(dep.id))) {\nthrow RuntimeException(\"Dependency ${dep.id}(${dep.moduleName}) not found (used by ${usedBy.name}(${usedBy.moduleId}))\")\n}\nreturn resolved\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Ignored modules also don't throw an exception if they are missing
Before only the generator wasn't executed for them, but now also
a dependency to them is ignored. |
426,496 | 01.03.2022 09:58:34 | -3,600 | 8c7cfabf0c92ffc7756b2ce5aa6db9185087342f | Generator modules were not extracted and therefor dependencies to them failed the generator | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -40,10 +40,11 @@ class ModulesMiner() {\nwhen (file.extension.lowercase()) {\n// see jetbrains.mps.project.MPSExtentions\n\"msd\", \"mpl\", \"devkit\" -> {\n- val module = readModule(file, owner ?: SourceModuleOwner(origin.localModulePath(file)))\n+ readModule(file, owner ?: SourceModuleOwner(origin.localModulePath(file))).forEach { module ->\ndependenciesFromModels(module, file.parentFile)\nresult.addModule(module)\n}\n+ }\n\"jar\" -> {\nif (file.name == \"mps-workbench.jar\" && file.parentFile.name == \"lib\") {\n// This MPS plugin seems to use some old way of packaging a plugin\n@@ -54,18 +55,20 @@ class ModulesMiner() {\nval modules: MutableMap<String, FoundModule> = HashMap()\nZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\nif (entry.name == \"META-INF/module.xml\") {\n- val module = readModule(stream, libraryModuleOwner)\n+ readModule(stream, libraryModuleOwner).forEach { module ->\nresult.addModule(module)\nmodules[\"\"] = module\n}\n+ }\nwhen (entry.name.substringAfterLast('.', \"\").lowercase()) {\n\"msd\", \"mpl\", \"devkit\" -> {\n- val module = readModule(stream, libraryModuleOwner)\n+ readModule(stream, libraryModuleOwner).forEach { module ->\nresult.addModule(module)\nmodules[entry.name.substringBeforeLast(\"/\", \"\")] = module\n}\n}\n}\n+ }\nif (modules.isNotEmpty()) {\nZipUtil.iterate(file) { stream: InputStream, entry: ZipEntry ->\nwhen (entry.name.substringAfterLast('.', \"\").lowercase()) {\n@@ -108,11 +111,11 @@ class ModulesMiner() {\n}\n- private fun readModule(file: File, owner: ModuleOwner): FoundModule {\n+ private fun readModule(file: File, owner: ModuleOwner): List<FoundModule> {\nreturn FileInputStream(file).use { readModule(it, owner) }\n}\n- private fun readModule(file: InputStream, owner: ModuleOwner): FoundModule {\n+ private fun readModule(file: InputStream, owner: ModuleOwner): List<FoundModule> {\nval xml = readXmlFile(file)\nval missedUUIDs = extractModuleUUIDs(xmlToString(xml)).toMutableSet()\nval doc: Element = xml.documentElement\n@@ -121,12 +124,21 @@ class ModulesMiner() {\nvar name = doc.getAttribute(\"name\")\nif (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\nval module = FoundModule(uuid, name, owner)\n+ val modules = listOf(module) + readModule(doc, missedUUIDs, module)\n+ if (missedUUIDs.isNotEmpty()) {\n+ throw RuntimeException(\"More dependencies found for module $name: $missedUUIDs\")\n+ }\n+ return modules\n+ }\n+\n+ private fun readModule(node: Element, missedUUIDs: MutableSet<String>, module: FoundModule): List<FoundModule> {\nval addDependency = { moduleIdAndName: ModuleIdAndName, type: DependencyType, ignoreIfMissing: Boolean ->\nmissedUUIDs -= moduleIdAndName.id.id\nmodule.addDependency(ModuleDependency(moduleIdAndName, type, ignoreIfMissing))\n}\n- doc.visitAll { node ->\n- if (node is Element) {\n+ var moduleForChildren = module\n+ var modules: List<FoundModule> = listOf()\n+\n// Why not just use the extracted UUIDs? Because there are also foreign IDs that are not UUIDs.\nwhen (node.tagName) {\n\"dependency\", \"extendedLanguage\", \"extendedDevKit\", \"usedLanguage\", \"exported-solution\", \"usedDevKit\" -> {\n@@ -161,15 +173,24 @@ class ModulesMiner() {\naddDependency(moduleIdFromReference(node.getAttribute(\"name\")), DependencyType.Classpath, false)\n}\n\"generator\" -> {\n- missedUUIDs -= moduleIdFromReference(node.getAttribute(\"generatorUID\")).id.id\n+ var idString = node.getAttribute(\"generatorUID\")\n+ if (idString.isEmpty()) idString = node.getAttribute(\"uuid\")\n+ if (idString.isNotEmpty()) {\n+ val generatorId = moduleIdFromReference(idString).id\n+ missedUUIDs -= generatorId.id\n+ val generatorName = node.getAttribute(\"namespace\")\n+ val generatorModule = FoundModule(generatorId, generatorName, module.owner)\n+ moduleForChildren = generatorModule\n+ modules += generatorModule\n}\n}\n}\n+\n+ for (childElement in node.childElements()) {\n+ modules += readModule(childElement, missedUUIDs, moduleForChildren)\n}\n- if (missedUUIDs.isNotEmpty()) {\n- throw RuntimeException(\"More dependencies found for module $name: $missedUUIDs\")\n- }\n- return module\n+\n+ return modules\n}\nprivate fun dependenciesFromModels(module: FoundModule, file: File) {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Generator modules were not extracted and therefor dependencies to them failed the generator |
426,496 | 01.03.2022 11:18:58 | -3,600 | 55e74a12ada581875d933f976b355ca39599b931 | Dependency from a language to its generator(s) | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -112,7 +112,14 @@ class ModulesMiner() {\nprivate fun readModule(file: File, owner: ModuleOwner): List<FoundModule> {\n- return FileInputStream(file).use { readModule(it, owner) }\n+ return FileInputStream(file).use {\n+ val modules = readModule(it, owner)\n+ val first = modules.first()\n+ modules.drop(1).forEach {\n+ first.addDependency(ModuleDependency(it.moduleId, it.name, DependencyType.Generator, false))\n+ }\n+ modules\n+ }\n}\nprivate fun readModule(file: InputStream, owner: ModuleOwner): List<FoundModule> {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Dependency from a language to its generator(s) |
426,496 | 01.03.2022 12:34:45 | -3,600 | 67e3a3cab92adec0cd3dce2a27e3b62e8e02ef30 | Language files where included twice in the generator script
Because of the generator module that is stored in the same file. | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"diff": "@@ -111,9 +111,9 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\n}\nfor (chunk in plan.chunks) {\nnewChild(\"chunk\") {\n- for (module in chunk.modules) {\n+ for (module in chunk.modules.map { it.owner.path.getLocalAbsolutePath().pathString }.distinct()) {\nnewChild(\"module\") {\n- setAttribute(\"file\", module.owner.path.getLocalAbsolutePath().pathString)\n+ setAttribute(\"file\", module)\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -40,10 +40,9 @@ class ModulesMiner() {\nwhen (file.extension.lowercase()) {\n// see jetbrains.mps.project.MPSExtentions\n\"msd\", \"mpl\", \"devkit\" -> {\n- readModule(file, owner ?: SourceModuleOwner(origin.localModulePath(file))).forEach { module ->\n- dependenciesFromModels(module, file.parentFile)\n- result.addModule(module)\n- }\n+ val modules = readModule(file, owner ?: SourceModuleOwner(origin.localModulePath(file)))\n+ dependenciesFromModels(modules.first(), file.parentFile)\n+ modules.forEach { result.addModule(it) }\n}\n\"jar\" -> {\nif (file.name == \"mps-workbench.jar\" && file.parentFile.name == \"lib\") {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Language files where included twice in the generator script
Because of the generator module that is stored in the same file. |
426,496 | 01.03.2022 14:20:38 | -3,600 | e8e135f3112b7335aaa4a2009c1b5d22fbad9117 | More work on dependencies | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/FoundModule.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/FoundModule.kt",
"diff": "*/\npackage org.modelix.buildtools\n-class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwner) {\n+class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwner, val isGenerator: Boolean = false) {\nval dependencies: MutableSet<ModuleDependency> = LinkedHashSet()\ninit {\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/FoundModules.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/FoundModules.kt",
"diff": "@@ -55,7 +55,11 @@ class FoundModules {\nval existing = getModules()[module.moduleId]\nif (existing != null) {\nif (existing.owner != module.owner) {\n- println(\"Duplicate module ${module.moduleId} in ${module.owner.path.getLocalAbsolutePath()} and ${existing.owner.path.getLocalAbsolutePath()}\")\n+ println(\"\"\"\n+ Duplicate module ${module.moduleId}\n+ in ${module.owner.path.getLocalAbsolutePath()}\n+ and ${existing.owner.path.getLocalAbsolutePath()}\n+ \"\"\".trimIndent())\n// throw RuntimeException(\"Module ${module.moduleId} (${module.name}) already exists\")\n}\nexisting.dependencies += module.dependencies\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"diff": "@@ -35,9 +35,14 @@ class GenerationPlanBuilder(val availableModules: FoundModules, val ignoredModul\nval cycleStart = currentProcessingModules.indexOf(dependency.moduleId)\nif (cycleStart != -1) {\ncycleIds = currentProcessingModules.drop(cycleStart) + dependency.moduleId\n+ val isGenerator: (ModuleId)->Boolean = { availableModules.getModules()[it]?.let { it.isGenerator } ?: false }\n+ if (cycleIds.distinct().filter { !isGenerator(it) }.size > 1) {\nprintln(\"Dependency cycle detected: \" + cycleIds.map { availableModules.getModules()[it]?.name }.joinToString(\" -> \"))\nval chunkIndex = plan.getHighestChunkIndex(cycleIds).coerceAtLeast(0)\ncycleIds.forEach { forcedChunkIndex[it] = chunkIndex }\n+ } else {\n+ cycleIds = null\n+ }\n}\n}\nbuild(dependency)\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModuleOwner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModuleOwner.kt",
"diff": "@@ -16,7 +16,7 @@ package org.modelix.buildtools\nimport kotlin.io.path.pathString\nabstract class ModuleOwner(val path: ModulePath) {\n- val modules: MutableMap<ModuleId, FoundModule> = HashMap()\n+ val modules: MutableMap<ModuleId, FoundModule> = LinkedHashMap()\nfun getWorkspaceRelativePath(): String {\nreturn \"\\$MODELIX_WORKSPACE\\$/\" + path.getWorkspaceRelativePath().pathString\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -41,9 +41,11 @@ class ModulesMiner() {\n// see jetbrains.mps.project.MPSExtentions\n\"msd\", \"mpl\", \"devkit\" -> {\nval modules = readModule(file, owner ?: SourceModuleOwner(origin.localModulePath(file)))\n+ if (modules.isNotEmpty()) {\ndependenciesFromModels(modules.first(), file.parentFile)\nmodules.forEach { result.addModule(it) }\n}\n+ }\n\"jar\" -> {\nif (file.name == \"mps-workbench.jar\" && file.parentFile.name == \"lib\") {\n// This MPS plugin seems to use some old way of packaging a plugin\n@@ -111,6 +113,7 @@ class ModulesMiner() {\nprivate fun readModule(file: File, owner: ModuleOwner): List<FoundModule> {\n+ try {\nreturn FileInputStream(file).use {\nval modules = readModule(it, owner)\nval first = modules.first()\n@@ -119,6 +122,11 @@ class ModulesMiner() {\n}\nmodules\n}\n+ } catch (e: Exception) {\n+ println(\"Failed to read file $file: \" + e.message)\n+ e.printStackTrace()\n+ return listOf()\n+ }\n}\nprivate fun readModule(file: InputStream, owner: ModuleOwner): List<FoundModule> {\n@@ -179,17 +187,28 @@ class ModulesMiner() {\naddDependency(moduleIdFromReference(node.getAttribute(\"name\")), DependencyType.Classpath, false)\n}\n\"generator\" -> {\n- var idString = node.getAttribute(\"generatorUID\")\n- if (idString.isEmpty()) idString = node.getAttribute(\"uuid\")\n+ when (node.parentTagName()) {\n+ \"generators\" -> {\n+ val idString = node.getAttribute(\"uuid\")\nif (idString.isNotEmpty()) {\n- val generatorId = moduleIdFromReference(idString).id\n- missedUUIDs -= generatorId.id\n+ missedUUIDs -= idString\n+ val generatorId = ModuleId(idString)\nval generatorName = node.getAttribute(\"namespace\")\n- val generatorModule = FoundModule(generatorId, generatorName, module.owner)\n+ val generatorModule = FoundModule(generatorId, generatorName, module.owner, isGenerator = true)\nmoduleForChildren = generatorModule\nmodules += generatorModule\n}\n}\n+ else -> {\n+ val idString = node.getAttribute(\"generatorUID\")\n+ if (idString.isNotEmpty()) {\n+ val idAndName = moduleIdFromReference(idString)\n+ missedUUIDs -= idAndName.id.id\n+ addDependency(idAndName, DependencyType.Generator, false)\n+ }\n+ }\n+ }\n+ }\n}\nfor (childElement in node.childElements()) {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | More work on dependencies |
426,496 | 01.03.2022 14:37:37 | -3,600 | 22ad6ee27a85c59ec81facbdeae0f6f336250c61 | Smaller generator chunks. They require too much memory when they are big. | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlan.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlan.kt",
"diff": "@@ -42,6 +42,8 @@ class GenerationPlan {\nreturn -1\n}\n+ fun chunkSize(index: Int) = if (index < chunks.size) chunks[index].modules.size else 0\n+\nfun insertAt(chunkIndex: Int, module: FoundModule) {\nwhile (chunks.size <= chunkIndex) chunks += GenerationChunk()\nchunks[chunkIndex].modules += module\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"diff": "@@ -52,8 +52,14 @@ class GenerationPlanBuilder(val availableModules: FoundModules, val ignoredModul\nwhen (val moduleOwner = module.owner) {\nis SourceModuleOwner -> {\n- val index = currentProcessingModules.firstNotNullOfOrNull { forcedChunkIndex[module.moduleId] }\n- ?: (plan.getHighestChunkIndex(module.dependencies.filter { it.type == DependencyType.Generator }.map { it.id }) + 1)\n+ var index = currentProcessingModules.firstNotNullOfOrNull { forcedChunkIndex[module.moduleId] }\n+ if (index == null) {\n+ index = plan.getHighestChunkIndex(module.dependencies.filter { it.type == DependencyType.Generator }.map { it.id }) + 1\n+ // Too large chunks require too much memory\n+ while (plan.chunkSize(index) > 20) {\n+ index++\n+ }\n+ }\ncycleIds?.forEach { forcedChunkIndex[it] = index }\nplan.insertAt(index, module)\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Smaller generator chunks. They require too much memory when they are big. |
426,497 | 01.03.2022 16:52:41 | -3,600 | aef24a51ada05bcab8d0eccb6f7c7a0679e46f72 | use kotlin 1.6.10 | [
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -48,9 +48,9 @@ buildscript {\nplugins {\nid \"com.diffplug.gradle.spotless\" version \"4.5.1\" apply false\n- id \"org.jetbrains.kotlin.jvm\" version \"1.5.30\" apply false\n- id \"org.jetbrains.kotlin.multiplatform\" version \"1.5.30\" apply false\n- id \"org.jetbrains.kotlin.plugin.serialization\" version \"1.5.30\" apply false\n+ id \"org.jetbrains.kotlin.jvm\" version \"1.6.10\" apply false\n+ id \"org.jetbrains.kotlin.multiplatform\" version \"1.6.10\" apply false\n+ id \"org.jetbrains.kotlin.plugin.serialization\" version \"1.6.10\" apply false\n}\ndef githubCredentials = getGithubCredentials()\n"
},
{
"change_type": "MODIFY",
"old_path": "graphql-server/build.gradle.kts",
"new_path": "graphql-server/build.gradle.kts",
"diff": "@@ -22,7 +22,7 @@ dependencies {\nimplementation(\"io.ktor\", \"ktor-server-netty\", ktorVersion)\nimplementation(\"ch.qos.logback\", \"logback-classic\", logbackVersion)\nimplementation(\"org.jetbrains.kotlinx\", \"kotlinx-coroutines-jdk8\", kotlinCoroutinesVersion)\n- implementation(project(\":model-client\"))\n+ implementation(project(\":model-client\", configuration = \"jvmRuntimeElements\"))\n}\ngraphql {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "kotlin-js-store/yarn.lock",
"diff": "+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n+# yarn lockfile v1\n+\n+\n+\"@ungap/[email protected]\":\n+ version \"1.1.2\"\n+ resolved \"https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44\"\n+ integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==\n+\[email protected]:\n+ version \"4.1.1\"\n+ resolved \"https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348\"\n+ integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==\n+\n+ansi-regex@^5.0.1:\n+ version \"5.0.1\"\n+ resolved \"https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304\"\n+ integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==\n+\n+ansi-styles@^4.0.0, ansi-styles@^4.1.0:\n+ version \"4.3.0\"\n+ resolved \"https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937\"\n+ integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==\n+ dependencies:\n+ color-convert \"^2.0.1\"\n+\n+anymatch@~3.1.2:\n+ version \"3.1.2\"\n+ resolved \"https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716\"\n+ integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==\n+ dependencies:\n+ normalize-path \"^3.0.0\"\n+ picomatch \"^2.0.4\"\n+\n+argparse@^2.0.1:\n+ version \"2.0.1\"\n+ resolved \"https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38\"\n+ integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==\n+\n+balanced-match@^1.0.0:\n+ version \"1.0.2\"\n+ resolved \"https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee\"\n+ integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==\n+\n+binary-extensions@^2.0.0:\n+ version \"2.2.0\"\n+ resolved \"https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d\"\n+ integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==\n+\n+brace-expansion@^1.1.7:\n+ version \"1.1.11\"\n+ resolved \"https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd\"\n+ integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==\n+ dependencies:\n+ balanced-match \"^1.0.0\"\n+ concat-map \"0.0.1\"\n+\n+braces@~3.0.2:\n+ version \"3.0.2\"\n+ resolved \"https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107\"\n+ integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==\n+ dependencies:\n+ fill-range \"^7.0.1\"\n+\[email protected]:\n+ version \"1.3.1\"\n+ resolved \"https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60\"\n+ integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==\n+\n+buffer-from@^1.0.0:\n+ version \"1.1.2\"\n+ resolved \"https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5\"\n+ integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==\n+\n+camelcase@^6.0.0:\n+ version \"6.3.0\"\n+ resolved \"https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a\"\n+ integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==\n+\n+chalk@^4.1.0:\n+ version \"4.1.2\"\n+ resolved \"https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01\"\n+ integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==\n+ dependencies:\n+ ansi-styles \"^4.1.0\"\n+ supports-color \"^7.1.0\"\n+\[email protected]:\n+ version \"3.5.2\"\n+ resolved \"https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75\"\n+ integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==\n+ dependencies:\n+ anymatch \"~3.1.2\"\n+ braces \"~3.0.2\"\n+ glob-parent \"~5.1.2\"\n+ is-binary-path \"~2.1.0\"\n+ is-glob \"~4.0.1\"\n+ normalize-path \"~3.0.0\"\n+ readdirp \"~3.6.0\"\n+ optionalDependencies:\n+ fsevents \"~2.3.2\"\n+\n+cliui@^7.0.2:\n+ version \"7.0.4\"\n+ resolved \"https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f\"\n+ integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==\n+ dependencies:\n+ string-width \"^4.2.0\"\n+ strip-ansi \"^6.0.0\"\n+ wrap-ansi \"^7.0.0\"\n+\n+color-convert@^2.0.1:\n+ version \"2.0.1\"\n+ resolved \"https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3\"\n+ integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==\n+ dependencies:\n+ color-name \"~1.1.4\"\n+\n+color-name@~1.1.4:\n+ version \"1.1.4\"\n+ resolved \"https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2\"\n+ integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==\n+\[email protected]:\n+ version \"0.0.1\"\n+ resolved \"https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b\"\n+ integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=\n+\[email protected]:\n+ version \"4.3.2\"\n+ resolved \"https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b\"\n+ integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==\n+ dependencies:\n+ ms \"2.1.2\"\n+\n+decamelize@^4.0.0:\n+ version \"4.0.0\"\n+ resolved \"https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837\"\n+ integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==\n+\[email protected]:\n+ version \"5.0.0\"\n+ resolved \"https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b\"\n+ integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==\n+\[email protected]:\n+ version \"0.5.8-rc.4\"\n+ resolved \"https://registry.yarnpkg.com/dukat/-/dukat-0.5.8-rc.4.tgz#90384dcb50b14c26f0e99dae92b2dea44f5fce21\"\n+ integrity sha512-ZnMt6DGBjlVgK2uQamXfd7uP/AxH7RqI0BL9GLrrJb2gKdDxvJChWy+M9AQEaL+7/6TmxzJxFOsRiInY9oGWTA==\n+ dependencies:\n+ google-protobuf \"3.12.2\"\n+ typescript \"3.9.5\"\n+\n+emoji-regex@^8.0.0:\n+ version \"8.0.0\"\n+ resolved \"https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37\"\n+ integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==\n+\n+escalade@^3.1.1:\n+ version \"3.1.1\"\n+ resolved \"https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40\"\n+ integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==\n+\[email protected]:\n+ version \"4.0.0\"\n+ resolved \"https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34\"\n+ integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==\n+\n+fill-range@^7.0.1:\n+ version \"7.0.1\"\n+ resolved \"https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40\"\n+ integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==\n+ dependencies:\n+ to-regex-range \"^5.0.1\"\n+\[email protected]:\n+ version \"5.0.0\"\n+ resolved \"https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc\"\n+ integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==\n+ dependencies:\n+ locate-path \"^6.0.0\"\n+ path-exists \"^4.0.0\"\n+\n+flat@^5.0.2:\n+ version \"5.0.2\"\n+ resolved \"https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241\"\n+ integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==\n+\[email protected]:\n+ version \"1.0.5\"\n+ resolved \"https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271\"\n+ integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==\n+\n+fs.realpath@^1.0.0:\n+ version \"1.0.0\"\n+ resolved \"https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f\"\n+ integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=\n+\n+fsevents@~2.3.2:\n+ version \"2.3.2\"\n+ resolved \"https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a\"\n+ integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==\n+\n+get-caller-file@^2.0.5:\n+ version \"2.0.5\"\n+ resolved \"https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e\"\n+ integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==\n+\n+glob-parent@~5.1.2:\n+ version \"5.1.2\"\n+ resolved \"https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4\"\n+ integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==\n+ dependencies:\n+ is-glob \"^4.0.1\"\n+\[email protected]:\n+ version \"7.1.7\"\n+ resolved \"https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90\"\n+ integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==\n+ dependencies:\n+ fs.realpath \"^1.0.0\"\n+ inflight \"^1.0.4\"\n+ inherits \"2\"\n+ minimatch \"^3.0.4\"\n+ once \"^1.3.0\"\n+ path-is-absolute \"^1.0.0\"\n+\[email protected]:\n+ version \"3.12.2\"\n+ resolved \"https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.12.2.tgz#50ce9f9b6281235724eb243d6a83e969a2176e53\"\n+ integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA==\n+\[email protected]:\n+ version \"1.10.5\"\n+ resolved \"https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e\"\n+ integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==\n+\n+has-flag@^4.0.0:\n+ version \"4.0.0\"\n+ resolved \"https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b\"\n+ integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==\n+\[email protected]:\n+ version \"1.2.0\"\n+ resolved \"https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f\"\n+ integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==\n+\n+inflight@^1.0.4:\n+ version \"1.0.6\"\n+ resolved \"https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9\"\n+ integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=\n+ dependencies:\n+ once \"^1.3.0\"\n+ wrappy \"1\"\n+\n+inherits@2:\n+ version \"2.0.4\"\n+ resolved \"https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c\"\n+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==\n+\n+is-binary-path@~2.1.0:\n+ version \"2.1.0\"\n+ resolved \"https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09\"\n+ integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==\n+ dependencies:\n+ binary-extensions \"^2.0.0\"\n+\n+is-extglob@^2.1.1:\n+ version \"2.1.1\"\n+ resolved \"https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2\"\n+ integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=\n+\n+is-fullwidth-code-point@^3.0.0:\n+ version \"3.0.0\"\n+ resolved \"https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d\"\n+ integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==\n+\n+is-glob@^4.0.1, is-glob@~4.0.1:\n+ version \"4.0.3\"\n+ resolved \"https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084\"\n+ integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==\n+ dependencies:\n+ is-extglob \"^2.1.1\"\n+\n+is-number@^7.0.0:\n+ version \"7.0.0\"\n+ resolved \"https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b\"\n+ integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==\n+\n+is-plain-obj@^2.1.0:\n+ version \"2.1.0\"\n+ resolved \"https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287\"\n+ integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==\n+\n+is-unicode-supported@^0.1.0:\n+ version \"0.1.0\"\n+ resolved \"https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7\"\n+ integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==\n+\n+isexe@^2.0.0:\n+ version \"2.0.0\"\n+ resolved \"https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10\"\n+ integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=\n+\n+js-base64@^3.4.5:\n+ version \"3.7.2\"\n+ resolved \"https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.2.tgz#816d11d81a8aff241603d19ce5761e13e41d7745\"\n+ integrity sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==\n+\n+js-sha256@^0.9.0:\n+ version \"0.9.0\"\n+ resolved \"https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966\"\n+ integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==\n+\[email protected]:\n+ version \"4.1.0\"\n+ resolved \"https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602\"\n+ integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==\n+ dependencies:\n+ argparse \"^2.0.1\"\n+\n+locate-path@^6.0.0:\n+ version \"6.0.0\"\n+ resolved \"https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286\"\n+ integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==\n+ dependencies:\n+ p-locate \"^5.0.0\"\n+\[email protected]:\n+ version \"4.1.0\"\n+ resolved \"https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503\"\n+ integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==\n+ dependencies:\n+ chalk \"^4.1.0\"\n+ is-unicode-supported \"^0.1.0\"\n+\[email protected]:\n+ version \"3.0.4\"\n+ resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083\"\n+ integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==\n+ dependencies:\n+ brace-expansion \"^1.1.7\"\n+\n+minimatch@^3.0.4:\n+ version \"3.1.2\"\n+ resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b\"\n+ integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==\n+ dependencies:\n+ brace-expansion \"^1.1.7\"\n+\[email protected]:\n+ version \"9.1.2\"\n+ resolved \"https://registry.yarnpkg.com/mocha/-/mocha-9.1.2.tgz#93f53175b0f0dc4014bd2d612218fccfcf3534d3\"\n+ integrity sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w==\n+ dependencies:\n+ \"@ungap/promise-all-settled\" \"1.1.2\"\n+ ansi-colors \"4.1.1\"\n+ browser-stdout \"1.3.1\"\n+ chokidar \"3.5.2\"\n+ debug \"4.3.2\"\n+ diff \"5.0.0\"\n+ escape-string-regexp \"4.0.0\"\n+ find-up \"5.0.0\"\n+ glob \"7.1.7\"\n+ growl \"1.10.5\"\n+ he \"1.2.0\"\n+ js-yaml \"4.1.0\"\n+ log-symbols \"4.1.0\"\n+ minimatch \"3.0.4\"\n+ ms \"2.1.3\"\n+ nanoid \"3.1.25\"\n+ serialize-javascript \"6.0.0\"\n+ strip-json-comments \"3.1.1\"\n+ supports-color \"8.1.1\"\n+ which \"2.0.2\"\n+ workerpool \"6.1.5\"\n+ yargs \"16.2.0\"\n+ yargs-parser \"20.2.4\"\n+ yargs-unparser \"2.0.0\"\n+\[email protected]:\n+ version \"2.1.2\"\n+ resolved \"https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009\"\n+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==\n+\[email protected]:\n+ version \"2.1.3\"\n+ resolved \"https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2\"\n+ integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==\n+\[email protected]:\n+ version \"3.1.25\"\n+ resolved \"https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152\"\n+ integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==\n+\n+normalize-path@^3.0.0, normalize-path@~3.0.0:\n+ version \"3.0.0\"\n+ resolved \"https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65\"\n+ integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==\n+\n+once@^1.3.0:\n+ version \"1.4.0\"\n+ resolved \"https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1\"\n+ integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=\n+ dependencies:\n+ wrappy \"1\"\n+\n+p-limit@^3.0.2:\n+ version \"3.1.0\"\n+ resolved \"https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b\"\n+ integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==\n+ dependencies:\n+ yocto-queue \"^0.1.0\"\n+\n+p-locate@^5.0.0:\n+ version \"5.0.0\"\n+ resolved \"https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834\"\n+ integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==\n+ dependencies:\n+ p-limit \"^3.0.2\"\n+\n+path-exists@^4.0.0:\n+ version \"4.0.0\"\n+ resolved \"https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3\"\n+ integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==\n+\n+path-is-absolute@^1.0.0:\n+ version \"1.0.1\"\n+ resolved \"https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f\"\n+ integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=\n+\n+picomatch@^2.0.4, picomatch@^2.2.1:\n+ version \"2.3.1\"\n+ resolved \"https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42\"\n+ integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==\n+\n+randombytes@^2.1.0:\n+ version \"2.1.0\"\n+ resolved \"https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a\"\n+ integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==\n+ dependencies:\n+ safe-buffer \"^5.1.0\"\n+\n+readdirp@~3.6.0:\n+ version \"3.6.0\"\n+ resolved \"https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7\"\n+ integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==\n+ dependencies:\n+ picomatch \"^2.2.1\"\n+\n+require-directory@^2.1.1:\n+ version \"2.1.1\"\n+ resolved \"https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42\"\n+ integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=\n+\n+safe-buffer@^5.1.0:\n+ version \"5.2.1\"\n+ resolved \"https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6\"\n+ integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==\n+\[email protected]:\n+ version \"6.0.0\"\n+ resolved \"https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8\"\n+ integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==\n+ dependencies:\n+ randombytes \"^2.1.0\"\n+\[email protected]:\n+ version \"0.5.20\"\n+ resolved \"https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9\"\n+ integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==\n+ dependencies:\n+ buffer-from \"^1.0.0\"\n+ source-map \"^0.6.0\"\n+\n+source-map@^0.6.0:\n+ version \"0.6.1\"\n+ resolved \"https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263\"\n+ integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==\n+\n+string-width@^4.1.0, string-width@^4.2.0:\n+ version \"4.2.3\"\n+ resolved \"https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010\"\n+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==\n+ dependencies:\n+ emoji-regex \"^8.0.0\"\n+ is-fullwidth-code-point \"^3.0.0\"\n+ strip-ansi \"^6.0.1\"\n+\n+strip-ansi@^6.0.0, strip-ansi@^6.0.1:\n+ version \"6.0.1\"\n+ resolved \"https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9\"\n+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==\n+ dependencies:\n+ ansi-regex \"^5.0.1\"\n+\[email protected]:\n+ version \"3.1.1\"\n+ resolved \"https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006\"\n+ integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==\n+\[email protected]:\n+ version \"8.1.1\"\n+ resolved \"https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c\"\n+ integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==\n+ dependencies:\n+ has-flag \"^4.0.0\"\n+\n+supports-color@^7.1.0:\n+ version \"7.2.0\"\n+ resolved \"https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da\"\n+ integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==\n+ dependencies:\n+ has-flag \"^4.0.0\"\n+\n+to-regex-range@^5.0.1:\n+ version \"5.0.1\"\n+ resolved \"https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4\"\n+ integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==\n+ dependencies:\n+ is-number \"^7.0.0\"\n+\[email protected]:\n+ version \"3.9.5\"\n+ resolved \"https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36\"\n+ integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==\n+\n+uuid@^8.3.0:\n+ version \"8.3.2\"\n+ resolved \"https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2\"\n+ integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==\n+\[email protected]:\n+ version \"2.0.2\"\n+ resolved \"https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1\"\n+ integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==\n+ dependencies:\n+ isexe \"^2.0.0\"\n+\[email protected]:\n+ version \"6.1.5\"\n+ resolved \"https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581\"\n+ integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==\n+\n+wrap-ansi@^7.0.0:\n+ version \"7.0.0\"\n+ resolved \"https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43\"\n+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==\n+ dependencies:\n+ ansi-styles \"^4.0.0\"\n+ string-width \"^4.1.0\"\n+ strip-ansi \"^6.0.0\"\n+\n+wrappy@1:\n+ version \"1.0.2\"\n+ resolved \"https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f\"\n+ integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=\n+\n+y18n@^5.0.5:\n+ version \"5.0.8\"\n+ resolved \"https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55\"\n+ integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==\n+\[email protected]:\n+ version \"20.2.4\"\n+ resolved \"https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54\"\n+ integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==\n+\n+yargs-parser@^20.2.2:\n+ version \"20.2.9\"\n+ resolved \"https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee\"\n+ integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==\n+\[email protected]:\n+ version \"2.0.0\"\n+ resolved \"https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb\"\n+ integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==\n+ dependencies:\n+ camelcase \"^6.0.0\"\n+ decamelize \"^4.0.0\"\n+ flat \"^5.0.2\"\n+ is-plain-obj \"^2.1.0\"\n+\[email protected]:\n+ version \"16.2.0\"\n+ resolved \"https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66\"\n+ integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==\n+ dependencies:\n+ cliui \"^7.0.2\"\n+ escalade \"^3.1.1\"\n+ get-caller-file \"^2.0.5\"\n+ require-directory \"^2.1.1\"\n+ string-width \"^4.2.0\"\n+ y18n \"^5.0.5\"\n+ yargs-parser \"^20.2.2\"\n+\n+yocto-queue@^0.1.0:\n+ version \"0.1.0\"\n+ resolved \"https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b\"\n+ integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==\n"
},
{
"change_type": "MODIFY",
"old_path": "model-client/build.gradle",
"new_path": "model-client/build.gradle",
"diff": "@@ -18,6 +18,12 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {\n}\n}\n+java {\n+ toolchain {\n+ languageVersion = JavaLanguageVersion.of(11)\n+ }\n+}\n+\nktlint {\ndisabledRules = [\"no-wildcard-imports\"]\n}\n@@ -26,7 +32,7 @@ check.dependsOn ktlintCheck\nkotlin {\njvm()\n- js {\n+ js() {\n//browser {}\nnodejs {\ntestTask {\n@@ -90,6 +96,11 @@ kotlin {\n}\n}\n+// Workaround for M1 macs. Remove after kotlin 1.6.20 is released.\n+rootProject.plugins.withType(Class.forName(\"org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin\")) {\n+ rootProject.extensions.getByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.class).nodeVersion = \"16.0.0\"\n+}\n+\njvmTest.dependsOn \":model-server:shadowJar\"\ntasks.jacocoTestReport {\n"
},
{
"change_type": "DELETE",
"old_path": "model-server/build.gradle",
"new_path": null,
"diff": "-plugins {\n- id \"java\"\n- id \"application\"\n- id \"com.diffplug.gradle.spotless\"\n- id 'maven-publish'\n- id 'com.adarshr.test-logger' version '2.1.0'\n- id \"org.jetbrains.kotlin.jvm\"\n- id 'com.github.johnrengelman.shadow' version '6.1.0'\n-}\n-\n-description = 'Model Server offering access to model storage'\n-\n-defaultTasks 'build'\n-\n-compileJava {\n- sourceCompatibility = '11'\n- targetCompatibility = '11'\n-}\n-\n-dependencies {\n- implementation group: 'org.modelix', name: 'model-api', version: \"$mpsExtensionsVersion\"\n- implementation project(':model-client')\n- implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlinVersion\n- implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'\n-\n- implementation group: 'org.json', name: 'json', version:'20180813'\n- implementation group: 'org.java-websocket', name: 'Java-WebSocket', version:'1.4.0'\n- implementation group: 'org.apache.commons', name: 'commons-collections4', version:'4.4'\n- implementation group: 'io.lettuce', name: 'lettuce-core', version:'5.1.8.RELEASE'\n- implementation group: 'ch.qos.logback', name: 'logback-classic', version:'1.2.7'\n-\n- def igniteVersion = '2.10.0'\n- implementation group: 'org.apache.ignite', name: 'ignite-core', version: igniteVersion\n- implementation group: 'org.apache.ignite', name: 'ignite-spring', version: igniteVersion\n- implementation group: 'org.apache.ignite', name: 'ignite-indexing', version: igniteVersion\n-\n- implementation group: 'org.postgresql', name: 'postgresql', version:'42.2.14'\n-\n- implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.21.v20190926'\n- implementation group: 'org.eclipse.jetty.websocket', name: 'websocket-servlet', version: '9.4.21.v20190926'\n- implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.21.v20190926'\n- implementation group: 'org.eclipse.jetty.websocket', name: 'websocket-server', version: '9.4.21.v20190926'\n- implementation group: 'org.eclipse.jetty', name: 'jetty-servlets', version: '9.4.21.v20190926'\n-\n- implementation group: 'commons-io', name: 'commons-io', version: '2.6'\n- implementation group: 'com.google.guava', name: 'guava', version: '28.1-jre'\n- implementation group: 'com.beust', name: 'jcommander', version: '1.7'\n- implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-sse', version: '3.3.7'\n- implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.3.7'\n-\n- testImplementation group: 'junit', name: 'junit', version: '4.12'\n- testImplementation group: 'io.cucumber', name: 'cucumber-java', version: '6.2.2'\n-}\n-\n-configurations {\n- cucumberRuntime {\n- extendsFrom testImplementation\n- }\n-}\n-\n-jar {\n- manifest {\n- attributes 'Main-Class': 'org.modelix.model.server.Main'\n- }\n-}\n-\n-shadowJar {\n- archiveBaseName.set('model-server')\n- archiveClassifier.set('fatJar')\n- archiveVersion.set('latest')\n-}\n-\n-def fatJarFile = file(\"$buildDir/libs/model-server-latest-fatJar.jar\")\n-def fatJarArtifact = artifacts.add('archives', fatJarFile) {\n- type 'jar'\n- builtBy 'shadowJar'\n-}\n-\n-task cucumber() {\n- dependsOn shadowJar, compileTestJava\n- doLast {\n- javaexec {\n- main = \"io.cucumber.core.cli.Main\"\n- classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output\n- args = ['--plugin', 'pretty', '--glue', 'org.modelix.model.server.functionaltests', 'src/test/resources/functionaltests']\n- }\n- }\n-}\n-\n-task copyLibs(type: Copy) {\n- into \"$buildDir/libs\"\n- from configurations.default\n-}\n-\n-assemble.finalizedBy(copyLibs)\n-\n-application {\n- mainClassName = \"org.modelix.model.server.Main\"\n-}\n-\n-publishing {\n- repositories {\n- maven {\n- name = \"GitHubPackages\"\n- url = uri(\"https://maven.pkg.github.com/modelix/modelix\")\n- credentials {\n- username = System.getenv(\"GITHUB_ACTOR\")\n- password = System.getenv(\"GITHUB_TOKEN\")\n- }\n- }\n-/* maven {\n- url rootProject.publishingRepository\n- if (rootProject.hasProperty('nexusUsername')) {\n- credentials {\n- username rootProject.nexusUsername\n- password rootProject.nexusPassword\n- }\n- }\n- }*/\n- }\n- publications {\n-/* modelServer(MavenPublication) {\n- groupId project.group\n- version project.version\n-\n- from components.java\n- }*/\n- modelServerFatJar(MavenPublication) {\n- groupId project.group\n- artifactId 'model-server-fatjar'\n- version project.version\n-\n- artifact fatJarArtifact\n- }\n- }\n-}\n-\n-spotless {\n- java {\n- googleJavaFormat(\"1.8\").aosp()\n- licenseHeader '/*\\n' +\n- ' * Licensed under the Apache License, Version 2.0 (the \"License\");\\n' +\n- ' * you may not use this file except in compliance with the License.\\n' +\n- ' * You may obtain a copy of the License at\\n' +\n- ' *\\n' +\n- ' * http://www.apache.org/licenses/LICENSE-2.0\\n' +\n- ' *\\n' +\n- ' * Unless required by applicable law or agreed to in writing,\\n' +\n- ' * software distributed under the License is distributed on an\\n' +\n- ' * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\\n' +\n- ' * KIND, either express or implied. See the License for the\\n' +\n- ' * specific language governing permissions and limitations\\n' +\n- ' * under the License. \\n' +\n- ' */\\n' +\n- '\\n'\n- }\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "model-server/build.gradle.kts",
"diff": "+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar\n+\n+plugins {\n+ java\n+ application\n+ id(\"com.diffplug.gradle.spotless\")\n+ `maven-publish`\n+ id(\"com.adarshr.test-logger\") version \"2.1.0\"\n+ id(\"org.jetbrains.kotlin.jvm\")\n+ id(\"com.github.johnrengelman.shadow\") version \"6.1.0\"\n+}\n+\n+description = \"Model Server offering access to model storage\"\n+\n+defaultTasks.add(\"build\")\n+\n+/*compileJava {\n+ sourceCompatibility = '11'\n+ targetCompatibility = '11'\n+}*/\n+\n+val mpsExtensionsVersion: String by project\n+val kotlinVersion: String by project\n+\n+dependencies {\n+ implementation(\"org.modelix:model-api:$mpsExtensionsVersion\")\n+ implementation(project(\":model-client\", configuration = \"jvmRuntimeElements\"))\n+ implementation(\"org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion\")\n+ implementation(\"org.apache.commons:commons-lang3:3.10\")\n+\n+ implementation(\"org.json:json:20180813\")\n+ implementation(\"org.java-websocket:Java-WebSocket:1.4.0\")\n+ implementation(\"org.apache.commons:commons-collections4:4.4\")\n+ implementation(\"io.lettuce:lettuce-core:5.1.8.RELEASE\")\n+ implementation(\"ch.qos.logback:logback-classic:1.2.7\")\n+\n+ val igniteVersion = \"2.10.0\"\n+ implementation(\"org.apache.ignite:ignite-core:$igniteVersion\")\n+ implementation(\"org.apache.ignite:ignite-spring:$igniteVersion\")\n+ implementation(\"org.apache.ignite:ignite-indexing:$igniteVersion\")\n+\n+ implementation(\"org.postgresql:postgresql:42.2.14\")\n+\n+ implementation(\"org.eclipse.jetty:jetty-server:9.4.21.v20190926\")\n+ implementation(\"org.eclipse.jetty.websocket:websocket-servlet:9.4.21.v20190926\")\n+ implementation(\"org.eclipse.jetty:jetty-servlet:9.4.21.v20190926\")\n+ implementation(\"org.eclipse.jetty.websocket:websocket-server:9.4.21.v20190926\")\n+ implementation(\"org.eclipse.jetty:jetty-servlets:9.4.21.v20190926\")\n+\n+ implementation(\"commons-io:commons-io:2.6\")\n+ implementation(\"com.google.guava:guava:28.1-jre\")\n+ implementation(\"com.beust:jcommander:1.7\")\n+ implementation(\"org.apache.cxf:cxf-rt-rs-sse:3.3.7\")\n+ implementation(\"org.apache.cxf:cxf-rt-rs-client:3.3.7\")\n+\n+ testImplementation(\"junit:junit:4.12\")\n+ testImplementation(\"io.cucumber:cucumber-java:6.2.2\")\n+}\n+\n+val cucumberRuntime by configurations.creating {\n+ extendsFrom(configurations[\"testImplementation\"])\n+}\n+\n+tasks.named<ShadowJar>(\"shadowJar\") {\n+ archiveBaseName.set(\"model-server\")\n+ archiveClassifier.set(\"fatJar\")\n+ archiveVersion.set(\"latest\")\n+ manifest {\n+ attributes[\"Main-Class\"] = \"org.modelix.model.server.Main\"\n+ }\n+}\n+\n+val fatJarFile = file(\"$buildDir/libs/model-server-latest-fatJar.jar\")\n+val fatJarArtifact = artifacts.add(\"archives\", fatJarFile) {\n+ type = \"jar\"\n+ builtBy(\"shadowJar\")\n+}\n+\n+task(\"cucumber\") {\n+ dependsOn(\"shadowJar\", \"compileTestJava\")\n+ doLast {\n+ javaexec {\n+ mainClass.set(\"io.cucumber.core.cli.Main\")\n+ classpath = cucumberRuntime + sourceSets.main.get().output + sourceSets.test.get().output\n+ // Change glue for your project package where the step definitions are.\n+ // And where the feature files are.\n+ args = listOf(\"--plugin\", \"pretty\", \"--glue\", \"org.modelix.model.server.functionaltests\", \"src/test/resources/functionaltests\")\n+\n+ }\n+ }\n+}\n+\n+\n+task(\"copyLibs\", Copy::class) {\n+ into(\"$buildDir/libs\")\n+ from(configurations.default)\n+}\n+\n+tasks.named(\"assemble\") {\n+ finalizedBy(\"copyLibs\")\n+}\n+\n+application {\n+ mainClassName = \"org.modelix.model.server.Main\"\n+}\n+\n+publishing {\n+ repositories {\n+ maven {\n+ name = \"GitHubPackages\"\n+ url = uri(\"https://maven.pkg.github.com/modelix/modelix\")\n+ credentials {\n+ username = System.getenv(\"GITHUB_ACTOR\")\n+ password = System.getenv(\"GITHUB_TOKEN\")\n+ }\n+ }\n+/* maven {\n+ url rootProject.publishingRepository\n+ if (rootProject.hasProperty('nexusUsername')) {\n+ credentials {\n+ username rootProject.nexusUsername\n+ password rootProject.nexusPassword\n+ }\n+ }\n+ }*/\n+ }\n+ publications {\n+/* modelServer(MavenPublication) {\n+ groupId project.group\n+ version project.version\n+\n+ from components.java\n+ }*/\n+ create<MavenPublication>(\"modelServerFatJar\") {\n+ groupId = project.group as String\n+ artifactId = \"model-server-fatjar\"\n+ artifact(fatJarArtifact)\n+ }\n+ }\n+}\n+\n+spotless {\n+ java {\n+ googleJavaFormat(\"1.8\").aosp()\n+ licenseHeader(\"/*\\n\" +\n+ \"\"\"\" * Licensed under the Apache License, Version 2.0 (the \"License\");\\n\"\"\" +\n+ \"\"\" * you may not use this file except in compliance with the License.\\n\"\"\" +\n+ \"\"\" * You may obtain a copy of the License at\\n\"\"\" +\n+ \"\"\" *\\n\"\"\" +\n+ \"\"\" * http://www.apache.org/licenses/LICENSE-2.0\\n\"\"\"+\n+ \"\"\" *\\n\"\"\" +\n+ \"\"\" * Unless required by applicable law or agreed to in writing,\\n\"\"\" +\n+ \"\"\" * software distributed under the License is distributed on an\\n\"\"\" +\n+ \"\"\" * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\\n\"\"\" +\n+ \"\"\" * KIND, either express or implied. See the License for the\\n\"\"\" +\n+ \"\"\" * specific language governing permissions and limitations\\n\"\"\" +\n+ \"\"\" * under the License. \\n\"\"\"\"\" +\n+ \"\"\" */\\n\"\"\"+\n+ \"\\n\")\n+ /*licenseHeader '/*\\n' +\n+ ' * Licensed under the Apache License, Version 2.0 (the \"License\");\\n' +\n+ ' * you may not use this file except in compliance with the License.\\n' +\n+ ' * You may obtain a copy of the License at\\n' +\n+ ' *\\n' +\n+ ' * http://www.apache.org/licenses/LICENSE-2.0\\n' +\n+ ' *\\n' +\n+ ' * Unless required by applicable law or agreed to in writing,\\n' +\n+ ' * software distributed under the License is distributed on an\\n' +\n+ ' * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\\n' +\n+ ' * KIND, either express or implied. See the License for the\\n' +\n+ ' * specific language governing permissions and limitations\\n' +\n+ ' * under the License. \\n' +\n+ ' */\\n' +\n+ '\\n'*/\n+ }\n+}\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "workspace-manager/build.gradle.kts",
"new_path": "workspace-manager/build.gradle.kts",
"diff": "@@ -42,7 +42,7 @@ dependencies {\nimplementation(\"org.zeroturnaround:zt-zip:1.14\")\nimplementation(\"org.apache.commons:commons-text:1.9\")\nimplementation(\"org.jasypt:jasypt:1.9.3\")\n- implementation(project(\":model-client\"))\n+ implementation(project(\":model-client\", configuration = \"jvmRuntimeElements\"))\nimplementation(project(\":headless-mps\"))\nimplementation(project(\":mps-build-tools\"))\nimplementation(\"io.ktor\",\"ktor-html-builder\", ktorVersion)\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | use kotlin 1.6.10 |
426,497 | 01.03.2022 17:43:22 | -3,600 | 4555710910b339ca08090852ad0d701dbbaf77af | stupid spaces | [
{
"change_type": "MODIFY",
"old_path": "model-server/build.gradle.kts",
"new_path": "model-server/build.gradle.kts",
"diff": "@@ -143,7 +143,7 @@ spotless {\njava {\ngoogleJavaFormat(\"1.8\").aosp()\nlicenseHeader(\"/*\\n\" +\n- \"\"\"\" * Licensed under the Apache License, Version 2.0 (the \"License\");\"\"\" + \"\\n\" +\n+ \"\"\" * Licensed under the Apache License, Version 2.0 (the \"License\");\"\"\" + \"\\n\" +\n\"\"\" * you may not use this file except in compliance with the License.\"\"\" + \"\\n\" +\n\"\"\" * You may obtain a copy of the License at\"\"\" + \"\\n\" +\n\"\"\" *\"\"\" + \"\\n\" +\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | stupid spaces |
426,496 | 02.03.2022 08:53:05 | -3,600 | d6f364ac87c1614ca61becf4525a8b046a44085d | By default generate languages (incl. dependencies) only
What is is generated are probably only sandbox and test solution.
For running the importer it is sufficient to have all languages built. | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"diff": "@@ -43,7 +43,10 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\nfun generateAnt(): Document {\nval modulesToGenerate_ = modulesToGenerate\n- ?: modulesMiner.getModules().getModules().values.filter { it.owner is SourceModuleOwner }.map { it.moduleId }.toList()\n+ ?: modulesMiner.getModules().getModules().values\n+ .filter { it.owner is SourceModuleOwner && it.moduleType == ModuleType.Language }\n+ .map { it.moduleId }\n+ .toList()\nval plan = generatePlan(modulesToGenerate_ - ignoredModules.toSet())\nval dbf = DocumentBuilderFactory.newInstance()\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/FoundModule.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/FoundModule.kt",
"diff": "*/\npackage org.modelix.buildtools\n-class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwner, val isGenerator: Boolean = false) {\n+class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwner, val moduleType: ModuleType) {\nval dependencies: MutableSet<ModuleDependency> = LinkedHashSet()\ninit {\n@@ -47,6 +47,8 @@ class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwn\nresult = 31 * result + dependencies.hashCode()\nreturn result\n}\n+}\n-\n+enum class ModuleType {\n+ Solution, Language, Generator, Devkit\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"diff": "@@ -35,8 +35,12 @@ class GenerationPlanBuilder(val availableModules: FoundModules, val ignoredModul\nval cycleStart = currentProcessingModules.indexOf(dependency.moduleId)\nif (cycleStart != -1) {\ncycleIds = currentProcessingModules.drop(cycleStart) + dependency.moduleId\n- val isGenerator: (ModuleId)->Boolean = { availableModules.getModules()[it]?.let { it.isGenerator } ?: false }\n- if (cycleIds.distinct().filter { !isGenerator(it) }.size > 1) {\n+ val isLangOrSolution: (ModuleId)->Boolean = { id ->\n+ availableModules.getModules()[id]\n+ ?.let { it.moduleType == ModuleType.Solution || it.moduleType == ModuleType.Language }\n+ ?: false\n+ }\n+ if (cycleIds.distinct().filter { isLangOrSolution(it) }.size > 1) {\nprintln(\"Dependency cycle detected: \" + cycleIds.map { availableModules.getModules()[it]?.name }.joinToString(\" -> \"))\nval chunkIndex = plan.getHighestChunkIndex(cycleIds).coerceAtLeast(0)\ncycleIds.forEach { forcedChunkIndex[it] = chunkIndex }\n@@ -52,6 +56,7 @@ class GenerationPlanBuilder(val availableModules: FoundModules, val ignoredModul\nwhen (val moduleOwner = module.owner) {\nis SourceModuleOwner -> {\n+ if (module.moduleType != ModuleType.Devkit) {\nvar index = currentProcessingModules.firstNotNullOfOrNull { forcedChunkIndex[module.moduleId] }\nif (index == null) {\nindex = plan.getHighestChunkIndex(module.dependencies.filter { it.type == DependencyType.Generator }.map { it.id }) + 1\n@@ -61,8 +66,16 @@ class GenerationPlanBuilder(val availableModules: FoundModules, val ignoredModul\n}\n}\ncycleIds?.forEach { forcedChunkIndex[it] = index }\n+ var moduleToGenerate = module\n+ if (module.moduleType == ModuleType.Generator) {\n+ val owningLanguage = module.owner.modules.values.find { it.moduleType == ModuleType.Language }\n+ if (owningLanguage != null) moduleToGenerate = owningLanguage\n+ }\n+ if (!plan.contains(moduleToGenerate.moduleId)) {\nplan.insertAt(index, module)\n}\n+ }\n+ }\nis LibraryModuleOwner -> plan.addLibrary(moduleOwner)\nis PluginModuleOwner -> availableModules.getPluginWithDependencies(moduleOwner.pluginId, plugins)\nelse -> throw RuntimeException(\"Unknown owner: $moduleOwner\")\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -129,6 +129,7 @@ class ModulesMiner() {\n}\n}\n+ private val typeMap = mapOf(\"language\" to ModuleType.Language, \"solution\" to ModuleType.Solution, \"dev-kit\" to ModuleType.Devkit, \"devkit\" to ModuleType.Devkit, \"generator\" to ModuleType.Generator)\nprivate fun readModule(file: InputStream, owner: ModuleOwner): List<FoundModule> {\nval xml = readXmlFile(file)\nval missedUUIDs = extractModuleUUIDs(xmlToString(xml)).toMutableSet()\n@@ -137,7 +138,10 @@ class ModulesMiner() {\nmissedUUIDs -= uuid.id\nvar name = doc.getAttribute(\"name\")\nif (name.isNullOrEmpty()) name = doc.getAttribute(\"namespace\")\n- val module = FoundModule(uuid, name, owner)\n+ val typeString = if (doc.tagName == \"module\") doc.getAttribute(\"type\") else doc.tagName\n+ val type = typeMap[typeString]\n+ ?: throw RuntimeException(\"Unknown module type: $typeString\")\n+ val module = FoundModule(uuid, name, owner, type)\nval modules = listOf(module) + readModule(doc, missedUUIDs, module)\nif (missedUUIDs.isNotEmpty()) {\nthrow RuntimeException(\"More dependencies found for module $name: $missedUUIDs\")\n@@ -194,7 +198,7 @@ class ModulesMiner() {\nmissedUUIDs -= idString\nval generatorId = ModuleId(idString)\nval generatorName = node.getAttribute(\"namespace\")\n- val generatorModule = FoundModule(generatorId, generatorName, module.owner, isGenerator = true)\n+ val generatorModule = FoundModule(generatorId, generatorName, module.owner, ModuleType.Generator)\nmoduleForChildren = generatorModule\nmodules += generatorModule\n}\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | By default generate languages (incl. dependencies) only
What is is generated are probably only sandbox and test solution.
For running the importer it is sufficient to have all languages built. |
426,496 | 02.03.2022 14:19:55 | -3,600 | 2c54fd064c70e902ddebfe831656a6af578d398b | Reimplement the dependency computation in the GenerationPlanBuilder | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/DependencyGraph.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.buildtools\n+\n+class DependencyGraph(val moduleResolver: ModuleResolver) {\n+\n+ private val module2node: MutableMap<ModuleId, DependencyNode> = HashMap()\n+\n+ fun getRoots() = module2node.values.filter { it.isRoot() }\n+\n+ fun load(modules: Iterable<FoundModule>) {\n+ modules.forEach { load(it) }\n+ postprocess()\n+ }\n+\n+ private fun load(module: FoundModule): DependencyNode {\n+ var node = module2node[module.moduleId]\n+ if (node != null) return node\n+\n+ node = DependencyNode()\n+ node.modules += module\n+ module2node[module.moduleId] = node\n+\n+ for (dependency in module.dependencies) {\n+ val dependencyModule = moduleResolver.resolveModule(dependency, module)\n+ if (dependencyModule != null) {\n+ node.addDependency(load(dependencyModule))\n+ }\n+ }\n+\n+ return node\n+ }\n+\n+ private fun postprocess() {\n+ mergeGeneratorsAndLanguages()\n+ mergeCycles()\n+ }\n+\n+ private fun mergeGeneratorsAndLanguages() {\n+ val moduleOwners = moduleResolver.availableModules.getModules().values.map { it.owner }.filterIsInstance<SourceModuleOwner>().filter { it.modules.size > 1 }\n+ for (moduleOwner in moduleOwners) {\n+ val nodesToMerge = moduleOwner.modules.keys.mapNotNull { module2node[it] }.distinct()\n+ if (nodesToMerge.size < 2) continue\n+ for (source in nodesToMerge.drop(1)) {\n+ mergeNodes(source, nodesToMerge.first())\n+ }\n+ }\n+ }\n+\n+ private fun mergeCycles() {\n+ val cycleFinder = CycleFinder()\n+ module2node.values.forEach { cycleFinder.process(it) }\n+ for (cycle in cycleFinder.cycles) {\n+ val nodesToMerge = cycle.map { it.getMergedNode() }.distinct()\n+ if (nodesToMerge.size <= 1) continue\n+ for (mergeSource in nodesToMerge.drop(1)) {\n+ mergeNodes(mergeSource, nodesToMerge.first())\n+ }\n+ }\n+ }\n+\n+ private fun mergeNodes(source: DependencyNode, target: DependencyNode) {\n+ if (source == target) {\n+ throw RuntimeException(\"Attempt to merge a node into itself\")\n+ }\n+ source.mergedInto = target\n+ for (sourceModule in source.modules) {\n+ module2node[sourceModule.moduleId] = target\n+ }\n+ target.modules += source.modules\n+ source.modules.clear()\n+\n+ for (dependency in source.getDependencies()) {\n+ source.removeDependency(dependency)\n+ target.addDependency(dependency)\n+ }\n+\n+ for (reverseDependency in source.getReverseDependencies()) {\n+ reverseDependency.removeDependency(source)\n+ reverseDependency.addDependency(target)\n+ }\n+ }\n+\n+\n+ inner class DependencyNode {\n+ val modules: MutableSet<FoundModule> = HashSet()\n+ private val dependencies: MutableSet<DependencyNode> = HashSet()\n+ private val reverseDependencies: MutableSet<DependencyNode> = HashSet()\n+ var mergedInto: DependencyNode? = null\n+\n+ override fun toString(): String {\n+ return modules.joinToString(\", \") { it.toString() }\n+ }\n+\n+ fun isValid() = mergedInto == null\n+\n+ fun getMergedNode(): DependencyNode = mergedInto?.getMergedNode() ?: this\n+\n+ fun addDependency(dependency: DependencyNode) {\n+ dependencies += dependency\n+ dependency.reverseDependencies += this\n+ }\n+\n+ fun removeDependency(dependency: DependencyNode) {\n+ if (dependencies.contains(dependency)) {\n+ dependencies -= dependency\n+ dependency.reverseDependencies -= this\n+ }\n+ }\n+\n+ fun getDependencies() = HashSet(dependencies)\n+\n+ fun getReverseDependencies() = HashSet(reverseDependencies)\n+\n+ fun isRoot() = reverseDependencies.isEmpty()\n+ }\n+\n+ private inner class CycleFinder {\n+ val processed = HashSet<DependencyNode>()\n+ val cycles: MutableList<List<DependencyNode>> = ArrayList()\n+ val currentStack = ArrayList<DependencyNode>()\n+\n+ fun process(node: DependencyNode) {\n+ val index = currentStack.indexOf(node)\n+ if (index != -1) {\n+ cycles += currentStack.drop(index)\n+ }\n+\n+ if (processed.contains(node)) return\n+ processed += node\n+\n+ try {\n+ currentStack += node\n+ for (dependency in node.getDependencies()) {\n+ process(dependency)\n+ }\n+ } finally {\n+ currentStack.removeLast()\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/FoundModule.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/FoundModule.kt",
"diff": "@@ -26,26 +26,8 @@ class FoundModule(val moduleId: ModuleId, val name: String, val owner: ModuleOwn\n}\n}\n- override fun equals(other: Any?): Boolean {\n- if (this === other) return true\n- if (javaClass != other?.javaClass) return false\n-\n- other as FoundModule\n-\n- if (moduleId != other.moduleId) return false\n- if (name != other.name) return false\n- if (owner != other.owner) return false\n- if (dependencies != other.dependencies) return false\n-\n- return true\n- }\n-\n- override fun hashCode(): Int {\n- var result = moduleId.hashCode()\n- result = 31 * result + name.hashCode()\n- result = 31 * result + owner.hashCode()\n- result = 31 * result + dependencies.hashCode()\n- return result\n+ override fun toString(): String {\n+ return \"$moduleId($name)\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"diff": "@@ -15,83 +15,47 @@ package org.modelix.buildtools\nclass GenerationPlanBuilder(val availableModules: FoundModules, val ignoredModules: Set<ModuleId>) {\nval plan: GenerationPlan = GenerationPlan()\n- private val processedModules: MutableSet<ModuleId> = HashSet()\n- private val currentProcessingModules: MutableList<ModuleId> = ArrayList()\n- private val forcedChunkIndex: MutableMap<ModuleId, Int> = HashMap()\n+ private val processedNodes: MutableSet<DependencyGraph.DependencyNode> = HashSet()\n+ private val chunkIndexes: MutableMap<DependencyGraph.DependencyNode, Int> = HashMap()\nfun build(modules: Iterable<FoundModule>) {\n- modules.forEach { build(it) }\n+ val dependencyGraph = DependencyGraph(ModuleResolver(availableModules, ignoredModules))\n+ dependencyGraph.load(modules)\n+ dependencyGraph.getRoots().forEach { build(it) }\n}\n- fun build(module: FoundModule) {\n- if (processedModules.contains(module.moduleId)) return\n- processedModules += module.moduleId\n+ private fun build(node: DependencyGraph.DependencyNode) {\n+ if (processedNodes.contains(node)) return\n+ processedNodes += node\n- currentProcessingModules += module.moduleId\n- try {\n- var cycleIds: List<ModuleId>? = null\n- for (dependency in module.dependencies.mapNotNull { resolveModule(it, module) }) {\n- if (module.owner is SourceModuleOwner) {\n- val cycleStart = currentProcessingModules.indexOf(dependency.moduleId)\n- if (cycleStart != -1) {\n- cycleIds = currentProcessingModules.drop(cycleStart) + dependency.moduleId\n- val isLangOrSolution: (ModuleId)->Boolean = { id ->\n- availableModules.getModules()[id]\n- ?.let { it.moduleType == ModuleType.Solution || it.moduleType == ModuleType.Language }\n- ?: false\n- }\n- if (cycleIds.distinct().filter { isLangOrSolution(it) }.size > 1) {\n- println(\"Dependency cycle detected: \" + cycleIds.map { availableModules.getModules()[it]?.name }.joinToString(\" -> \"))\n- val chunkIndex = plan.getHighestChunkIndex(cycleIds).coerceAtLeast(0)\n- cycleIds.forEach { forcedChunkIndex[it] = chunkIndex }\n- } else {\n- cycleIds = null\n- }\n- }\n- }\n- build(dependency)\n+ node.getDependencies().forEach { build(it) }\n+ var chunkIndex = (node.getDependencies().mapNotNull { chunkIndexes[it] }.maxOrNull() ?: -1) + 1\n+ // Too large chunks require too much memory\n+ while (plan.chunkSize(chunkIndex) > 20) {\n+ chunkIndex++\n}\nval plugins: MutableMap<String, PluginModuleOwner> = LinkedHashMap()\n+ for (module in node.modules) {\nwhen (val moduleOwner = module.owner) {\nis SourceModuleOwner -> {\n- var index = currentProcessingModules.firstNotNullOfOrNull { forcedChunkIndex[module.moduleId] }\n- if (index == null) {\n- index = plan.getHighestChunkIndex(module.dependencies.filter { it.type == DependencyType.Generator }.map { it.id }) + 1\n- // Too large chunks require too much memory\n- while (plan.chunkSize(index) > 20) {\n- index++\n- }\n- }\n- cycleIds?.forEach { forcedChunkIndex[it] = index }\nvar moduleToGenerate = module\nif (module.moduleType == ModuleType.Generator) {\nval owningLanguage = module.owner.modules.values.find { it.moduleType == ModuleType.Language }\nif (owningLanguage != null) moduleToGenerate = owningLanguage\n}\nif (!plan.contains(moduleToGenerate.moduleId)) {\n- plan.insertAt(index, moduleToGenerate)\n+ plan.insertAt(chunkIndex, moduleToGenerate)\n+ chunkIndexes[node] = chunkIndex\n}\n}\nis LibraryModuleOwner -> plan.addLibrary(moduleOwner)\nis PluginModuleOwner -> availableModules.getPluginWithDependencies(moduleOwner.pluginId, plugins)\nelse -> throw RuntimeException(\"Unknown owner: $moduleOwner\")\n}\n-\n- plugins.values.forEach { plan.addPlugin(it) }\n- } finally {\n- currentProcessingModules.removeLast()\n- }\n}\n- fun resolveModule(dep: ModuleDependency, usedBy: FoundModule): FoundModule? {\n- // jetbrains.mps.lang.docComment doesn't exist (referenced in jetbrains.mps.lang.text)\n-// if (dep.id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\n- val resolved = availableModules.getModules()[dep.id]\n- if (resolved == null && !(dep.ignoreIfMissing || ignoredModules.contains(dep.id))) {\n- throw RuntimeException(\"Dependency ${dep.id}(${dep.moduleName}) not found (used by ${usedBy.name}(${usedBy.moduleId}))\")\n- }\n- return resolved\n+ plugins.values.forEach { plan.addPlugin(it) }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModuleResolver.kt",
"diff": "+/*\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.modelix.buildtools\n+\n+class ModuleResolver(val availableModules: FoundModules, val ignoredModules: Set<ModuleId>) {\n+ fun resolveModule(dep: ModuleDependency, usedBy: FoundModule): FoundModule? {\n+ // jetbrains.mps.lang.docComment doesn't exist (referenced in jetbrains.mps.lang.text)\n+// if (dep.id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\n+ val resolved = availableModules.getModules()[dep.id]\n+ if (resolved == null && !(dep.ignoreIfMissing || ignoredModules.contains(dep.id))) {\n+ throw RuntimeException(\"Dependency ${dep.id}(${dep.moduleName}) not found (used by ${usedBy.name}(${usedBy.moduleId}))\")\n+ }\n+ return resolved\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/test/kotlin/org/modelix/buildtools/BuildScriptGeneratorTest.kt",
"new_path": "mps-build-tools/src/test/kotlin/org/modelix/buildtools/BuildScriptGeneratorTest.kt",
"diff": "@@ -65,4 +65,61 @@ internal class BuildScriptGeneratorTest {\nassertEquals(0, exitValue)\n}\n+ @Test\n+ fun testPLSA() {\n+ val modulesMiner = ModulesMiner()\n+ val inputFolders = listOf(\n+ File(\"../artifacts/mps\"),\n+ File(\"../../mbd_msi_hf/languages\"),\n+ File(\"../../mbd_msi_hf/solutions\"),\n+ File(\"../../mbd_msi_hf/devkits\"),\n+// File(\"../../mbd_plsa/languages\"),\n+// File(\"../../mbd_plsa/solutions\"),\n+// File(\"../../mbd_plsa/devkits\"),\n+ File(\"../../iets3.opensource/code/languages\"),\n+ File(\"../../iets3.core/code/languages\"),\n+ File(\"../../mbeddr.core/code/languages\"),\n+ File(\"../../MPS-extensions/code\"),\n+ )\n+ inputFolders.map { it.absoluteFile.toPath() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it, it)) }\n+ val canon_cpp_plsa = ModuleId(\"b4f7ab87-0673-4cea-bd16-2ecbb84b6ee7\")\n+ val generator = BuildScriptGenerator(modulesMiner, listOf(canon_cpp_plsa))\n+ val xml = generator.generateXML()\n+ println(xml)\n+ val antScriptFile = File(\"plsa-build.xml\")\n+ antScriptFile.writeText(xml)\n+\n+// val ant = ProcessBuilder(\"ant\", \"-f\", antScriptFile.canonicalPath).start()\n+// ant.inputStream.copyTo(System.out)\n+// val exitValue = ant.waitFor()\n+// assertEquals(0, exitValue)\n+ }\n+\n+ @Test\n+ fun testMPSExt() {\n+ val modulesMiner = ModulesMiner()\n+ val inputFolders = listOf(\n+ File(\"../artifacts/mps\"),\n+// File(\"../../iets3.opensource/code/languages\"),\n+// File(\"../../iets3.core/code/languages\"),\n+// File(\"../../mbeddr.core/code/languages\"),\n+ File(\"../../MPS-extensions/code\"),\n+ )\n+ inputFolders.map { it.absoluteFile.toPath() }.forEach {\n+ modulesMiner.searchInFolder(ModuleOrigin(it, it)) { file ->\n+ !file.path.contains(\"modelmerge\") && !file.path.contains(\"model.merge\")\n+ }\n+ }\n+ val generator = BuildScriptGenerator(modulesMiner, ignoredModules = setOf(ModuleId(\"\")))\n+ val xml = generator.generateXML()\n+ println(xml)\n+ val antScriptFile = File(\"mpsext-build.xml\")\n+ antScriptFile.writeText(xml)\n+\n+// val ant = ProcessBuilder(\"ant\", \"-f\", antScriptFile.canonicalPath).start()\n+// ant.inputStream.copyTo(System.out)\n+// val exitValue = ant.waitFor()\n+// assertEquals(0, exitValue)\n+ }\n+\n}\n\\ No newline at end of file\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Reimplement the dependency computation in the GenerationPlanBuilder |
426,496 | 02.03.2022 14:28:52 | -3,600 | 910b695cbcdd9156c18e575517ff1e54c4d3b87a | avoid devkit-only generation chunks | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/GenerationPlanBuilder.kt",
"diff": "@@ -35,6 +35,13 @@ class GenerationPlanBuilder(val availableModules: FoundModules, val ignoredModul\nchunkIndex++\n}\n+ // a chunk without any models (e.g. only devkits) makes the generator fail ('Build aborted: nothing to do')\n+ val hasNoModels = node.modules.none { it.moduleType != ModuleType.Devkit }\n+ if (hasNoModels && chunkIndex > 0) {\n+ // a devkit is not generated and therefor doesn't require its dependencies to be generated\n+ chunkIndex--\n+ }\n+\nval plugins: MutableMap<String, PluginModuleOwner> = LinkedHashMap()\nfor (module in node.modules) {\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | avoid devkit-only generation chunks |
426,496 | 02.03.2022 15:20:40 | -3,600 | 8eb42c89ecfd8be09f58f13e3b18d8132994d3a1 | Allow adding macros to the generator script | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/BuildScriptGenerator.kt",
"diff": "@@ -19,7 +19,10 @@ import java.io.File\nimport javax.xml.parsers.DocumentBuilderFactory\nimport kotlin.io.path.pathString\n-class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate: List<ModuleId>? = null, val ignoredModules: Set<ModuleId> = HashSet()) {\n+class BuildScriptGenerator(val modulesMiner: ModulesMiner,\n+ val modulesToGenerate: List<ModuleId>? = null,\n+ val ignoredModules: Set<ModuleId> = HashSet(),\n+ val macros: Map<String, File> = HashMap()) {\nfun buildModules(antScriptFile: File = File.createTempFile(\"mps-build-script\", \".xml\", File(\".\")), outputHandler: ((String)->Unit)? = null) {\nval xml = generateXML()\n@@ -129,10 +132,12 @@ class BuildScriptGenerator(val modulesMiner: ModulesMiner, val modulesToGenerate\nsetAttribute(\"value\", \"-Xmx2G\")\n}\n}\n-// newChild(\"macro\") {\n-// setAttribute(\"name\", \"\")\n-// setAttribute(\"path\", \"\")\n-// }\n+ for (macro in macros) {\n+ newChild(\"macro\") {\n+ setAttribute(\"name\", macro.key)\n+ setAttribute(\"path\", macro.value.absolutePath)\n+ }\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/DependencyGraph.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/DependencyGraph.kt",
"diff": "@@ -108,6 +108,7 @@ class DependencyGraph(val moduleResolver: ModuleResolver) {\nfun getMergedNode(): DependencyNode = mergedInto?.getMergedNode() ?: this\nfun addDependency(dependency: DependencyNode) {\n+ if (dependency == this) return\ndependencies += dependency\ndependency.reverseDependencies += this\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/test/kotlin/org/modelix/buildtools/BuildScriptGeneratorTest.kt",
"new_path": "mps-build-tools/src/test/kotlin/org/modelix/buildtools/BuildScriptGeneratorTest.kt",
"diff": "@@ -35,7 +35,7 @@ import java.io.File\ninternal class BuildScriptGeneratorTest {\n@Test\n- fun test() {\n+ fun testModelixMPSModules() {\nval org_modelix_ui_server = ModuleId(\"39aab22b-473f-4e44-b037-0c602964897d\")\nval org_modelix_notation_impl_baseLanguage = ModuleId(\"2db6cf34-1ef5-4ea9-ab56-6511aab61960\")\nval modulesMiner = ModulesMiner()\n@@ -49,7 +49,7 @@ internal class BuildScriptGeneratorTest {\n}\n@Test\n- fun test2() {\n+ fun testGeneratorTestProject() {\nval modulesMiner = ModulesMiner()\nval inputFolders = listOf(File(\"../artifacts/mps\"), File(\"../generator-test-project\"))\ninputFolders.map { it.absoluteFile.toPath() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it, it)) }\n@@ -65,9 +65,10 @@ internal class BuildScriptGeneratorTest {\nassertEquals(0, exitValue)\n}\n- @Test\n+// @Test\nfun testPLSA() {\nval modulesMiner = ModulesMiner()\n+ val mbeddrHome = File(\"../../mbeddr.core\")\nval inputFolders = listOf(\nFile(\"../artifacts/mps\"),\nFile(\"../../mbd_msi_hf/languages\"),\n@@ -78,12 +79,18 @@ internal class BuildScriptGeneratorTest {\n// File(\"../../mbd_plsa/devkits\"),\nFile(\"../../iets3.opensource/code/languages\"),\nFile(\"../../iets3.core/code/languages\"),\n- File(\"../../mbeddr.core/code/languages\"),\n+ File(mbeddrHome, \"code/languages\"),\n+ File(mbeddrHome, \"tools\"),\nFile(\"../../MPS-extensions/code\"),\n)\ninputFolders.map { it.absoluteFile.toPath() }.forEach { modulesMiner.searchInFolder(ModuleOrigin(it, it)) }\nval canon_cpp_plsa = ModuleId(\"b4f7ab87-0673-4cea-bd16-2ecbb84b6ee7\")\n- val generator = BuildScriptGenerator(modulesMiner, listOf(canon_cpp_plsa))\n+ val generator = BuildScriptGenerator(\n+ modulesMiner = modulesMiner,\n+ modulesToGenerate = listOf(canon_cpp_plsa),\n+ ignoredModules = setOf(ModuleId(\"ebbc2a81-6618-40a2-b3b8-997fd1520167\")),\n+ macros = mapOf(\"mbeddr.github.core.home\" to mbeddrHome)\n+ )\nval xml = generator.generateXML()\nprintln(xml)\nval antScriptFile = File(\"plsa-build.xml\")\n@@ -95,7 +102,7 @@ internal class BuildScriptGeneratorTest {\n// assertEquals(0, exitValue)\n}\n- @Test\n+// @Test\nfun testMPSExt() {\nval modulesMiner = ModulesMiner()\nval inputFolders = listOf(\n@@ -106,9 +113,7 @@ internal class BuildScriptGeneratorTest {\nFile(\"../../MPS-extensions/code\"),\n)\ninputFolders.map { it.absoluteFile.toPath() }.forEach {\n- modulesMiner.searchInFolder(ModuleOrigin(it, it)) { file ->\n- !file.path.contains(\"modelmerge\") && !file.path.contains(\"model.merge\")\n- }\n+ modulesMiner.searchInFolder(ModuleOrigin(it, it))\n}\nval generator = BuildScriptGenerator(modulesMiner, ignoredModules = setOf(ModuleId(\"\")))\nval xml = generator.generateXML()\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Allow adding macros to the generator script |
426,496 | 02.03.2022 16:18:29 | -3,600 | 742949b6ecbc852b589426c36482311cf7d68188 | Allow ignoring modules by putting a .mpsbuild-ignore file into a folder | [
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModuleResolver.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModuleResolver.kt",
"diff": "@@ -15,11 +15,9 @@ package org.modelix.buildtools\nclass ModuleResolver(val availableModules: FoundModules, val ignoredModules: Set<ModuleId>) {\nfun resolveModule(dep: ModuleDependency, usedBy: FoundModule): FoundModule? {\n- // jetbrains.mps.lang.docComment doesn't exist (referenced in jetbrains.mps.lang.text)\n-// if (dep.id.id == \"261403cf-60c1-4995-856b-0bc032f24218\") return null\nval resolved = availableModules.getModules()[dep.id]\nif (resolved == null && !(dep.ignoreIfMissing || ignoredModules.contains(dep.id))) {\n- throw RuntimeException(\"Dependency ${dep.id}(${dep.moduleName}) not found (used by ${usedBy.name}(${usedBy.moduleId}))\")\n+ throw RuntimeException(\"Dependency ${dep.id}(${dep.moduleName}) not found (used by ${usedBy.moduleId}(${usedBy.name}) in ${usedBy.owner.path.getLocalAbsolutePath()} )\")\n}\nreturn resolved\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"new_path": "mps-build-tools/src/main/kotlin/org/modelix/buildtools/ModulesMiner.kt",
"diff": "@@ -36,7 +36,7 @@ class ModulesMiner() {\nfun searchInFolder(folder: File, fileFilter: (File)->Boolean = { true }) = searchInFolder(ModuleOrigin(folder.toPath()), fileFilter)\nprivate fun collectModules(file: File, owner: ModuleOwner?, origin: ModuleOrigin, result: FoundModules, fileFilter: (File)->Boolean) {\n- if (!fileFilter(file)) return\n+ if (!fileFilter(file) || File(file, \".mpsbuild-ignore\").exists()) return\nif (file.isFile) {\nwhen (file.extension.lowercase()) {\n// see jetbrains.mps.project.MPSExtentions\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Allow ignoring modules by putting a .mpsbuild-ignore file into a folder |
426,496 | 02.03.2022 16:55:58 | -3,600 | f8a8687485dddfcd90af1080761da13de7319409 | ModelSynchronizer didn't handle foreign node IDs | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"diff": "</node>\n<node concept=\"9aQIb\" id=\"4_k_9wJ_0Px\" role=\"9aQIa\">\n<node concept=\"3clFbS\" id=\"4_k_9wJ_0Py\" role=\"9aQI4\">\n- <node concept=\"3cpWs8\" id=\"4_k_9wJ_0Pz\" role=\"3cqZAp\">\n- <node concept=\"3cpWsn\" id=\"4_k_9wJ_0P$\" role=\"3cpWs9\">\n- <property role=\"TrG5h\" value=\"mpsNodeId\" />\n- <node concept=\"3cpWsb\" id=\"4_k_9wJ_0P_\" role=\"1tU5fm\" />\n- <node concept=\"2YIFZM\" id=\"4_k_9wJ_0PA\" role=\"33vP2m\">\n- <ref role=\"1Pybhd\" to=\"wyt6:~Long\" resolve=\"Long\" />\n- <ref role=\"37wK5l\" to=\"wyt6:~Long.parseLong(java.lang.String)\" resolve=\"parseLong\" />\n- <node concept=\"37vLTw\" id=\"4_k_9wJ_0PB\" role=\"37wK5m\">\n- <ref role=\"3cqZAo\" node=\"4_k_9wJ_0Ox\" resolve=\"mpsNodeIdAsString\" />\n- </node>\n- </node>\n- </node>\n- </node>\n<node concept=\"3clFbF\" id=\"4_k_9wJ_0PC\" role=\"3cqZAp\">\n<node concept=\"37vLTI\" id=\"4_k_9wJ_0PD\" role=\"3clFbG\">\n- <node concept=\"2ShNRf\" id=\"4_k_9wJ_0PE\" role=\"37vLTx\">\n- <node concept=\"1pGfFk\" id=\"4_k_9wJ_0PF\" role=\"2ShVmc\">\n- <ref role=\"37wK5l\" to=\"w1kc:~SNodeId$Regular.<init>(long)\" resolve=\"SNodeId.Regular\" />\n- <node concept=\"37vLTw\" id=\"4_k_9wJ_0PG\" role=\"37wK5m\">\n- <ref role=\"3cqZAo\" node=\"4_k_9wJ_0P$\" resolve=\"mpsNodeId\" />\n+ <node concept=\"2OqwBi\" id=\"3bExyWqGF55\" role=\"37vLTx\">\n+ <node concept=\"2YIFZM\" id=\"3bExyWqGEWU\" role=\"2Oq$k0\">\n+ <ref role=\"37wK5l\" to=\"dush:~PersistenceFacade.getInstance()\" resolve=\"getInstance\" />\n+ <ref role=\"1Pybhd\" to=\"dush:~PersistenceFacade\" resolve=\"PersistenceFacade\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"3bExyWqGFml\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"dush:~PersistenceFacade.createNodeId(java.lang.String)\" resolve=\"createNodeId\" />\n+ <node concept=\"37vLTw\" id=\"3bExyWqGFYd\" role=\"37wK5m\">\n+ <ref role=\"3cqZAo\" node=\"4_k_9wJ_0Ox\" resolve=\"mpsNodeIdAsString\" />\n</node>\n</node>\n</node>\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | ModelSynchronizer didn't handle foreign node IDs |
426,496 | 02.03.2022 20:23:36 | -3,600 | 3905bd9e4ec63ee4d276b7b10bc68053bc0c9d2f | Exclude read only models from synchronization to the model server
These are usually stub models. It's not possible to update them from
the model server. | [
{
"change_type": "MODIFY",
"old_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"new_path": "mps/org.modelix.model.mpsplugin/models/org.modelix.model.mpsplugin.mps",
"diff": "<node concept=\"2ShNRf\" id=\"4_k_9wJ_0$n\" role=\"YScLw\">\n<node concept=\"1pGfFk\" id=\"4_k_9wJ_0$o\" role=\"2ShVmc\">\n<ref role=\"37wK5l\" to=\"wyt6:~RuntimeException.<init>(java.lang.String,java.lang.Throwable)\" resolve=\"RuntimeException\" />\n- <node concept=\"3cpWs3\" id=\"4_k_9wJ_0$p\" role=\"37wK5m\">\n- <node concept=\"37vLTw\" id=\"4_k_9wJ_0$q\" role=\"3uHU7w\">\n- <ref role=\"3cqZAo\" node=\"4_k_9wJ_0v2\" resolve=\"role\" />\n+ <node concept=\"3cpWs3\" id=\"3bExyWqJ8BS\" role=\"37wK5m\">\n+ <node concept=\"2OqwBi\" id=\"3bExyWqJdYn\" role=\"3uHU7w\">\n+ <node concept=\"2OqwBi\" id=\"3bExyWqJc0d\" role=\"2Oq$k0\">\n+ <node concept=\"37vLTw\" id=\"3bExyWqJalI\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"4_k_9wJ_0dg\" resolve=\"model\" />\n</node>\n+ <node concept=\"liA8E\" id=\"3bExyWqJdC7\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"mhbf:~SModel.getName()\" resolve=\"getName\" />\n+ </node>\n+ </node>\n+ <node concept=\"liA8E\" id=\"3bExyWqJfvW\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"mhbf:~SModelName.getValue()\" resolve=\"getValue\" />\n+ </node>\n+ </node>\n+ <node concept=\"3cpWs3\" id=\"3bExyWqJ6G6\" role=\"3uHU7B\">\n+ <node concept=\"3cpWs3\" id=\"4_k_9wJ_0$p\" role=\"3uHU7B\">\n<node concept=\"3cpWs3\" id=\"4_k_9wJ_0$r\" role=\"3uHU7B\">\n<node concept=\"3cpWs3\" id=\"4_k_9wJ_0$s\" role=\"3uHU7B\">\n<node concept=\"Xl_RD\" id=\"4_k_9wJ_0$t\" role=\"3uHU7B\">\n<property role=\"Xl_RC\" value=\". Role: \" />\n</node>\n</node>\n+ <node concept=\"37vLTw\" id=\"4_k_9wJ_0$q\" role=\"3uHU7w\">\n+ <ref role=\"3cqZAo\" node=\"4_k_9wJ_0v2\" resolve=\"role\" />\n+ </node>\n+ </node>\n+ <node concept=\"Xl_RD\" id=\"3bExyWqJ6Tg\" role=\"3uHU7w\">\n+ <property role=\"Xl_RC\" value=\", model: \" />\n+ </node>\n+ </node>\n</node>\n<node concept=\"37vLTw\" id=\"4_k_9wJ_0$w\" role=\"37wK5m\">\n<ref role=\"3cqZAo\" node=\"4_k_9wJ_0$i\" resolve=\"e\" />\n<node concept=\"3Tmbuc\" id=\"7ZZZU$lwQ7f\" role=\"1B3o_S\" />\n<node concept=\"3clFbS\" id=\"7ZZZU$lwQ7i\" role=\"3clF47\">\n<node concept=\"3clFbF\" id=\"7ZZZU$lx6IO\" role=\"3cqZAp\">\n- <node concept=\"2OqwBi\" id=\"7ZZZU$lx6S4\" role=\"3clFbG\">\n+ <node concept=\"2OqwBi\" id=\"3bExyWqKl0D\" role=\"3clFbG\">\n+ <node concept=\"2OqwBi\" id=\"7ZZZU$lx6S4\" role=\"2Oq$k0\">\n<node concept=\"37vLTw\" id=\"7ZZZU$lx6IN\" role=\"2Oq$k0\">\n<ref role=\"3cqZAo\" node=\"7ZZZU$lwQdD\" resolve=\"module\" />\n</node>\n<ref role=\"37wK5l\" node=\"52cRlzW9NPt\" resolve=\"getModelsWithoutDescriptor\" />\n</node>\n</node>\n+ <node concept=\"3zZkjj\" id=\"3bExyWqKn1b\" role=\"2OqNvi\">\n+ <node concept=\"1bVj0M\" id=\"3bExyWqKn1d\" role=\"23t8la\">\n+ <node concept=\"3clFbS\" id=\"3bExyWqKn1e\" role=\"1bW5cS\">\n+ <node concept=\"3clFbF\" id=\"3bExyWqKnoQ\" role=\"3cqZAp\">\n+ <node concept=\"3fqX7Q\" id=\"3bExyWqKo0F\" role=\"3clFbG\">\n+ <node concept=\"2OqwBi\" id=\"3bExyWqKo0H\" role=\"3fr31v\">\n+ <node concept=\"37vLTw\" id=\"3bExyWqKo0I\" role=\"2Oq$k0\">\n+ <ref role=\"3cqZAo\" node=\"3bExyWqKn1f\" resolve=\"it\" />\n+ </node>\n+ <node concept=\"liA8E\" id=\"3bExyWqKo0J\" role=\"2OqNvi\">\n+ <ref role=\"37wK5l\" to=\"mhbf:~SModel.isReadOnly()\" resolve=\"isReadOnly\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n+ <node concept=\"Rh6nW\" id=\"3bExyWqKn1f\" role=\"1bW2Oz\">\n+ <property role=\"TrG5h\" value=\"it\" />\n+ <node concept=\"2jxLKc\" id=\"3bExyWqKn1g\" role=\"1tU5fm\" />\n+ </node>\n+ </node>\n+ </node>\n+ </node>\n</node>\n</node>\n<node concept=\"2AHcQZ\" id=\"7ZZZU$lwQ7j\" role=\"2AJF6D\">\n"
}
]
| Kotlin | Apache License 2.0 | modelix/modelix | Exclude read only models from synchronization to the model server
These are usually stub models. It's not possible to update them from
the model server. |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.