From 90021c2864ff1abd9ea1e00a044316165fd28cb5 Mon Sep 17 00:00:00 2001 From: Jens Wille Date: Mon, 15 Nov 2021 10:57:39 +0100 Subject: [PATCH 1/3] Align subproject layout with metafacture-core. (#71) --- README.md | 12 ++++++------ build.gradle | 6 +++--- {org.metafacture.fix.ide => metafix-ide}/.checkstyle | 0 .../.settings/org.eclipse.buildship.core.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../build.gradle | 0 .../org/metafacture/metafix/ide/FixIdeModule.java | 0 .../org/metafacture/metafix/ide/FixIdeSetup.java | 0 .../ide/contentassist/antlr/FixTokenSource.java | 0 .../.vscode/launch.json | 0 .../.vscode/settings.json | 0 .../.vscode/tasks.json | 0 .../.vscodeignore | 0 .../fix.configuration.json | 0 .../fix.snippets.json | 0 .../fix.tmLanguage | 0 .../package.json | 0 .../src/extension.ts | 0 .../tsconfig.json | 0 {org.metafacture.fix.web => metafix-web}/.checkstyle | 0 .../.settings/org.eclipse.buildship.core.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.wst.common.component | 0 .../org.eclipse.wst.common.project.facet.core.xml | 0 .../build.gradle | 2 +- .../java/org/metafacture/metafix/web/FixServlet.java | 0 .../org/metafacture/metafix/web/FixWebModule.java | 0 .../org/metafacture/metafix/web/FixWebSetup.java | 0 .../org/metafacture/metafix/web/ServerLauncher.java | 0 .../src/main/webapp/index.html | 0 .../src/main/webapp/style.css | 0 {org.metafacture.fix => metafix}/.checkstyle | 0 ...Generate Fix (fix) Language Infrastructure.launch | 0 .../.settings/org.eclipse.buildship.core.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 {org.metafacture.fix => metafix}/build.gradle | 0 .../src/main/java/org/metafacture/metafix/Fix.xtext | 0 .../main/java/org/metafacture/metafix/FixMethod.java | 0 .../java/org/metafacture/metafix/FixPredicate.java | 0 .../org/metafacture/metafix/FixRuntimeModule.java | 0 .../org/metafacture/metafix/FixStandaloneSetup.java | 0 .../java/org/metafacture/metafix/GenerateFix.mwe2 | 6 +++++- .../main/java/org/metafacture/metafix/Metafix.java | 0 .../org/metafacture/metafix/RecordTransformer.java | 0 .../metafix/interpreter/FixInterpreter.java | 0 .../metafix/jvmmodel/FixJvmModelInferrer.java | 0 .../metafix/parser/antlr/FixTokenSource.java | 0 .../metafix/scoping/FixScopeProvider.java | 0 .../metafacture/metafix/validation/FixValidator.java | 0 .../metafix/validation/XtextValidator.java | 0 .../src/main/resources/flux-commands.properties | 0 .../java/org/metafacture/metafix/FixParsingTest.java | 0 .../org/metafacture/metafix/InterpreterTest.java | 0 .../org/metafacture/metafix/MetafixBindTest.java | 0 .../java/org/metafacture/metafix/MetafixIfTest.java | 0 .../org/metafacture/metafix/MetafixLookupTest.java | 0 .../org/metafacture/metafix/MetafixMethodTest.java | 0 .../org/metafacture/metafix/MetafixRecordTest.java | 0 .../org/metafacture/metafix/MetafixSelectorTest.java | 0 .../org/metafacture/metafix/MetafixTestHelpers.java | 0 .../test/java/org/metafacture/metafix/maps/test.csv | 0 .../test/java/org/metafacture/metafix/maps/test.tsv | 0 settings.gradle | 9 +++------ 63 files changed, 18 insertions(+), 17 deletions(-) rename {org.metafacture.fix.ide => metafix-ide}/.checkstyle (100%) rename {org.metafacture.fix.ide => metafix-ide}/.settings/org.eclipse.buildship.core.prefs (100%) rename {org.metafacture.fix.ide => metafix-ide}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.metafacture.fix.ide => metafix-ide}/build.gradle (100%) rename {org.metafacture.fix.ide => metafix-ide}/src/main/java/org/metafacture/metafix/ide/FixIdeModule.java (100%) rename {org.metafacture.fix.ide => metafix-ide}/src/main/java/org/metafacture/metafix/ide/FixIdeSetup.java (100%) rename {org.metafacture.fix.ide => metafix-ide}/src/main/java/org/metafacture/metafix/ide/contentassist/antlr/FixTokenSource.java (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/.vscode/launch.json (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/.vscode/settings.json (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/.vscode/tasks.json (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/.vscodeignore (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/fix.configuration.json (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/fix.snippets.json (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/fix.tmLanguage (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/package.json (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/src/extension.ts (100%) rename {org.metafacture.fix.vsc => metafix-vsc}/tsconfig.json (100%) rename {org.metafacture.fix.web => metafix-web}/.checkstyle (100%) rename {org.metafacture.fix.web => metafix-web}/.settings/org.eclipse.buildship.core.prefs (100%) rename {org.metafacture.fix.web => metafix-web}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.metafacture.fix.web => metafix-web}/.settings/org.eclipse.wst.common.component (100%) rename {org.metafacture.fix.web => metafix-web}/.settings/org.eclipse.wst.common.project.facet.core.xml (100%) rename {org.metafacture.fix.web => metafix-web}/build.gradle (96%) rename {org.metafacture.fix.web => metafix-web}/src/main/java/org/metafacture/metafix/web/FixServlet.java (100%) rename {org.metafacture.fix.web => metafix-web}/src/main/java/org/metafacture/metafix/web/FixWebModule.java (100%) rename {org.metafacture.fix.web => metafix-web}/src/main/java/org/metafacture/metafix/web/FixWebSetup.java (100%) rename {org.metafacture.fix.web => metafix-web}/src/main/java/org/metafacture/metafix/web/ServerLauncher.java (100%) rename {org.metafacture.fix.web => metafix-web}/src/main/webapp/index.html (100%) rename {org.metafacture.fix.web => metafix-web}/src/main/webapp/style.css (100%) rename {org.metafacture.fix => metafix}/.checkstyle (100%) rename {org.metafacture.fix => metafix}/.launch/Generate Fix (fix) Language Infrastructure.launch (100%) rename {org.metafacture.fix => metafix}/.settings/org.eclipse.buildship.core.prefs (100%) rename {org.metafacture.fix => metafix}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.metafacture.fix => metafix}/build.gradle (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/Fix.xtext (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/FixMethod.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/FixPredicate.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/FixRuntimeModule.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/FixStandaloneSetup.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/GenerateFix.mwe2 (90%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/Metafix.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/RecordTransformer.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/interpreter/FixInterpreter.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/jvmmodel/FixJvmModelInferrer.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/parser/antlr/FixTokenSource.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/scoping/FixScopeProvider.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/validation/FixValidator.java (100%) rename {org.metafacture.fix => metafix}/src/main/java/org/metafacture/metafix/validation/XtextValidator.java (100%) rename {org.metafacture.fix => metafix}/src/main/resources/flux-commands.properties (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/FixParsingTest.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/InterpreterTest.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/MetafixBindTest.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/MetafixIfTest.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/MetafixLookupTest.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/MetafixMethodTest.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/MetafixRecordTest.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/MetafixSelectorTest.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/MetafixTestHelpers.java (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/maps/test.csv (100%) rename {org.metafacture.fix => metafix}/src/test/java/org/metafacture/metafix/maps/test.tsv (100%) diff --git a/README.md b/README.md index 89443a05..25f79cf8 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Go to the Git repository root: `cd metafacture-fix/` -Run the tests (in `org.metafacture.fix/src/test/java`) and checks (`.editorconfig`, `config/checkstyle/checkstyle.xml`): +Run the tests (in `metafix/src/test/java`) and checks (`.editorconfig`, `config/checkstyle/checkstyle.xml`): `./gradlew clean check` @@ -34,7 +34,7 @@ Run the tests (in `org.metafacture.fix/src/test/java`) and checks (`.editorconfi ## Extension -The project `org.metafacture.fix.vsc` provides an extension for Visual Studio Code / Codium for `fix` via the language server protocol (LSP). In the current state the extension supports auto completion, simple syntax highlighting and auto closing brackets and quotes. This project was created using this [tutorial](https://www.typefox.io/blog/building-a-vs-code-extension-with-xtext-and-the-language-server-protocol) and the corresponding [example](https://github.com/TypeFox/languageserver-example). +The project `metafix-vsc` provides an extension for Visual Studio Code / Codium for `fix` via the language server protocol (LSP). In the current state the extension supports auto completion, simple syntax highlighting and auto closing brackets and quotes. This project was created using this [tutorial](https://www.typefox.io/blog/building-a-vs-code-extension-with-xtext-and-the-language-server-protocol) and the corresponding [example](https://github.com/TypeFox/languageserver-example). Build extension: @@ -44,19 +44,19 @@ Build extension: 3. In metafacture-fix execute: Unix: `./gradlew installServer` Windows: `.\gradlew.bat installServer` -4. In org.metafacture.fix.vsc execute (tip: if you use windows, install cygwin to execute npm commands): +4. In `metafix-vsc/` execute (tip: if you use windows, install cygwin to execute npm commands): `npm install` To start the extension in development mode (starting a second code/codium instance), follow A. To create an vsix file to install the extension permanently follow B. A) Run in dev mode: -1. Open org.metafacture.fix.vsc in Visual Studio Code / Codium +1. Open `metafix-vsc/` in Visual Studio Code / Codium 2. Launch vscode extension by pressing F5 (opens new window of Visual Studio Code) -3. Open new file (file-ending .fix) or open existing fix-file (see sample below) +3. Open new file (file-ending `.fix`) or open existing fix-file (see sample below) B) Install vsix file: 1. Install vsce: `npm install -g vsce` -2. In org.metafacture.fix.vsc execute: `vsce package` +2. In `metafix-vsc/` execute: `vsce package` vsce will create a vsix file in the vsc directory which can be used for installation: 3. Open VS Code / Codium 4. Click 'Extensions' section diff --git a/build.gradle b/build.gradle index 8600dd0a..deb8000c 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ subprojects { } task installServer(type: Copy) { - dependsOn(':org.metafacture.fix.ide:installDist') - from "org.metafacture.fix.ide/build/install/xtext-server" - into "org.metafacture.fix.vsc/xtext-server" + dependsOn(':metafix-ide:installDist') + from "metafix-ide/build/install/xtext-server" + into "metafix-vsc/xtext-server" } diff --git a/org.metafacture.fix.ide/.checkstyle b/metafix-ide/.checkstyle similarity index 100% rename from org.metafacture.fix.ide/.checkstyle rename to metafix-ide/.checkstyle diff --git a/org.metafacture.fix.ide/.settings/org.eclipse.buildship.core.prefs b/metafix-ide/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from org.metafacture.fix.ide/.settings/org.eclipse.buildship.core.prefs rename to metafix-ide/.settings/org.eclipse.buildship.core.prefs diff --git a/org.metafacture.fix.ide/.settings/org.eclipse.jdt.core.prefs b/metafix-ide/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.metafacture.fix.ide/.settings/org.eclipse.jdt.core.prefs rename to metafix-ide/.settings/org.eclipse.jdt.core.prefs diff --git a/org.metafacture.fix.ide/build.gradle b/metafix-ide/build.gradle similarity index 100% rename from org.metafacture.fix.ide/build.gradle rename to metafix-ide/build.gradle diff --git a/org.metafacture.fix.ide/src/main/java/org/metafacture/metafix/ide/FixIdeModule.java b/metafix-ide/src/main/java/org/metafacture/metafix/ide/FixIdeModule.java similarity index 100% rename from org.metafacture.fix.ide/src/main/java/org/metafacture/metafix/ide/FixIdeModule.java rename to metafix-ide/src/main/java/org/metafacture/metafix/ide/FixIdeModule.java diff --git a/org.metafacture.fix.ide/src/main/java/org/metafacture/metafix/ide/FixIdeSetup.java b/metafix-ide/src/main/java/org/metafacture/metafix/ide/FixIdeSetup.java similarity index 100% rename from org.metafacture.fix.ide/src/main/java/org/metafacture/metafix/ide/FixIdeSetup.java rename to metafix-ide/src/main/java/org/metafacture/metafix/ide/FixIdeSetup.java diff --git a/org.metafacture.fix.ide/src/main/java/org/metafacture/metafix/ide/contentassist/antlr/FixTokenSource.java b/metafix-ide/src/main/java/org/metafacture/metafix/ide/contentassist/antlr/FixTokenSource.java similarity index 100% rename from org.metafacture.fix.ide/src/main/java/org/metafacture/metafix/ide/contentassist/antlr/FixTokenSource.java rename to metafix-ide/src/main/java/org/metafacture/metafix/ide/contentassist/antlr/FixTokenSource.java diff --git a/org.metafacture.fix.vsc/.vscode/launch.json b/metafix-vsc/.vscode/launch.json similarity index 100% rename from org.metafacture.fix.vsc/.vscode/launch.json rename to metafix-vsc/.vscode/launch.json diff --git a/org.metafacture.fix.vsc/.vscode/settings.json b/metafix-vsc/.vscode/settings.json similarity index 100% rename from org.metafacture.fix.vsc/.vscode/settings.json rename to metafix-vsc/.vscode/settings.json diff --git a/org.metafacture.fix.vsc/.vscode/tasks.json b/metafix-vsc/.vscode/tasks.json similarity index 100% rename from org.metafacture.fix.vsc/.vscode/tasks.json rename to metafix-vsc/.vscode/tasks.json diff --git a/org.metafacture.fix.vsc/.vscodeignore b/metafix-vsc/.vscodeignore similarity index 100% rename from org.metafacture.fix.vsc/.vscodeignore rename to metafix-vsc/.vscodeignore diff --git a/org.metafacture.fix.vsc/fix.configuration.json b/metafix-vsc/fix.configuration.json similarity index 100% rename from org.metafacture.fix.vsc/fix.configuration.json rename to metafix-vsc/fix.configuration.json diff --git a/org.metafacture.fix.vsc/fix.snippets.json b/metafix-vsc/fix.snippets.json similarity index 100% rename from org.metafacture.fix.vsc/fix.snippets.json rename to metafix-vsc/fix.snippets.json diff --git a/org.metafacture.fix.vsc/fix.tmLanguage b/metafix-vsc/fix.tmLanguage similarity index 100% rename from org.metafacture.fix.vsc/fix.tmLanguage rename to metafix-vsc/fix.tmLanguage diff --git a/org.metafacture.fix.vsc/package.json b/metafix-vsc/package.json similarity index 100% rename from org.metafacture.fix.vsc/package.json rename to metafix-vsc/package.json diff --git a/org.metafacture.fix.vsc/src/extension.ts b/metafix-vsc/src/extension.ts similarity index 100% rename from org.metafacture.fix.vsc/src/extension.ts rename to metafix-vsc/src/extension.ts diff --git a/org.metafacture.fix.vsc/tsconfig.json b/metafix-vsc/tsconfig.json similarity index 100% rename from org.metafacture.fix.vsc/tsconfig.json rename to metafix-vsc/tsconfig.json diff --git a/org.metafacture.fix.web/.checkstyle b/metafix-web/.checkstyle similarity index 100% rename from org.metafacture.fix.web/.checkstyle rename to metafix-web/.checkstyle diff --git a/org.metafacture.fix.web/.settings/org.eclipse.buildship.core.prefs b/metafix-web/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from org.metafacture.fix.web/.settings/org.eclipse.buildship.core.prefs rename to metafix-web/.settings/org.eclipse.buildship.core.prefs diff --git a/org.metafacture.fix.web/.settings/org.eclipse.jdt.core.prefs b/metafix-web/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.metafacture.fix.web/.settings/org.eclipse.jdt.core.prefs rename to metafix-web/.settings/org.eclipse.jdt.core.prefs diff --git a/org.metafacture.fix.web/.settings/org.eclipse.wst.common.component b/metafix-web/.settings/org.eclipse.wst.common.component similarity index 100% rename from org.metafacture.fix.web/.settings/org.eclipse.wst.common.component rename to metafix-web/.settings/org.eclipse.wst.common.component diff --git a/org.metafacture.fix.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/metafix-web/.settings/org.eclipse.wst.common.project.facet.core.xml similarity index 100% rename from org.metafacture.fix.web/.settings/org.eclipse.wst.common.project.facet.core.xml rename to metafix-web/.settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/org.metafacture.fix.web/build.gradle b/metafix-web/build.gradle similarity index 96% rename from org.metafacture.fix.web/build.gradle rename to metafix-web/build.gradle index 61e79562..6a16c576 100644 --- a/org.metafacture.fix.web/build.gradle +++ b/metafix-web/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { implementation project(':metafix') - implementation project(':org.metafacture.fix.ide') + implementation project(':metafix-ide') implementation "org.eclipse.xtend:org.eclipse.xtend.lib:${versions.xtext}" implementation "org.eclipse.xtext:org.eclipse.xtext.web.servlet:${versions.xtext}" diff --git a/org.metafacture.fix.web/src/main/java/org/metafacture/metafix/web/FixServlet.java b/metafix-web/src/main/java/org/metafacture/metafix/web/FixServlet.java similarity index 100% rename from org.metafacture.fix.web/src/main/java/org/metafacture/metafix/web/FixServlet.java rename to metafix-web/src/main/java/org/metafacture/metafix/web/FixServlet.java diff --git a/org.metafacture.fix.web/src/main/java/org/metafacture/metafix/web/FixWebModule.java b/metafix-web/src/main/java/org/metafacture/metafix/web/FixWebModule.java similarity index 100% rename from org.metafacture.fix.web/src/main/java/org/metafacture/metafix/web/FixWebModule.java rename to metafix-web/src/main/java/org/metafacture/metafix/web/FixWebModule.java diff --git a/org.metafacture.fix.web/src/main/java/org/metafacture/metafix/web/FixWebSetup.java b/metafix-web/src/main/java/org/metafacture/metafix/web/FixWebSetup.java similarity index 100% rename from org.metafacture.fix.web/src/main/java/org/metafacture/metafix/web/FixWebSetup.java rename to metafix-web/src/main/java/org/metafacture/metafix/web/FixWebSetup.java diff --git a/org.metafacture.fix.web/src/main/java/org/metafacture/metafix/web/ServerLauncher.java b/metafix-web/src/main/java/org/metafacture/metafix/web/ServerLauncher.java similarity index 100% rename from org.metafacture.fix.web/src/main/java/org/metafacture/metafix/web/ServerLauncher.java rename to metafix-web/src/main/java/org/metafacture/metafix/web/ServerLauncher.java diff --git a/org.metafacture.fix.web/src/main/webapp/index.html b/metafix-web/src/main/webapp/index.html similarity index 100% rename from org.metafacture.fix.web/src/main/webapp/index.html rename to metafix-web/src/main/webapp/index.html diff --git a/org.metafacture.fix.web/src/main/webapp/style.css b/metafix-web/src/main/webapp/style.css similarity index 100% rename from org.metafacture.fix.web/src/main/webapp/style.css rename to metafix-web/src/main/webapp/style.css diff --git a/org.metafacture.fix/.checkstyle b/metafix/.checkstyle similarity index 100% rename from org.metafacture.fix/.checkstyle rename to metafix/.checkstyle diff --git a/org.metafacture.fix/.launch/Generate Fix (fix) Language Infrastructure.launch b/metafix/.launch/Generate Fix (fix) Language Infrastructure.launch similarity index 100% rename from org.metafacture.fix/.launch/Generate Fix (fix) Language Infrastructure.launch rename to metafix/.launch/Generate Fix (fix) Language Infrastructure.launch diff --git a/org.metafacture.fix/.settings/org.eclipse.buildship.core.prefs b/metafix/.settings/org.eclipse.buildship.core.prefs similarity index 100% rename from org.metafacture.fix/.settings/org.eclipse.buildship.core.prefs rename to metafix/.settings/org.eclipse.buildship.core.prefs diff --git a/org.metafacture.fix/.settings/org.eclipse.jdt.core.prefs b/metafix/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.metafacture.fix/.settings/org.eclipse.jdt.core.prefs rename to metafix/.settings/org.eclipse.jdt.core.prefs diff --git a/org.metafacture.fix/build.gradle b/metafix/build.gradle similarity index 100% rename from org.metafacture.fix/build.gradle rename to metafix/build.gradle diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/Fix.xtext b/metafix/src/main/java/org/metafacture/metafix/Fix.xtext similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/Fix.xtext rename to metafix/src/main/java/org/metafacture/metafix/Fix.xtext diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/FixMethod.java b/metafix/src/main/java/org/metafacture/metafix/FixMethod.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/FixMethod.java rename to metafix/src/main/java/org/metafacture/metafix/FixMethod.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/FixPredicate.java b/metafix/src/main/java/org/metafacture/metafix/FixPredicate.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/FixPredicate.java rename to metafix/src/main/java/org/metafacture/metafix/FixPredicate.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/FixRuntimeModule.java b/metafix/src/main/java/org/metafacture/metafix/FixRuntimeModule.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/FixRuntimeModule.java rename to metafix/src/main/java/org/metafacture/metafix/FixRuntimeModule.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/FixStandaloneSetup.java b/metafix/src/main/java/org/metafacture/metafix/FixStandaloneSetup.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/FixStandaloneSetup.java rename to metafix/src/main/java/org/metafacture/metafix/FixStandaloneSetup.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/GenerateFix.mwe2 b/metafix/src/main/java/org/metafacture/metafix/GenerateFix.mwe2 similarity index 90% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/GenerateFix.mwe2 rename to metafix/src/main/java/org/metafacture/metafix/GenerateFix.mwe2 index 1658438a..2ba03cbd 100644 --- a/org.metafacture.fix/src/main/java/org/metafacture/metafix/GenerateFix.mwe2 +++ b/metafix/src/main/java/org/metafacture/metafix/GenerateFix.mwe2 @@ -7,12 +7,16 @@ Workflow { component = XtextGenerator { configuration = { project = StandardProjectConfig { - baseName = "org.metafacture.fix" + baseName = "metafix" rootPath = ".." runtimeTest = { enabled = true } + genericIde = { + name = "metafix-ide" + } web = { + name = "metafix-web" enabled = true } mavenLayout = true diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/Metafix.java b/metafix/src/main/java/org/metafacture/metafix/Metafix.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/Metafix.java rename to metafix/src/main/java/org/metafacture/metafix/Metafix.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/RecordTransformer.java b/metafix/src/main/java/org/metafacture/metafix/RecordTransformer.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/RecordTransformer.java rename to metafix/src/main/java/org/metafacture/metafix/RecordTransformer.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/interpreter/FixInterpreter.java b/metafix/src/main/java/org/metafacture/metafix/interpreter/FixInterpreter.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/interpreter/FixInterpreter.java rename to metafix/src/main/java/org/metafacture/metafix/interpreter/FixInterpreter.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/jvmmodel/FixJvmModelInferrer.java b/metafix/src/main/java/org/metafacture/metafix/jvmmodel/FixJvmModelInferrer.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/jvmmodel/FixJvmModelInferrer.java rename to metafix/src/main/java/org/metafacture/metafix/jvmmodel/FixJvmModelInferrer.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/parser/antlr/FixTokenSource.java b/metafix/src/main/java/org/metafacture/metafix/parser/antlr/FixTokenSource.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/parser/antlr/FixTokenSource.java rename to metafix/src/main/java/org/metafacture/metafix/parser/antlr/FixTokenSource.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/scoping/FixScopeProvider.java b/metafix/src/main/java/org/metafacture/metafix/scoping/FixScopeProvider.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/scoping/FixScopeProvider.java rename to metafix/src/main/java/org/metafacture/metafix/scoping/FixScopeProvider.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/validation/FixValidator.java b/metafix/src/main/java/org/metafacture/metafix/validation/FixValidator.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/validation/FixValidator.java rename to metafix/src/main/java/org/metafacture/metafix/validation/FixValidator.java diff --git a/org.metafacture.fix/src/main/java/org/metafacture/metafix/validation/XtextValidator.java b/metafix/src/main/java/org/metafacture/metafix/validation/XtextValidator.java similarity index 100% rename from org.metafacture.fix/src/main/java/org/metafacture/metafix/validation/XtextValidator.java rename to metafix/src/main/java/org/metafacture/metafix/validation/XtextValidator.java diff --git a/org.metafacture.fix/src/main/resources/flux-commands.properties b/metafix/src/main/resources/flux-commands.properties similarity index 100% rename from org.metafacture.fix/src/main/resources/flux-commands.properties rename to metafix/src/main/resources/flux-commands.properties diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/FixParsingTest.java b/metafix/src/test/java/org/metafacture/metafix/FixParsingTest.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/FixParsingTest.java rename to metafix/src/test/java/org/metafacture/metafix/FixParsingTest.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/InterpreterTest.java b/metafix/src/test/java/org/metafacture/metafix/InterpreterTest.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/InterpreterTest.java rename to metafix/src/test/java/org/metafacture/metafix/InterpreterTest.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixBindTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixBindTest.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixBindTest.java rename to metafix/src/test/java/org/metafacture/metafix/MetafixBindTest.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixIfTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixIfTest.java rename to metafix/src/test/java/org/metafacture/metafix/MetafixIfTest.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java rename to metafix/src/test/java/org/metafacture/metafix/MetafixLookupTest.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java rename to metafix/src/test/java/org/metafacture/metafix/MetafixMethodTest.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java rename to metafix/src/test/java/org/metafacture/metafix/MetafixRecordTest.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixSelectorTest.java b/metafix/src/test/java/org/metafacture/metafix/MetafixSelectorTest.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixSelectorTest.java rename to metafix/src/test/java/org/metafacture/metafix/MetafixSelectorTest.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixTestHelpers.java b/metafix/src/test/java/org/metafacture/metafix/MetafixTestHelpers.java similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/MetafixTestHelpers.java rename to metafix/src/test/java/org/metafacture/metafix/MetafixTestHelpers.java diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/maps/test.csv b/metafix/src/test/java/org/metafacture/metafix/maps/test.csv similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/maps/test.csv rename to metafix/src/test/java/org/metafacture/metafix/maps/test.csv diff --git a/org.metafacture.fix/src/test/java/org/metafacture/metafix/maps/test.tsv b/metafix/src/test/java/org/metafacture/metafix/maps/test.tsv similarity index 100% rename from org.metafacture.fix/src/test/java/org/metafacture/metafix/maps/test.tsv rename to metafix/src/test/java/org/metafacture/metafix/maps/test.tsv diff --git a/settings.gradle b/settings.gradle index cd77d6b0..7c5a8f0e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,3 @@ -include 'org.metafacture.fix' -include 'org.metafacture.fix.ide' -include 'org.metafacture.fix.web' - -// change subproject name -project(":org.metafacture.fix").name = "metafix" +include 'metafix' +include 'metafix-ide' +include 'metafix-web' From a73ed685c072bf92b6f205f88ec71614760d1abf Mon Sep 17 00:00:00 2001 From: Jens Wille Date: Mon, 15 Nov 2021 11:14:30 +0100 Subject: [PATCH 2/3] Fix GitHub workflows. (#75) --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a1a064f..6a6ec0e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,6 @@ jobs: - name: Install language server run: ./gradlew installServer - name: Change directory - run: cd org.metafacture.fix.vsc/ + run: cd metafix-vsc/ - name: Install fix extension run: npm install diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 83116dc2..55a8c09a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,7 +25,7 @@ jobs: ./gradlew build ./gradlew installServer - name: Create fix extension - working-directory: org.metafacture.fix.vsc/ + working-directory: metafix-vsc/ run: | npm install vsce package -o fix.vsix @@ -34,7 +34,7 @@ jobs: env: API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} with: - source_file: 'org.metafacture.fix.vsc/fix.vsix' + source_file: 'metafix-vsc/fix.vsix' destination_repo: 'metafacture/metafacture.github.io' destination_branch: main destination_folder: 'ide-extensions' From 91202c2a16a4b5a3ffced98df22c9f788a221863 Mon Sep 17 00:00:00 2001 From: Fabian Steeg Date: Mon, 15 Nov 2021 11:53:20 +0100 Subject: [PATCH 3/3] Update `org.eclipse.wst.common.component` config (#71) --- metafix-web/.settings/org.eclipse.wst.common.component | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/metafix-web/.settings/org.eclipse.wst.common.component b/metafix-web/.settings/org.eclipse.wst.common.component index 1e09fb90..55685759 100644 --- a/metafix-web/.settings/org.eclipse.wst.common.component +++ b/metafix-web/.settings/org.eclipse.wst.common.component @@ -1,14 +1,14 @@ - - + + - + uses - + uses