Align subproject layout with metafacture-core

.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

.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'

README.md

@@ -26,15 +26,15 @@ 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`
 
 (To import the projects in Eclipse, choose File > Import > Existing Gradle Project and select the `metafacture-fix` directory.)
 
 ## 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

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"
 }

org.metafacture.fix.web/.settings/org.eclipse.wst.common.component → metafix-web/.settings/org.eclipse.wst.common.component

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="org.metafacture.fix.web">
-		<property name="context-root" value="org.metafacture.fix.web"/>
+	<wb-module deploy-name="metafix-web">
+		<property name="context-root" value="metafix-web"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/xtext-gen"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
 		<wb-resource deploy-path="/" source-path="src/main/webapp"/>
-		<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/org.metafacture.fix.ide/org.metafacture.fix.ide">
+		<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/metafix-ide/metafix-ide">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
-		<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/org.metafacture.fix/org.metafacture.fix">
+		<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/metafix/metafix">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
 	</wb-module>

org.metafacture.fix.web/build.gradle → 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}"

org.metafacture.fix/src/main/java/org/metafacture/metafix/GenerateFix.mwe2 → 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

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'