Second Layout Restructure

.github/workflows/build.yml

@@ -26,11 +26,11 @@ jobs:
           java-version: 17
           cache: 'maven'
       - name: Build Packages
-        run: ./mvnw clean package
+        run: cd jamopp-ext.parent && ./mvnw clean package
       - name: Store P2 Repository
         if: runner.os == 'Linux'
         uses: actions/upload-artifact@v3
         with:
           name: p2-jamopp
-          path: jamopp.p2/target/repository
+          path: jamopp-ext.parent/jamopp-ext.p2/target/repository
           retention-days: 1

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
           java-version: 17
           cache: 'maven'
       - name: Build Packages (without tests)
-        run: ./mvnw clean package -Dmaven.test.skip=true
+        run: cd jamopp-ext.parent && ./mvnw clean package -Dmaven.test.skip=true
       - name: Build Deploy Path
         shell: bash
         run: echo "DEPLOY_PATH=$( echo '${{ secrets.DEPLOYMENT_REMOTE_TARGET }}/extended-java-model-parser-and-printer' )" >> $GITHUB_ENV
@@ -31,7 +31,7 @@ jobs:
           remote-host: ${{ secrets.DEPLOYMENT_REMOTE_HOST }}
           remote-port: ${{ secrets.DEPLOYMENT_REMOTE_PORT }}
           server-ssh-key: ${{ secrets.DEPLOYMENT_SERVER_SSH_KEY }}
-          local-source: './jamopp.p2/target/repository/*'
+          local-source: './jamopp-ext.parent/jamopp-ext.p2/target/repository/*'
           remote-target: '${{ env.DEPLOY_PATH }}/release/${{ inputs.release-version }}'
           release-version: ${{ inputs.release-version }}
           link-path: ${{ env.DEPLOY_PATH }}
@@ -47,7 +47,7 @@ jobs:
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
           cache: 'maven'
       - name: Deploy to Apache Maven Central
-        run: mvn -Pdeploy-mvn-central deploy
+        run: cd jamopp-ext.parent && mvn -Pdeploy-mvn-central deploy
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.gitmodules

@@ -1,24 +1,24 @@
 [submodule "tests/org.emftext.language.java.test/JaMoPP-BulkTest"]
-	path = jamopp.tests/target/src-bulk/JaMoPP-BulkTest
+	path = jamopp-ext.parent/jamopp-ext.tests/target/src-bulk/JaMoPP-BulkTest
 	url = https://github.com/DevBoost/JaMoPP-BulkTest
 [submodule "tests/org.emftext.language.java.test/TeaStore"]
-	path = jamopp.tests/target/src-bulk/TeaStore
+	path = jamopp-ext.parent/jamopp-ext.tests/target/src-bulk/TeaStore
 	url = https://github.com/DescartesResearch/TeaStore
 [submodule "tests/org.emftext.language.java.test/teammates"]
-	path = jamopp.tests/target/src-bulk/teammates
+	path = jamopp-ext.parent/jamopp-ext.tests/target/src-bulk/teammates
 	url = https://github.com/TEAMMATES/teammates
 [submodule "tests/org.emftext.language.java.test/microservice"]
-	path = jamopp.tests/target/src-bulk/microservice
+	path = jamopp-ext.parent/jamopp-ext.tests/target/src-bulk/microservice
 	url = https://github.com/ewolff/microservice
 [submodule "tests/org.emftext.language.java.test/esda"]
-	path = jamopp.tests/target/src-bulk/esda
+	path = jamopp-ext.parent/jamopp-ext.tests/target/src-bulk/esda
 	url = https://github.com/kit-sdq/esda
 [submodule "tests/org.emftext.language.java.test/acmeair"]
-	path = jamopp.tests/target/src-bulk/acmeair
+	path = jamopp-ext.parent/jamopp-ext.tests/target/src-bulk/acmeair
 	url = https://github.com/acmeair/acmeair.git
 [submodule "tests/org.emftext.language.java.test/piggymetrics"]
-	path = jamopp.tests/target/src-bulk/piggymetrics
+	path = jamopp-ext.parent/jamopp-ext.tests/target/src-bulk/piggymetrics
 	url = https://github.com/sqshq/piggymetrics.git
 [submodule "tests/org.emftext.language.java.test/petclinic"]
-	path = jamopp.tests/target/src-bulk/petclinic
+	path = jamopp-ext.parent/jamopp-ext.tests/target/src-bulk/petclinic
 	url = https://github.com/spring-petclinic/spring-petclinic-microservices.git

jamopp.model.edit/pom.xml → jamopp-ext.parent/jamopp-ext.model.edit/pom.xml

@@ -4,14 +4,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jamopp.model.edit</artifactId>
+    <artifactId>jamopp-ext.model.edit</artifactId>
     <packaging>jar</packaging>
     <name>Extended Java Model Parser and Printer (JaMoPP) Metamodel Edit Support</name>
 	<description>This package provides edit support for the metamodel of the extended JaMoPP.</description>
 
     <parent>
         <groupId>tools.mdsd</groupId>
-        <artifactId>jamopp.parent</artifactId>
+        <artifactId>jamopp-ext.parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
     </parent>
 
@@ -164,7 +164,7 @@
         </dependency>
         <dependency>
             <groupId>tools.mdsd</groupId>
-            <artifactId>jamopp.model</artifactId>
+            <artifactId>jamopp-ext.model</artifactId>
             <version>6.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>

jamopp.model.editor/pom.xml → jamopp-ext.parent/jamopp-ext.model.editor/pom.xml

@@ -4,14 +4,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jamopp.model.editor</artifactId>
+    <artifactId>jamopp-ext.model.editor</artifactId>
     <packaging>jar</packaging>
     <name>Extended Java Model Parser and Printer (JaMoPP) Metamodel Editor</name>
 	<description>This package provides an editor for the extended JaMoPP allowing to edit Eclipse Modeling Framework-based Java models in the Eclipse IDE.</description>
 
     <parent>
         <groupId>tools.mdsd</groupId>
-        <artifactId>jamopp.parent</artifactId>
+        <artifactId>jamopp-ext.parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
     </parent>
 
@@ -51,7 +51,7 @@
     <dependencies>
         <dependency>
             <groupId>tools.mdsd</groupId>
-            <artifactId>jamopp.model.edit</artifactId>
+            <artifactId>jamopp-ext.model.edit</artifactId>
             <version>6.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>

jamopp.model/pom.xml → jamopp-ext.parent/jamopp-ext.model/pom.xml

@@ -4,14 +4,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jamopp.model</artifactId>
+    <artifactId>jamopp-ext.model</artifactId>
     <packaging>jar</packaging>
     <name>Extended Java Model Parser and Printer (JaMoPP) Metamodel</name>
 	<description>This package provides the metamodel and generated metamodel code for the extended JaMoPP to model Java source code in the Eclipse Modeling Framework.</description>
 
     <parent>
         <groupId>tools.mdsd</groupId>
-        <artifactId>jamopp.parent</artifactId>
+        <artifactId>jamopp-ext.parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
     </parent>
 
@@ -102,10 +102,10 @@
                                     <directory>${project.basedir}/src/main/generated</directory>
                                 </fileset>
                                 <fileset>
-                                    <directory>${project.basedir}/../jamopp.model.edit/src/main/generated</directory>
+                                    <directory>${project.basedir}/../jamopp-ext.model.edit/src/main/generated</directory>
                                 </fileset>
                                 <fileset>
-                                    <directory>${project.basedir}/../jamopp.model.edit/src/main/resources</directory>
+                                    <directory>${project.basedir}/../jamopp-ext.model.edit/src/main/resources</directory>
                                 </fileset>
                             </filesets>
                         </configuration>

jamopp.model/src/gen/generate.mwe2 → jamopp-ext.parent/jamopp-ext.model/src/gen/generate.mwe2

@@ -12,18 +12,18 @@ Workflow {
 		scanClassPath = false
 		platformUri = workspaceRoot
 		projectMapping = {
-			projectName = "jamopp.model"
-			path = "jamopp.model"
+			projectName = "jamopp-ext.model"
+			path = "jamopp-ext.model"
 		}
 		projectMapping = {
-		    projectName = "jamopp.model.edit"
-			path = "jamopp.model.edit"
+		    projectName = "jamopp-ext.model.edit"
+			path = "jamopp-ext.model.edit"
 		}
 	}
 
 	component = EcoreGenerator {
-		genModel = "platform:/resource/jamopp.model/src/main/resources/metamodel/java.genmodel"
-		srcPath = "platform:/resource/jamopp.model/src/main/generated"
+		genModel = "platform:/resource/jamopp-ext.model/src/main/resources/metamodel/java.genmodel"
+		srcPath = "platform:/resource/jamopp-ext.model/src/main/generated"
 		generateEdit = true
 	}
 }

jamopp.model/src/main/resources/metamodel/java.genmodel → jamopp-ext.parent/jamopp-ext.model/src/main/resources/metamodel/java.genmodel

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2020-2023&#xD;&#xA;Modelling for Continuous Software Engineering (MCSE) group, Institute of Information Security and Dependability (KASTEL), Karlsruhe Institute of Technology (KIT).&#xD;&#xA;&#xD;&#xA;Copyright (c) 2006-2014&#xD;&#xA;Software Technology Group, Dresden University of Technology&#xD;&#xA;DevBoost GmbH, Berlin, Amtsgericht Charlottenburg, HRB 140026&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  Software Technology Group - TU Dresden, Germany;&#xD;&#xA;  DevBoost GmbH - Berlin, Germany&#xD;&#xA;     - initial API and implementation&#xD;&#xA;  Martin Armbruster (MCSE, KASTEL, KIT)&#xD;&#xA;     - Adaptation and extension for Java 7+&#xD;&#xA; "
-    modelDirectory="/jamopp.model/src/main/generated" editDirectory="/jamopp.model.edit/src/main/generated"
-    editorDirectory="/jamopp.model.editor/src-gen" modelPluginID="tools.mdsd.jamopp.model"
+    modelDirectory="/jamopp-ext.model/src/main/generated" editDirectory="/jamopp-ext.model.edit/src/main/generated"
+    editorDirectory="/jamopp-ext.model.editor/src-gen" modelPluginID="tools.mdsd.jamopp.model"
     templateDirectory="" modelName="Java" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl"
     importerID="org.eclipse.emf.importer.ecore" bundleManifest="false" containmentProxies="true"
     complianceLevel="17.0" suppressGenModelAnnotations="false" copyrightFields="false"

jamopp.p2/pom.xml → jamopp-ext.parent/jamopp-ext.p2/pom.xml

@@ -3,14 +3,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-    <artifactId>jamopp.p2</artifactId>
+    <artifactId>jamopp-ext.p2</artifactId>
     <packaging>pom</packaging>
     <name>Extended JaMoPP P2 Site</name>
 	<description>This package builds a P2 update site for the extended JaMoPP.</description>
 
     <parent>
         <groupId>tools.mdsd</groupId>
-        <artifactId>jamopp.parent</artifactId>
+        <artifactId>jamopp-ext.parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
     </parent>
 
@@ -32,31 +32,31 @@
                                 <!-- specify your depencies here -->
                                 <!-- groupId:artifactId:version -->
                                 <artifact>
-                                    <id>tools.mdsd:jamopp.model:6.0.0-SNAPSHOT</id>
+                                    <id>tools.mdsd:jamopp-ext.model:6.0.0-SNAPSHOT</id>
                                     <transitive>false</transitive>
                                 </artifact>
                                 <artifact>
-                                    <id>tools.mdsd:jamopp.model.edit:6.0.0-SNAPSHOT</id>
+                                    <id>tools.mdsd:jamopp-ext.model.edit:6.0.0-SNAPSHOT</id>
                                     <transitive>false</transitive>
                                 </artifact>
                                 <artifact>
-                                    <id>tools.mdsd:jamopp.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
+                                    <id>tools.mdsd:jamopp-ext.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
                                     <transitive>false</transitive>
                                 </artifact>
                                 <artifact>
-                                    <id>tools.mdsd:jamopp.resource:6.0.0-SNAPSHOT</id>
+                                    <id>tools.mdsd:jamopp-ext.resource:6.0.0-SNAPSHOT</id>
                                     <transitive>false</transitive>
                                 </artifact>
                                 <artifact>
-                                    <id>tools.mdsd:jamopp.parser.jdt:6.0.0-SNAPSHOT</id>
+                                    <id>tools.mdsd:jamopp-ext.parser.jdt:6.0.0-SNAPSHOT</id>
                                     <transitive>false</transitive>
                                 </artifact>
 								<artifact>
-                                    <id>tools.mdsd:jamopp.parser.bcel:6.0.0-SNAPSHOT</id>
+                                    <id>tools.mdsd:jamopp-ext.parser.bcel:6.0.0-SNAPSHOT</id>
                                     <transitive>false</transitive>
                                 </artifact>
                                 <artifact>
-                                    <id>tools.mdsd:jamopp.standalone:6.0.0-SNAPSHOT</id>
+                                    <id>tools.mdsd:jamopp-ext.standalone:6.0.0-SNAPSHOT</id>
                                     <transitive>false</transitive>
                                 </artifact>
                                 <artifact>
@@ -106,47 +106,47 @@ Contributors:
                                     <generateSourceFeature>false</generateSourceFeature>
                                     <artifacts>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.model:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.model:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.model.edit:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.model.edit:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.parser:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.parser:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.parser.jdt:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.parser.jdt:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.parser.jdt.singlefile:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.printer:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.printer:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.resolution:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.resolution:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.resource:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.resource:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
                                         <artifact>
-                                            <id>tools.mdsd:jamopp.standalone:6.0.0-SNAPSHOT</id>
+                                            <id>tools.mdsd:jamopp-ext.standalone:6.0.0-SNAPSHOT</id>
                                             <transitive>false</transitive>
                                             <source>false</source>
                                         </artifact>
@@ -180,17 +180,17 @@ Contributors:
     <dependencies>
         <dependency>
             <groupId>tools.mdsd</groupId>
-            <artifactId>jamopp.tests</artifactId>
+            <artifactId>jamopp-ext.tests</artifactId>
             <version>6.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>tools.mdsd</groupId>
-            <artifactId>jamopp.model.edit</artifactId>
+            <artifactId>jamopp-ext.model.edit</artifactId>
             <version>6.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>tools.mdsd</groupId>
-            <artifactId>jamopp.standalone</artifactId>
+            <artifactId>jamopp-ext.standalone</artifactId>
             <version>6.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>

jamopp.parser.bcel/pom.xml → jamopp-ext.parent/jamopp-ext.parser.bcel/pom.xml

@@ -4,14 +4,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jamopp.parser.bcel</artifactId>
+    <artifactId>jamopp-ext.parser.bcel</artifactId>
     <packaging>jar</packaging>
     <name>Extended JaMoPP Parser for Class Files</name>
 	<description>This package provides a parser for the extended JaMoPP to read class files and generate Eclipse Modeling Framework-based Java models from the class files. Internally, the class files are read with the Apache Commons Bytecode Engineering Library (BCEL).</description>
 
     <parent>
         <groupId>tools.mdsd</groupId>
-        <artifactId>jamopp.parent</artifactId>
+        <artifactId>jamopp-ext.parent</artifactId>
         <version>6.0.0-SNAPSHOT</version>
     </parent>
 
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>tools.mdsd</groupId>
-            <artifactId>jamopp.model</artifactId>
+            <artifactId>jamopp-ext.model</artifactId>
             <version>6.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>