diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4673dc1902..b97723187f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1 @@ -* @tsaglam -* @TomWerm * @vitruv-tools/maintainers diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 52a258cc4c..c6f9cfc95e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,12 +1,18 @@ version: 2 updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "weekly" - day: "wednesday" - time: "11:00" - timezone: "Europe/Berlin" - commit-message: - prefix: "GitHub Actions" - include: "scope" +- package-ecosystem: maven + directory: "/" + schedule: + interval: daily + ignore: + - dependency-name: tools.vitruv:* + commit-message: + prefix: "Maven" + include: "scope" +- package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" + commit-message: + prefix: "GitHub Actions" + include: "scope" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9da1d3ba6a..0f0e911fca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,73 +1,87 @@ name: CI +# workflow triggers on: - push: - branches: [main] - release: - types: [created] + # manually + workflow_dispatch: + # PRs on `main` + pull_request: + branches: + - main + # nightly schedule: - - cron: '5 3 * * *' # run nightly at 3:05 am - workflow_call: + - cron: "0 3 * * *" jobs: - build: + verify: + name: Verify build on ${{ matrix.os }} + runs-on: ${{ matrix.os }} strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] fail-fast: false - runs-on: ${{ matrix.os }} + matrix: + os: [ubuntu-latest, windows-latest, macOS-latest] + + steps: + - name: Checkout repository + uses: actions/checkout@v4.1.1 + + - name: Setup Java and Maven cache + uses: actions/setup-java@v3.13.0 + with: + distribution: 'temurin' + java-version: '17' + check-latest: true + cache: 'maven' + + - name: Verify build + run: > + ./mvnw clean verify + --batch-mode + --update-snapshots + --no-transfer-progress + + - name: Stage build results + run: mkdir staging-${{ matrix.os }} && cp **/target/*.jar staging-${{ matrix.os }}/ + + - name: Upload build results + uses: actions/upload-artifact@v3.1.3 + with: + name: Build Results + path: staging-*/ + + deploy-snapshot: + name: Deploy snapshot + runs-on: ubuntu-latest + needs: [verify] + if: github.ref == 'refs/heads/main' && github.repository_owner == 'vitruv-tools' + strategy: + fail-fast: true + steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Cache - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml', '**/MANIFEST.MF') }} - restore-keys: ${{ runner.os }}-m2 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - - name: Build and Verify - run: > - ./mvnw -B -U clean verify - '-Dstyle.color=always' - '-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - '-Dorg.slf4j.simpleLogger.log.org.eclipse.tycho.core.resolver.DefaultTychoResolver=warn' - '-Dorg.slf4j.simpleLogger.log.org.eclipse.tycho.osgi.configuration.MavenContextConfigurator=warn' - '-Dorg.slf4j.simpleLogger.log.org.eclipse.sisu.equinox.launching.internal.DefaultEquinoxLauncher=warn' - '-Dorg.slf4j.simpleLogger.log.org.eclipse.xtext.maven.XtextGenerateMojo=warn' - '-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog' - env: - MAVEN_OPTS: -Djansi.force=true - - name: Store Framework Artifact - if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v4 - with: - name: framework - path: releng/tools.vitruv.updatesite/target/repository - retention-days: 1 - - name: Publish Nightly Update Site - if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'vitruv-tools' && matrix.os == 'ubuntu-latest' - uses: peaceiris/actions-gh-pages@v4 - with: - deploy_key: ${{ secrets.UPDATE_SITE_DEPLOY_KEY }} - external_repository: vitruv-tools/updatesite - destination_dir: nightly/framework - publish_dir: releng/tools.vitruv.updatesite/target/repository - publish_branch: main - user_name: 'github-actions[bot]' - user_email: 'github-actions[bot]@users.noreply.github.com' - - name: Publish Release Update Site - if: github.event_name == 'release' && github.repository_owner == 'vitruv-tools' && matrix.os == 'ubuntu-latest' - uses: peaceiris/actions-gh-pages@v4 - with: - deploy_key: ${{ secrets.UPDATE_SITE_DEPLOY_KEY }} - external_repository: vitruv-tools/updatesite - destination_dir: release/framework/${{ github.event.release.tag_name }} - publish_dir: releng/tools.vitruv.updatesite/target/repository - publish_branch: main - user_name: 'github-actions[bot]' - user_email: 'github-actions[bot]@users.noreply.github.com' + - name: Checkout repository + uses: actions/checkout@v4.1.1 + + - name: Setup Java and Maven cache + uses: actions/setup-java@v3.13.0 + with: + distribution: 'temurin' + java-version: '17' + check-latest: true + cache: 'maven' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE + + - name: Deploy snapshot + run: > + ./mvnw clean deploy -P snapshot + -DskipTests + --batch-mode + --update-snapshots + --no-transfer-progress + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml deleted file mode 100644 index 8415139598..0000000000 --- a/.github/workflows/validation.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: Validation - -on: - pull_request: - -jobs: - validate_framework: - name: Framework - uses: ./.github/workflows/ci.yml - - build_dsls: - name: DSLs - runs-on: ubuntu-latest - steps: - - name: Checkout DSLs - uses: actions/checkout@v4 - with: - path: dsls - repository: vitruv-tools/Vitruv-DSLs - ref: main - fetch-depth: 0 - - name: Checkout Matching DSLs Branch - run: | - cd dsls - git checkout -B ${{ github.head_ref }} origin/${{ github.head_ref }} || true - - name: Cache - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml', '**/MANIFEST.MF') }} - restore-keys: ${{ runner.os }}-m2 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - - name: Build DSLs - uses: coactions/setup-xvfb@v1 - with: - working-directory: ./dsls - run: > - ./mvnw -B -U clean package - -Dstyle.color=always - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - -Dorg.slf4j.simpleLogger.log.org.eclipse.tycho.core.resolver.DefaultTychoResolver=warn - -Dorg.slf4j.simpleLogger.log.org.eclipse.tycho.osgi.configuration.MavenContextConfigurator=warn - -Dorg.slf4j.simpleLogger.log.org.eclipse.sisu.equinox.launching.internal.DefaultEquinoxLauncher=warn - -Dorg.slf4j.simpleLogger.log.org.eclipse.xtext.maven.XtextGenerateMojo=warn - -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog - env: - MAVEN_OPTS: -Djansi.force=true - - name: Store DSLs Artifact - uses: actions/upload-artifact@v4 - with: - name: dsls - path: dsls/releng/tools.vitruv.dsls.updatesite/target/repository - retention-days: 1 - - validate_casestudies: - needs: [validate_framework, build_dsls] - name: Case Studies - runs-on: ubuntu-latest - steps: - - name: Download Framework Artifact - uses: actions/download-artifact@v4 - with: - name: framework - path: framework - - name: Download DSLs Artifact - uses: actions/download-artifact@v4 - with: - name: dsls - path: dsls - - name: Checkout Case Studies - uses: actions/checkout@v4 - with: - path: casestudies - repository: vitruv-tools/Vitruv-CaseStudies - ref: main - fetch-depth: 0 - - name: Checkout Matching Case Studies Branch - run: | - cd casestudies - git checkout -B ${{ github.head_ref }} origin/${{ github.head_ref }} || true - - name: Cache - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml', '**/MANIFEST.MF') }} - restore-keys: ${{ runner.os }}-m2 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - - name: Build and Verify Case Studies - uses: coactions/setup-xvfb@v1 - with: - working-directory: ./casestudies - run: > - ./mvnw -B -U clean verify - -Dvitruv.framework.url=file:///${{ github.workspace }}/framework - -Dvitruv.dsls.url=file:///${{ github.workspace }}/dsls - -Dstyle.color=always - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - -Dorg.slf4j.simpleLogger.log.org.eclipse.tycho.core.resolver.DefaultTychoResolver=warn - -Dorg.slf4j.simpleLogger.log.org.eclipse.tycho.osgi.configuration.MavenContextConfigurator=warn - -Dorg.slf4j.simpleLogger.log.org.eclipse.sisu.equinox.launching.internal.DefaultEquinoxLauncher=warn - -Dorg.slf4j.simpleLogger.log.org.eclipse.xtext.maven.XtextGenerateMojo=warn - -Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog - env: - MAVEN_OPTS: -Djansi.force=true diff --git a/.gitignore b/.gitignore index ea8d7021e7..078418f500 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,12 @@ -# Eclipse/Java -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*.class - -# Xtext -src-gen/ -**/model/generated/ -.antlr-generator-*-patch.jar - -# EMF -model-gen/ - -# Xtend -xtend-gen/ -*._trace -*.xtendbin +# VS Code +.vscode/ # Maven target/ -.polyglot.build.properties -.mvn/wrapper/maven-wrapper.jar +*.log +.mvn/wrapper/*.jar -# Custom -EvaluationData +# Eclipse +META-INF +build.properties +plugin.properties diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml deleted file mode 100644 index 754e258708..0000000000 --- a/.mvn/extensions.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - org.eclipse.tycho - tycho-build - 3.0.4 - - \ No newline at end of file diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000000..4e39a1cd0d --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,3 @@ +--update-snapshots +--fail-at-end +-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d8b2495a1e..346d645fd0 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/applications/pom.xml b/applications/pom.xml new file mode 100644 index 0000000000..7069935696 --- /dev/null +++ b/applications/pom.xml @@ -0,0 +1,75 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.framework + 3.1.0-SNAPSHOT + + + tools.vitruv.framework.applications + + Vitruv Framework Applications Specification + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.propagation + ${project.version} + + + + + + com.google.guava + guava + + + org.eclipse.xtend + org.eclipse.xtend.lib + compile + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + compile + + + log4j + log4j + compile + + + org.eclipse.platform + org.eclipse.equinox.registry + compile + + + org.eclipse.platform + org.eclipse.core.runtime + compile + + + + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.framework.applications/src/tools/vitruv/framework/applications/VitruvApplication.xtend b/applications/src/main/xtend/tools/vitruv/framework/applications/VitruvApplication.xtend similarity index 100% rename from bundles/tools.vitruv.framework.applications/src/tools/vitruv/framework/applications/VitruvApplication.xtend rename to applications/src/main/xtend/tools/vitruv/framework/applications/VitruvApplication.xtend diff --git a/bundles/tools.vitruv.framework.applications/src/tools/vitruv/framework/applications/VitruvApplicationsRegistry.xtend b/applications/src/main/xtend/tools/vitruv/framework/applications/VitruvApplicationsRegistry.xtend similarity index 100% rename from bundles/tools.vitruv.framework.applications/src/tools/vitruv/framework/applications/VitruvApplicationsRegistry.xtend rename to applications/src/main/xtend/tools/vitruv/framework/applications/VitruvApplicationsRegistry.xtend diff --git a/bundles/tools.vitruv.framework.applications/.classpath b/bundles/tools.vitruv.framework.applications/.classpath deleted file mode 100644 index ef548cb968..0000000000 --- a/bundles/tools.vitruv.framework.applications/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.framework.applications/.project b/bundles/tools.vitruv.framework.applications/.project deleted file mode 100644 index af1917f015..0000000000 --- a/bundles/tools.vitruv.framework.applications/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.framework.applications - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/bundles/tools.vitruv.framework.applications/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.framework.applications/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/bundles/tools.vitruv.framework.applications/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/bundles/tools.vitruv.framework.applications/META-INF/MANIFEST.MF b/bundles/tools.vitruv.framework.applications/META-INF/MANIFEST.MF deleted file mode 100644 index ab5c0a4c41..0000000000 --- a/bundles/tools.vitruv.framework.applications/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Framework Applications Specification -Bundle-Vendor: vitruv.tools -Bundle-SymbolicName: tools.vitruv.framework.applications;singleton:=true -Automatic-Module-Name: tools.vitruv.framework.applications -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: tools.vitruv.change.propagation;visibility:=reexport, - com.google.guava, - org.apache.log4j, - org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.lib, - org.eclipse.xtend.lib.macro, - org.eclipse.core.runtime -Export-Package: tools.vitruv.framework.applications diff --git a/bundles/tools.vitruv.framework.applications/build.properties b/bundles/tools.vitruv.framework.applications/build.properties deleted file mode 100644 index 9fd62f57d9..0000000000 --- a/bundles/tools.vitruv.framework.applications/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/bundles/tools.vitruv.framework.applications/plugin.xml b/bundles/tools.vitruv.framework.applications/plugin.xml deleted file mode 100644 index c7916defc5..0000000000 --- a/bundles/tools.vitruv.framework.applications/plugin.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/bundles/tools.vitruv.framework.applications/schema/application.exsd b/bundles/tools.vitruv.framework.applications/schema/application.exsd deleted file mode 100644 index 112049f85f..0000000000 --- a/bundles/tools.vitruv.framework.applications/schema/application.exsd +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - Extension point for registering a Vitruv application - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A Vitruv application - - - - - - - - - - - - - - - - - - - - - - 0.1.0 - - - - - - - - - - - - Copyright (c) 2014-2017 Vitruv Tools Team\n\ -Karlsruhe Institute of Technology (KIT), Software Design and Quality, Karlsruhe, Germany - - - - diff --git a/bundles/tools.vitruv.framework.views/.classpath b/bundles/tools.vitruv.framework.views/.classpath deleted file mode 100644 index ef548cb968..0000000000 --- a/bundles/tools.vitruv.framework.views/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.framework.views/.project b/bundles/tools.vitruv.framework.views/.project deleted file mode 100644 index 3ae2797f90..0000000000 --- a/bundles/tools.vitruv.framework.views/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.framework.views - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/bundles/tools.vitruv.framework.views/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.framework.views/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/bundles/tools.vitruv.framework.views/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF b/bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF deleted file mode 100644 index e96ea43e07..0000000000 --- a/bundles/tools.vitruv.framework.views/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Framework Views -Bundle-SymbolicName: tools.vitruv.framework.views;singleton:=true -Automatic-Module-Name: tools.vitruv.framework.views -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.apache.log4j, - tools.vitruv.change.composite, - org.eclipse.emf.compare, - org.eclipse.emf.ecore.xmi, - org.eclipse.xtend.lib, - edu.kit.ipd.sdq.activextendannotations, - edu.kit.ipd.sdq.commons.util.emf -Export-Package: tools.vitruv.framework.views, - tools.vitruv.framework.views.changederivation -Bundle-Vendor: vitruv.tools diff --git a/bundles/tools.vitruv.framework.views/build.properties b/bundles/tools.vitruv.framework.views/build.properties deleted file mode 100644 index 3c36c1d7e3..0000000000 --- a/bundles/tools.vitruv.framework.views/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/bundles/tools.vitruv.framework.vsum/.classpath b/bundles/tools.vitruv.framework.vsum/.classpath deleted file mode 100644 index ef548cb968..0000000000 --- a/bundles/tools.vitruv.framework.vsum/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.framework.vsum/.project b/bundles/tools.vitruv.framework.vsum/.project deleted file mode 100644 index 7ba2fe4de0..0000000000 --- a/bundles/tools.vitruv.framework.vsum/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.framework.vsum - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/bundles/tools.vitruv.framework.vsum/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.framework.vsum/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/bundles/tools.vitruv.framework.vsum/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF b/bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF deleted file mode 100644 index 4abb89d0e1..0000000000 --- a/bundles/tools.vitruv.framework.vsum/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Framework Virtual Single Underlying Model -Bundle-SymbolicName: tools.vitruv.framework.vsum;singleton:=true -Automatic-Module-Name: tools.vitruv.framework.vsum -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.apache.log4j, - tools.vitruv.change.composite;visibility:=reexport, - tools.vitruv.framework.views;visibility:=reexport, - tools.vitruv.change.propagation;visibility:=reexport, - org.eclipse.xtend.lib, - org.eclipse.emf.ecore.xmi, - edu.kit.ipd.sdq.activextendannotations, - edu.kit.ipd.sdq.commons.util.emf, - edu.kit.ipd.sdq.commons.util.java -Export-Package: tools.vitruv.framework.vsum, - tools.vitruv.framework.vsum.internal;x-internal:=true -Bundle-Vendor: vitruv.tools diff --git a/bundles/tools.vitruv.framework.vsum/build.properties b/bundles/tools.vitruv.framework.vsum/build.properties deleted file mode 100644 index 3c36c1d7e3..0000000000 --- a/bundles/tools.vitruv.framework.vsum/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/bundles/tools.vitruv.testutils.vsum/.classpath b/bundles/tools.vitruv.testutils.vsum/.classpath deleted file mode 100644 index 5b259b9051..0000000000 --- a/bundles/tools.vitruv.testutils.vsum/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/bundles/tools.vitruv.testutils.vsum/.project b/bundles/tools.vitruv.testutils.vsum/.project deleted file mode 100644 index 15645db9b4..0000000000 --- a/bundles/tools.vitruv.testutils.vsum/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.testutils.vsum - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/bundles/tools.vitruv.testutils.vsum/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.testutils.vsum/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/bundles/tools.vitruv.testutils.vsum/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/bundles/tools.vitruv.testutils.vsum/.settings/org.eclipse.xtend.core.Xtend.prefs b/bundles/tools.vitruv.testutils.vsum/.settings/org.eclipse.xtend.core.Xtend.prefs deleted file mode 100644 index 4c6a5c4c83..0000000000 --- a/bundles/tools.vitruv.testutils.vsum/.settings/org.eclipse.xtend.core.Xtend.prefs +++ /dev/null @@ -1,3 +0,0 @@ -ValidatorConfiguration.is_project_specific=true -eclipse.preferences.version=1 -org.eclipse.xtext.xbase.validation.IssueCodes.discouraged_reference=info diff --git a/bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF b/bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF deleted file mode 100644 index 6d62fbad54..0000000000 --- a/bundles/tools.vitruv.testutils.vsum/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv V-SUM Testutils -Bundle-SymbolicName: tools.vitruv.testutils.vsum -Bundle-Version: 3.0.1.qualifier -Bundle-Vendor: tools.vitruv -Automatic-Module-Name: tools.vitruv.testutils.vsum -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.junit.jupiter.api, - org.junit.jupiter.api.extension -Require-Bundle: com.google.guava, - org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.lib, - org.eclipse.xtend.lib.macro, - org.hamcrest.core, - tools.vitruv.testutils;visibility:=reexport, - tools.vitruv.framework.vsum;visibility:=reexport, - edu.kit.ipd.sdq.activextendannotations, - edu.kit.ipd.sdq.commons.util.emf, - edu.kit.ipd.sdq.commons.util.java -Export-Package: tools.vitruv.testutils diff --git a/bundles/tools.vitruv.testutils.vsum/build.properties b/bundles/tools.vitruv.testutils.vsum/build.properties deleted file mode 100644 index 3c36c1d7e3..0000000000 --- a/bundles/tools.vitruv.testutils.vsum/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/features/tools.vitruv.framework.vsum.feature/.project b/features/tools.vitruv.framework.vsum.feature/.project deleted file mode 100644 index f525ebcb33..0000000000 --- a/features/tools.vitruv.framework.vsum.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - tools.vitruv.framework.vsum.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/tools.vitruv.framework.vsum.feature/.settings/org.eclipse.core.resources.prefs b/features/tools.vitruv.framework.vsum.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/features/tools.vitruv.framework.vsum.feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/features/tools.vitruv.framework.vsum.feature/build.properties b/features/tools.vitruv.framework.vsum.feature/build.properties deleted file mode 100644 index b3a611b5c9..0000000000 --- a/features/tools.vitruv.framework.vsum.feature/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties diff --git a/features/tools.vitruv.framework.vsum.feature/feature.properties b/features/tools.vitruv.framework.vsum.feature/feature.properties deleted file mode 100644 index a1b90d7780..0000000000 --- a/features/tools.vitruv.framework.vsum.feature/feature.properties +++ /dev/null @@ -1,7 +0,0 @@ -featureName=Vitruv V-SUM Framework -description=The Vitruv V-SUM framework providing the essential view-based features of Vitruv -providerName=vitruv.tools -copyrightURL=http://vitruv.tools -copyright=\ -Copyright (c) 2014-2022 Vitruv Tools Team\n\ -Karlsruhe Institute of Technology (KIT), Karlsruhe, Germany \ No newline at end of file diff --git a/features/tools.vitruv.framework.vsum.feature/feature.xml b/features/tools.vitruv.framework.vsum.feature/feature.xml deleted file mode 100644 index ed46d93a83..0000000000 --- a/features/tools.vitruv.framework.vsum.feature/feature.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/features/tools.vitruv.testutils.vsum.feature/.project b/features/tools.vitruv.testutils.vsum.feature/.project deleted file mode 100644 index 5b7ef72c11..0000000000 --- a/features/tools.vitruv.testutils.vsum.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - tools.vitruv.testutils.vsum.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/tools.vitruv.testutils.vsum.feature/.settings/org.eclipse.core.resources.prefs b/features/tools.vitruv.testutils.vsum.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/features/tools.vitruv.testutils.vsum.feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/features/tools.vitruv.testutils.vsum.feature/build.properties b/features/tools.vitruv.testutils.vsum.feature/build.properties deleted file mode 100644 index b3a611b5c9..0000000000 --- a/features/tools.vitruv.testutils.vsum.feature/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties diff --git a/features/tools.vitruv.testutils.vsum.feature/feature.properties b/features/tools.vitruv.testutils.vsum.feature/feature.properties deleted file mode 100644 index 53264726db..0000000000 --- a/features/tools.vitruv.testutils.vsum.feature/feature.properties +++ /dev/null @@ -1,7 +0,0 @@ -featureName=Vitruv V-SUM Test Utilities -description=Utilities for defining tests for V-SUMs in the Vitruv framework -providerName=vitruv.tools -copyrightURL=http://vitruv.tools -copyright=\ -Copyright (c) 2014-2022 Vitruv Tools Team\n\ -Karlsruhe Institute of Technology (KIT), Karlsruhe, Germany \ No newline at end of file diff --git a/features/tools.vitruv.testutils.vsum.feature/feature.xml b/features/tools.vitruv.testutils.vsum.feature/feature.xml deleted file mode 100644 index 1cc48c9717..0000000000 --- a/features/tools.vitruv.testutils.vsum.feature/feature.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index a82daa70fe..61ebf6c3bc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,22 +1,251 @@ - - - 4.0.0 - - tools.vitruv - framework-parent - 3.0.1-SNAPSHOT - releng/tools.vitruv.parent - - tools.vitruv - pom - - - bundles - tests - features - releng/tools.vitruv.updatesite - - - + + 4.0.0 + + + + tools.vitruv + parent + 3.0.0-SNAPSHOT + + + + tools.vitruv.framework + 3.1.0-SNAPSHOT + pom + + Vitruv Framework + The Vitruv framework providing the definition of views and v-sums. + https://github.com/vitruv-tools/Vitruv + + + + + Eclipse Public License - v 1.0 + https://www.eclipse.org/org/documents/epl-v10.php + + + + + scm:git:git://github.com/vitruv-tools/Vitruv.git + scm:git:https://github.com/vitruv-tools/Vitruv.git + https://github.com/vitruv-tools/Vitruv/tree/main + + + + + views + vsum + testutils + applications + + + + + 3.3 + 2.2.0 + 1.6.0 + + + + + + org.openntf.maven + p2-layout-resolver + + + + + + + + central + Maven Central + https://repo1.maven.org/maven2/ + + false + + + + + + ossrh-snapshots + OSSRH Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + false + + + + + + emf-compare + EMF Compare + p2 + https://download.eclipse.org/modeling/emf/compare/updates/releases/${repo.emf-compare.version} + + + sdq-commons + SDQ Commons + https://kit-sdq.github.io/updatesite/release/commons/${repo.sdq-commons.version} + p2 + + + xannotations + XAnnotations + p2 + https://kit-sdq.github.io/updatesite/release/xannotations/${repo.xannotations.version} + + + + + + + + + tools.vitruv + tools.vitruv.change.correspondence + 3.1.0-SNAPSHOT + + + tools.vitruv + tools.vitruv.change.composite + 3.1.0-SNAPSHOT + + + tools.vitruv + tools.vitruv.change.interaction + 3.1.0-SNAPSHOT + + + tools.vitruv + tools.vitruv.change.propagation + 3.1.0-SNAPSHOT + + + tools.vitruv + tools.vitruv.change.testutils.core + 3.1.0-SNAPSHOT + + + tools.vitruv + tools.vitruv.change.testutils.integration + 3.1.0-SNAPSHOT + + + + + com.google.guava + guava + 30.1-jre + + + emf-compare + org.eclipse.emf.compare + 3.5.3.202212280858 + + + log4j + log4j + 1.2.17 + + + org.eclipse.emf + org.eclipse.emf.common + 2.31.0 + + + org.eclipse.emf + org.eclipse.emf.ecore + 2.37.0 + + + org.eclipse.emf + org.eclipse.emf.ecore.xmi + 2.38.0 + + + org.eclipse.platform + org.eclipse.core.runtime + 3.31.100 + + + + org.eclipse.platform + org.eclipse.equinox.common + 3.19.100 + + + org.eclipse.platform + org.eclipse.equinox.registry + 3.12.100 + + + org.eclipse.xtend + org.eclipse.xtend.lib + 2.36.0 + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + 2.36.0 + + + org.hamcrest + hamcrest + 2.2 + + + org.junit.jupiter + junit-jupiter-api + 5.10.1 + + + org.junit.jupiter + junit-jupiter-params + 5.10.1 + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + 2.3.0.202304271319 + + + + * + * + + + + + sdq-commons + edu.kit.ipd.sdq.commons.util.java + 2.3.0.202304271319 + + + + * + * + + + + + xannotations + edu.kit.ipd.sdq.activextendannotations + 1.6.0 + + + org.mockito + mockito-core + 5.14.2 + test + + + + + \ No newline at end of file diff --git a/releng/tools.vitruv.parent/pom.xml b/releng/tools.vitruv.parent/pom.xml deleted file mode 100644 index d2f77a3362..0000000000 --- a/releng/tools.vitruv.parent/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - 4.0.0 - - tools.vitruv - parent - 2.1.5 - - framework-parent - 3.0.1-SNAPSHOT - pom - - - - https://vitruv-tools.github.io/updatesite/nightly/change - - - - - - Vitruv Change - p2 - ${vitruv.change.url} - - - Demo Metamodels - p2 - https://kit-sdq.github.io/updatesite/release/metamodels/demo/${sdq.demometamodels.version} - - - SDQ Commons - p2 - https://kit-sdq.github.io/updatesite/release/commons/${sdq.commons.version} - - - XAnnotations - p2 - https://kit-sdq.github.io/updatesite/release/xannotations/${sdq.xannotations.version} - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.build.directory}/work/data - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.6.0 - - - copy-dependencies - - copy-dependencies - - - true - - - - - - - - - - - local-change - - - vitruv.change.path - - - - file:///${vitruv.change.path}/releng/tools.vitruv.change.updatesite/target/repository - - - - - diff --git a/releng/tools.vitruv.updatesite/.project b/releng/tools.vitruv.updatesite/.project deleted file mode 100644 index df346ecb5e..0000000000 --- a/releng/tools.vitruv.updatesite/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - tools.vitruv.updatesite - - - - - - - - diff --git a/releng/tools.vitruv.updatesite/.settings/org.eclipse.core.resources.prefs b/releng/tools.vitruv.updatesite/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/releng/tools.vitruv.updatesite/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/releng/tools.vitruv.updatesite/category.xml b/releng/tools.vitruv.updatesite/category.xml deleted file mode 100644 index 93e9df1775..0000000000 --- a/releng/tools.vitruv.updatesite/category.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - The Vitruv framework, including the essential V-SUM and optional extensions - - - diff --git a/releng/tools.vitruv.updatesite/pom.xml b/releng/tools.vitruv.updatesite/pom.xml deleted file mode 100644 index 9c293272ec..0000000000 --- a/releng/tools.vitruv.updatesite/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - 4.0.0 - - tools.vitruv - framework-parent - 3.0.1-SNAPSHOT - ../tools.vitruv.parent - - - tools.vitruv.updatesite - Vitruv Framework Update Site - eclipse-repository - - \ No newline at end of file diff --git a/tests/tools.vitruv.framework.views.tests/.classpath b/tests/tools.vitruv.framework.views.tests/.classpath deleted file mode 100644 index f136b38310..0000000000 --- a/tests/tools.vitruv.framework.views.tests/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/tools.vitruv.framework.views.tests/.project b/tests/tools.vitruv.framework.views.tests/.project deleted file mode 100644 index 43bbaf1914..0000000000 --- a/tests/tools.vitruv.framework.views.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.framework.views.tests - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/tests/tools.vitruv.framework.views.tests/.settings/org.eclipse.core.resources.prefs b/tests/tools.vitruv.framework.views.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/tests/tools.vitruv.framework.views.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 212b391edf..0000000000 --- a/tests/tools.vitruv.framework.views.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,25 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Framwork Views Tests -Bundle-SymbolicName: tools.vitruv.framework.views.tests;singleton:=true -Automatic-Module-Name: tools.vitruv.framework.views.tests -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Fragment-Host: tools.vitruv.framework.views -Import-Package: org.junit.jupiter.api, - org.junit.jupiter.api.extension, - org.junit.jupiter.api.function, - org.junit.jupiter.params, - org.junit.jupiter.params.provider -Require-Bundle: org.apache.log4j, - tools.vitruv.testutils.vsum, - tools.vitruv.testutils.metamodels, - org.eclipse.core.expressions, - org.eclipse.xtend.lib, - org.eclipse.uml2.uml, - org.hamcrest.core, - edu.kit.ipd.sdq.commons.util.java -Bundle-ClassPath: ., - target/dependency/mockito-core.jar -Bundle-ActivationPolicy: lazy -Bundle-Vendor: vitruv.tools diff --git a/tests/tools.vitruv.framework.views.tests/build.properties b/tests/tools.vitruv.framework.views.tests/build.properties deleted file mode 100644 index 5a0ec391e1..0000000000 --- a/tests/tools.vitruv.framework.views.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -bin.includes = .,\ - META-INF/,\ - target/dependency/ -source.. = src/,\ - xtend-gen -output.. = target/classes/ diff --git a/tests/tools.vitruv.framework.views.tests/pom.xml b/tests/tools.vitruv.framework.views.tests/pom.xml deleted file mode 100644 index 3512bdf344..0000000000 --- a/tests/tools.vitruv.framework.views.tests/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - tools.vitruv - tests - 3.0.1-SNAPSHOT - ../.polyglot.pom.tycho - - tools.vitruv.framework.views.tests - eclipse-test-plugin - [test-bundle] Vitruv Framwork Views Tests - - - - - org.mockito - mockito-core - 4.2.0 - test - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - \ No newline at end of file diff --git a/tests/tools.vitruv.framework.vsum.tests/.classpath b/tests/tools.vitruv.framework.vsum.tests/.classpath deleted file mode 100644 index 2d43d32ef7..0000000000 --- a/tests/tools.vitruv.framework.vsum.tests/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/tools.vitruv.framework.vsum.tests/.project b/tests/tools.vitruv.framework.vsum.tests/.project deleted file mode 100644 index d83747898c..0000000000 --- a/tests/tools.vitruv.framework.vsum.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.framework.vsum.tests - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/tests/tools.vitruv.framework.vsum.tests/.settings/org.eclipse.core.resources.prefs b/tests/tools.vitruv.framework.vsum.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203..0000000000 --- a/tests/tools.vitruv.framework.vsum.tests/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF deleted file mode 100644 index f7f6ca05bc..0000000000 --- a/tests/tools.vitruv.framework.vsum.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Framwork Virtual Single Underlying Model Tests -Bundle-SymbolicName: tools.vitruv.framework.vsum.tests;singleton:=true -Automatic-Module-Name: tools.vitruv.framework.vsum.tests -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Fragment-Host: tools.vitruv.framework.vsum -Import-Package: org.junit.jupiter.api, - org.junit.jupiter.api.extension -Require-Bundle: org.apache.log4j, - tools.vitruv.testutils.vsum, - tools.vitruv.testutils.metamodels, - org.eclipse.core.expressions, - org.eclipse.xtend.lib, - org.eclipse.uml2.uml, - org.hamcrest.core, - edu.kit.ipd.sdq.commons.util.java, - edu.kit.ipd.sdq.commons.util.emf -Bundle-ActivationPolicy: lazy -Bundle-Vendor: vitruv.tools diff --git a/tests/tools.vitruv.framework.vsum.tests/build.properties b/tests/tools.vitruv.framework.vsum.tests/build.properties deleted file mode 100644 index 133eae807e..0000000000 --- a/tests/tools.vitruv.framework.vsum.tests/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -# - -bin.includes = .,\ - META-INF/ -source.. = src/,\ - xtend-gen -output.. = target/classes/ diff --git a/testutils/deprecated/pom.xml b/testutils/deprecated/pom.xml new file mode 100644 index 0000000000..db9b19d5a1 --- /dev/null +++ b/testutils/deprecated/pom.xml @@ -0,0 +1,92 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.framework.testutils + 3.1.0-SNAPSHOT + + + tools.vitruv.framework.testutils.deprecated + + DEPRECATED Vitruv Framework Test Utilities + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.propagation + ${project.version} + + + ${project.groupId} + tools.vitruv.change.composite + ${project.version} + + + ${project.groupId} + tools.vitruv.change.correspondence + ${project.version} + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + ${project.groupId} + tools.vitruv.change.testutils.integration + ${project.version} + + + ${project.groupId} + tools.vitruv.framework.vsum + ${project.version} + + + ${project.groupId} + tools.vitruv.framework.testutils.integration + ${project.version} + + + + + com.google.guava + guava + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + xannotations + edu.kit.ipd.sdq.activextendannotations + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/LegacyCorrespondenceRetriever.xtend b/testutils/deprecated/src/main/xtend/tools/vitruv/framework/testutils/vsum/LegacyCorrespondenceRetriever.xtend similarity index 94% rename from bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/LegacyCorrespondenceRetriever.xtend rename to testutils/deprecated/src/main/xtend/tools/vitruv/framework/testutils/vsum/LegacyCorrespondenceRetriever.xtend index 32c55c86f4..aacf4e2eac 100644 --- a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/LegacyCorrespondenceRetriever.xtend +++ b/testutils/deprecated/src/main/xtend/tools/vitruv/framework/testutils/vsum/LegacyCorrespondenceRetriever.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.framework.testutils.deprecated import org.eclipse.emf.ecore.EObject diff --git a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/LegacyVitruvApplicationTest.xtend b/testutils/deprecated/src/main/xtend/tools/vitruv/framework/testutils/vsum/LegacyVitruvApplicationTest.xtend similarity index 87% rename from bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/LegacyVitruvApplicationTest.xtend rename to testutils/deprecated/src/main/xtend/tools/vitruv/framework/testutils/vsum/LegacyVitruvApplicationTest.xtend index ef72804982..6e146187fe 100644 --- a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/LegacyVitruvApplicationTest.xtend +++ b/testutils/deprecated/src/main/xtend/tools/vitruv/framework/testutils/vsum/LegacyVitruvApplicationTest.xtend @@ -1,12 +1,14 @@ -package tools.vitruv.testutils +package tools.vitruv.framework.testutils.deprecated import edu.kit.ipd.sdq.activextendannotations.DelegateExcept import java.nio.file.Path import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EObject import tools.vitruv.framework.vsum.internal.InternalVirtualModel -import tools.vitruv.testutils.views.NonTransactionalTestView -import tools.vitruv.testutils.views.TestView +import tools.vitruv.change.testutils.views.NonTransactionalTestView +import tools.vitruv.change.testutils.views.TestView +import tools.vitruv.framework.testutils.integration.VitruvApplicationTest +import tools.vitruv.framework.testutils.integration.DefaultVirtualModelBasedTestView import static com.google.common.base.Preconditions.checkArgument diff --git a/testutils/integration/pom.xml b/testutils/integration/pom.xml new file mode 100644 index 0000000000..8c345bfc5f --- /dev/null +++ b/testutils/integration/pom.xml @@ -0,0 +1,109 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.framework.testutils + 3.1.0-SNAPSHOT + + + tools.vitruv.framework.testutils.integration + + Vitruv Framework Integration Test Utilities for Views and V-SUMs + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.testutils.core + ${project.version} + + + ${project.groupId} + tools.vitruv.change.testutils.integration + ${project.version} + + + ${project.groupId} + tools.vitruv.change.interaction + ${project.version} + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + ${project.groupId} + tools.vitruv.change.propagation + ${project.version} + + + ${project.groupId} + tools.vitruv.change.composite + ${project.version} + + + ${project.groupId} + tools.vitruv.framework.vsum + ${project.version} + + + ${project.groupId} + tools.vitruv.framework.views + ${project.version} + + + + + com.google.guava + guava + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + org.junit.jupiter + junit-jupiter-api + + + org.eclipse.xtend + org.eclipse.xtend.lib + + + org.hamcrest + hamcrest + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/TestViewFactory.java b/testutils/integration/src/main/java/tools/vitruv/framework/testutils/integration/TestViewFactory.java similarity index 98% rename from bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/TestViewFactory.java rename to testutils/integration/src/main/java/tools/vitruv/framework/testutils/integration/TestViewFactory.java index 42854a80a8..4d28131f4e 100644 --- a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/TestViewFactory.java +++ b/testutils/integration/src/main/java/tools/vitruv/framework/testutils/integration/TestViewFactory.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils; +package tools.vitruv.framework.testutils.view; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; diff --git a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/DefaultVirtualModelBasedTestView.xtend b/testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/DefaultVirtualModelBasedTestView.xtend similarity index 86% rename from bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/DefaultVirtualModelBasedTestView.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/DefaultVirtualModelBasedTestView.xtend index 21b0c31a11..7d30967b7c 100644 --- a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/DefaultVirtualModelBasedTestView.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/DefaultVirtualModelBasedTestView.xtend @@ -1,13 +1,14 @@ -package tools.vitruv.testutils +package tools.vitruv.framework.testutils.integration import java.nio.file.Path import org.eclipse.xtend.lib.annotations.Delegate import tools.vitruv.change.propagation.ChangePropagationSpecification import tools.vitruv.framework.vsum.VirtualModelBuilder import tools.vitruv.framework.vsum.internal.InternalVirtualModel -import tools.vitruv.testutils.views.ChangePublishingTestView -import tools.vitruv.testutils.views.NonTransactionalTestView -import tools.vitruv.testutils.views.UriMode +import tools.vitruv.change.testutils.views.ChangePublishingTestView +import tools.vitruv.change.testutils.views.NonTransactionalTestView +import tools.vitruv.change.testutils.views.UriMode +import tools.vitruv.change.testutils.TestUserInteraction class DefaultVirtualModelBasedTestView implements VirtualModelBasedTestView, NonTransactionalTestView { InternalVirtualModel virtualModel diff --git a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/ViewBasedVitruvApplicationTest.xtend b/testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/ViewBasedVitruvApplicationTest.xtend similarity index 91% rename from bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/ViewBasedVitruvApplicationTest.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/ViewBasedVitruvApplicationTest.xtend index 9e50da0a83..2bc34d2569 100644 --- a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/ViewBasedVitruvApplicationTest.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/ViewBasedVitruvApplicationTest.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.framework.testutils.integration import org.junit.jupiter.api.^extension.ExtendWith import tools.vitruv.framework.vsum.VirtualModel @@ -14,8 +14,12 @@ import static com.google.common.base.Preconditions.checkArgument import static edu.kit.ipd.sdq.commons.util.org.eclipse.emf.common.util.URIUtil.createFileURI import static org.eclipse.emf.common.util.URI.createPlatformResourceURI import org.eclipse.xtend.lib.annotations.Accessors -import tools.vitruv.testutils.views.UriMode import tools.vitruv.change.propagation.ChangePropagationMode +import tools.vitruv.change.testutils.views.UriMode +import tools.vitruv.change.testutils.TestUserInteraction +import tools.vitruv.change.testutils.TestLogging +import tools.vitruv.change.testutils.TestProjectManager +import tools.vitruv.change.testutils.TestProject @ExtendWith(TestLogging, TestProjectManager) abstract class ViewBasedVitruvApplicationTest { diff --git a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/VirtualModelBasedTestView.xtend b/testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/VirtualModelBasedTestView.xtend similarity index 71% rename from bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/VirtualModelBasedTestView.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/VirtualModelBasedTestView.xtend index 8174e4a7d6..39dd5398f5 100644 --- a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/VirtualModelBasedTestView.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/VirtualModelBasedTestView.xtend @@ -1,7 +1,7 @@ -package tools.vitruv.testutils +package tools.vitruv.framework.testutils.integration import tools.vitruv.framework.vsum.VirtualModel -import tools.vitruv.testutils.views.TestView +import tools.vitruv.change.testutils.views.TestView /** * A {@link TestView} that uses a {@link VirtualModel} for model management diff --git a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/VitruvApplicationTest.xtend b/testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/VitruvApplicationTest.xtend similarity index 77% rename from bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/VitruvApplicationTest.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/VitruvApplicationTest.xtend index 7ad28bb44b..964070ea97 100644 --- a/bundles/tools.vitruv.testutils.vsum/src/tools/vitruv/testutils/VitruvApplicationTest.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/framework/testutils/vsum/VitruvApplicationTest.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.framework.testutils.integration import java.nio.file.Path import org.eclipse.xtend.lib.annotations.Delegate @@ -6,8 +6,10 @@ import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.^extension.ExtendWith import tools.vitruv.change.propagation.ChangePropagationSpecification - -import tools.vitruv.testutils.views.UriMode +import tools.vitruv.change.testutils.views.UriMode +import tools.vitruv.change.testutils.TestLogging +import tools.vitruv.change.testutils.TestProjectManager +import tools.vitruv.change.testutils.TestProject @ExtendWith(TestLogging, TestProjectManager) abstract class VitruvApplicationTest implements VirtualModelBasedTestView { @@ -29,7 +31,7 @@ abstract class VitruvApplicationTest implements VirtualModelBasedTestView { testView = generateTestView(testProjectPath, vsumPath) } - def package VirtualModelBasedTestView generateTestView(Path testProjectPath, Path vsumPath) { + def VirtualModelBasedTestView generateTestView(Path testProjectPath, Path vsumPath) { new DefaultVirtualModelBasedTestView(testProjectPath, vsumPath, changePropagationSpecifications, uriMode) } diff --git a/testutils/pom.xml b/testutils/pom.xml new file mode 100644 index 0000000000..913b5c1779 --- /dev/null +++ b/testutils/pom.xml @@ -0,0 +1,24 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.framework + 3.1.0-SNAPSHOT + + + tools.vitruv.framework.testutils + pom + + Vitruv Framework Test Utilities + Utilities for defining tests using the Vitruv Framework + + + integration + deprecated + + \ No newline at end of file diff --git a/views/pom.xml b/views/pom.xml new file mode 100644 index 0000000000..a8c8940e80 --- /dev/null +++ b/views/pom.xml @@ -0,0 +1,127 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.framework + 3.1.0-SNAPSHOT + + + tools.vitruv.framework.views + + Vitruv View Definition + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.composite + ${project.version} + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + + + ${project.groupId} + tools.vitruv.change.testutils.core + ${project.version} + test + + + ${project.groupId} + tools.vitruv.change.testutils.metamodels + ${project.version} + test + + + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + xannotations + edu.kit.ipd.sdq.activextendannotations + + + emf-compare + org.eclipse.emf.compare + + + org.eclipse.emf + org.eclipse.emf.ecore + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + com.google.guava + guava + + + org.eclipse.emf + org.eclipse.emf.common + + + + + org.eclipse.xtend + org.eclipse.xtend.lib + compile + + + org.hamcrest + hamcrest + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params + test + + + sdq-commons + edu.kit.ipd.sdq.commons.util.java + test + + + org.mockito + mockito-core + test + + + org.eclipse.emf + org.eclipse.emf.ecore.xmi + test + + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ChangeableViewSource.java b/views/src/main/java/tools/vitruv/framework/views/ChangeableViewSource.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ChangeableViewSource.java rename to views/src/main/java/tools/vitruv/framework/views/ChangeableViewSource.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/CommittableView.java b/views/src/main/java/tools/vitruv/framework/views/CommittableView.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/CommittableView.java rename to views/src/main/java/tools/vitruv/framework/views/CommittableView.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ModifiableViewSelection.java b/views/src/main/java/tools/vitruv/framework/views/ModifiableViewSelection.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ModifiableViewSelection.java rename to views/src/main/java/tools/vitruv/framework/views/ModifiableViewSelection.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/View.java b/views/src/main/java/tools/vitruv/framework/views/View.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/View.java rename to views/src/main/java/tools/vitruv/framework/views/View.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewProvider.java b/views/src/main/java/tools/vitruv/framework/views/ViewProvider.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewProvider.java rename to views/src/main/java/tools/vitruv/framework/views/ViewProvider.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewSelection.java b/views/src/main/java/tools/vitruv/framework/views/ViewSelection.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewSelection.java rename to views/src/main/java/tools/vitruv/framework/views/ViewSelection.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewSelector.java b/views/src/main/java/tools/vitruv/framework/views/ViewSelector.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewSelector.java rename to views/src/main/java/tools/vitruv/framework/views/ViewSelector.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewSource.java b/views/src/main/java/tools/vitruv/framework/views/ViewSource.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewSource.java rename to views/src/main/java/tools/vitruv/framework/views/ViewSource.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewType.java b/views/src/main/java/tools/vitruv/framework/views/ViewType.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewType.java rename to views/src/main/java/tools/vitruv/framework/views/ViewType.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewTypeProvider.java b/views/src/main/java/tools/vitruv/framework/views/ViewTypeProvider.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewTypeProvider.java rename to views/src/main/java/tools/vitruv/framework/views/ViewTypeProvider.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/changederivation/StateBasedChangeResolutionStrategy.java b/views/src/main/java/tools/vitruv/framework/views/changederivation/StateBasedChangeResolutionStrategy.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/changederivation/StateBasedChangeResolutionStrategy.java rename to views/src/main/java/tools/vitruv/framework/views/changederivation/StateBasedChangeResolutionStrategy.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/IdentityMappingViewType.java b/views/src/main/java/tools/vitruv/framework/views/impl/IdentityMappingViewType.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/IdentityMappingViewType.java rename to views/src/main/java/tools/vitruv/framework/views/impl/IdentityMappingViewType.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ViewCreatingViewType.java b/views/src/main/java/tools/vitruv/framework/views/impl/ViewCreatingViewType.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ViewCreatingViewType.java rename to views/src/main/java/tools/vitruv/framework/views/impl/ViewCreatingViewType.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/selection/AbstractViewSelection.java b/views/src/main/java/tools/vitruv/framework/views/selection/AbstractViewSelection.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/selection/AbstractViewSelection.java rename to views/src/main/java/tools/vitruv/framework/views/selection/AbstractViewSelection.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/selection/ElementViewSelection.java b/views/src/main/java/tools/vitruv/framework/views/selection/ElementViewSelection.java similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/selection/ElementViewSelection.java rename to views/src/main/java/tools/vitruv/framework/views/selection/ElementViewSelection.java diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewTypeFactory.xtend b/views/src/main/xtend/tools/vitruv/framework/views/ViewTypeFactory.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewTypeFactory.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/ViewTypeFactory.xtend diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewTypeRepository.xtend b/views/src/main/xtend/tools/vitruv/framework/views/ViewTypeRepository.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/ViewTypeRepository.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/ViewTypeRepository.xtend diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend b/views/src/main/xtend/tools/vitruv/framework/views/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/AbstractViewType.xtend b/views/src/main/xtend/tools/vitruv/framework/views/impl/AbstractViewType.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/AbstractViewType.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/impl/AbstractViewType.xtend diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/BasicView.xtend b/views/src/main/xtend/tools/vitruv/framework/views/impl/BasicView.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/BasicView.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/impl/BasicView.xtend diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ChangeDerivingView.xtend b/views/src/main/xtend/tools/vitruv/framework/views/impl/ChangeDerivingView.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ChangeDerivingView.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/impl/ChangeDerivingView.xtend diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ChangeRecordingView.xtend b/views/src/main/xtend/tools/vitruv/framework/views/impl/ChangeRecordingView.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ChangeRecordingView.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/impl/ChangeRecordingView.xtend diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ModifiableView.xtend b/views/src/main/xtend/tools/vitruv/framework/views/impl/ModifiableView.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/impl/ModifiableView.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/impl/ModifiableView.xtend diff --git a/bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/selectors/DirectViewElementSelector.xtend b/views/src/main/xtend/tools/vitruv/framework/views/selectors/DirectViewElementSelector.xtend similarity index 100% rename from bundles/tools.vitruv.framework.views/src/tools/vitruv/framework/views/selectors/DirectViewElementSelector.xtend rename to views/src/main/xtend/tools/vitruv/framework/views/selectors/DirectViewElementSelector.xtend diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/ViewTypeRepositoryTest.java b/views/src/test/java/tools/vitruv/framework/views/ViewTypeRepositoryTest.java similarity index 96% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/ViewTypeRepositoryTest.java rename to views/src/test/java/tools/vitruv/framework/views/ViewTypeRepositoryTest.java index 86a6f1c7e1..848b33a3fe 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/ViewTypeRepositoryTest.java +++ b/views/src/test/java/tools/vitruv/framework/views/ViewTypeRepositoryTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import tools.vitruv.testutils.RegisterMetamodelsInStandalone; -import tools.vitruv.testutils.TestLogging; +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone; +import tools.vitruv.change.testutils.TestLogging; @ExtendWith({ TestLogging.class, RegisterMetamodelsInStandalone.class }) public class ViewTypeRepositoryTest { diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/BasicViewTest.java b/views/src/test/java/tools/vitruv/framework/views/impl/BasicViewTest.java similarity index 97% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/BasicViewTest.java rename to views/src/test/java/tools/vitruv/framework/views/impl/BasicViewTest.java index 97616f2b03..24a75b6f48 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/BasicViewTest.java +++ b/views/src/test/java/tools/vitruv/framework/views/impl/BasicViewTest.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet; +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet; import org.eclipse.emf.common.util.URI; import org.junit.jupiter.api.BeforeEach; @@ -24,8 +24,8 @@ import tools.vitruv.change.atomic.hid.HierarchicalId; import tools.vitruv.framework.views.ChangeableViewSource; import tools.vitruv.framework.views.ModifiableViewSelection; -import tools.vitruv.testutils.RegisterMetamodelsInStandalone; -import tools.vitruv.testutils.TestLogging; +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone; +import tools.vitruv.change.testutils.TestLogging; @ExtendWith({ TestLogging.class, RegisterMetamodelsInStandalone.class }) public class BasicViewTest { diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/ChangeDerivingViewTest.java b/views/src/test/java/tools/vitruv/framework/views/impl/ChangeDerivingViewTest.java similarity index 97% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/ChangeDerivingViewTest.java rename to views/src/test/java/tools/vitruv/framework/views/impl/ChangeDerivingViewTest.java index 6157548b81..913976e3a2 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/ChangeDerivingViewTest.java +++ b/views/src/test/java/tools/vitruv/framework/views/impl/ChangeDerivingViewTest.java @@ -11,9 +11,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; -import static tools.vitruv.testutils.matchers.ModelMatchers.equalsDeeply; -import static tools.vitruv.testutils.matchers.ModelMatchers.ignoringFeatures; -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet; +import static tools.vitruv.change.testutils.matchers.ModelMatchers.equalsDeeply; +import static tools.vitruv.change.testutils.matchers.ModelMatchers.ignoringFeatures; +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; @@ -39,8 +39,8 @@ import tools.vitruv.framework.views.ChangeableViewSource; import tools.vitruv.framework.views.ModifiableViewSelection; import tools.vitruv.framework.views.changederivation.DefaultStateBasedChangeResolutionStrategy; -import tools.vitruv.testutils.RegisterMetamodelsInStandalone; -import tools.vitruv.testutils.TestLogging; +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone; +import tools.vitruv.change.testutils.TestLogging; @ExtendWith({ TestLogging.class, RegisterMetamodelsInStandalone.class }) public class ChangeDerivingViewTest { diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/ChangeRecordingViewTest.java b/views/src/test/java/tools/vitruv/framework/views/impl/ChangeRecordingViewTest.java similarity index 98% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/ChangeRecordingViewTest.java rename to views/src/test/java/tools/vitruv/framework/views/impl/ChangeRecordingViewTest.java index c08fa2557a..8d774a7941 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/ChangeRecordingViewTest.java +++ b/views/src/test/java/tools/vitruv/framework/views/impl/ChangeRecordingViewTest.java @@ -9,9 +9,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; -import static tools.vitruv.testutils.matchers.ModelMatchers.equalsDeeply; -import static tools.vitruv.testutils.matchers.ModelMatchers.ignoringFeatures; -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet; +import static tools.vitruv.change.testutils.matchers.ModelMatchers.equalsDeeply; +import static tools.vitruv.change.testutils.matchers.ModelMatchers.ignoringFeatures; +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet; import java.util.List; @@ -48,8 +48,8 @@ import tools.vitruv.change.composite.description.VitruviusChangeResolver; import tools.vitruv.framework.views.ChangeableViewSource; import tools.vitruv.framework.views.ModifiableViewSelection; -import tools.vitruv.testutils.RegisterMetamodelsInStandalone; -import tools.vitruv.testutils.TestLogging;; +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone; +import tools.vitruv.change.testutils.TestLogging;; @ExtendWith({ TestLogging.class, RegisterMetamodelsInStandalone.class }) public class ChangeRecordingViewTest { diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/IdentityMappingViewTypeTest.java b/views/src/test/java/tools/vitruv/framework/views/impl/IdentityMappingViewTypeTest.java similarity index 98% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/IdentityMappingViewTypeTest.java rename to views/src/test/java/tools/vitruv/framework/views/impl/IdentityMappingViewTypeTest.java index fd65a9f53a..d26b5e7e26 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/impl/IdentityMappingViewTypeTest.java +++ b/views/src/test/java/tools/vitruv/framework/views/impl/IdentityMappingViewTypeTest.java @@ -15,8 +15,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static tools.vitruv.testutils.matchers.ModelMatchers.equalsDeeply; -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet; +import static tools.vitruv.change.testutils.matchers.ModelMatchers.equalsDeeply; +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet; import java.util.List; import java.util.Set; @@ -54,8 +54,8 @@ import tools.vitruv.framework.views.ViewSelection; import tools.vitruv.framework.views.ViewType; import tools.vitruv.framework.views.selectors.DirectViewElementSelector; -import tools.vitruv.testutils.RegisterMetamodelsInStandalone; -import tools.vitruv.testutils.TestLogging; +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone; +import tools.vitruv.change.testutils.TestLogging; @ExtendWith({ TestLogging.class, RegisterMetamodelsInStandalone.class }) public class IdentityMappingViewTypeTest { diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/selection/ElementViewSelectionTest.java b/views/src/test/java/tools/vitruv/framework/views/selection/ElementViewSelectionTest.java similarity index 97% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/selection/ElementViewSelectionTest.java rename to views/src/test/java/tools/vitruv/framework/views/selection/ElementViewSelectionTest.java index d6c4e06fd1..472f1a2259 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/selection/ElementViewSelectionTest.java +++ b/views/src/test/java/tools/vitruv/framework/views/selection/ElementViewSelectionTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet; +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet; import java.util.ArrayList; import java.util.List; @@ -19,8 +19,8 @@ import allElementTypes.Root; import tools.vitruv.framework.views.ModifiableViewSelection; -import tools.vitruv.testutils.RegisterMetamodelsInStandalone; -import tools.vitruv.testutils.TestLogging; +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone; +import tools.vitruv.change.testutils.TestLogging; @ExtendWith({ TestLogging.class, RegisterMetamodelsInStandalone.class }) public class ElementViewSelectionTest { diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/selectors/DirectViewElementSelectorTest.java b/views/src/test/java/tools/vitruv/framework/views/selectors/DirectViewElementSelectorTest.java similarity index 96% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/selectors/DirectViewElementSelectorTest.java rename to views/src/test/java/tools/vitruv/framework/views/selectors/DirectViewElementSelectorTest.java index a099cef99d..b0c0138df6 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/selectors/DirectViewElementSelectorTest.java +++ b/views/src/test/java/tools/vitruv/framework/views/selectors/DirectViewElementSelectorTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet; +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet; import java.util.ArrayList; import java.util.List; @@ -27,8 +27,8 @@ import tools.vitruv.framework.views.ViewSelector; import tools.vitruv.framework.views.impl.ModifiableView; import tools.vitruv.framework.views.impl.ViewCreatingViewType; -import tools.vitruv.testutils.RegisterMetamodelsInStandalone; -import tools.vitruv.testutils.TestLogging; +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone; +import tools.vitruv.change.testutils.TestLogging; @ExtendWith({ TestLogging.class, RegisterMetamodelsInStandalone.class }) public class DirectViewElementSelectorTest { diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/util/XmiIdEdgeCaseTest.java b/views/src/test/java/tools/vitruv/framework/views/util/XmiIdEdgeCaseTest.java similarity index 93% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/util/XmiIdEdgeCaseTest.java rename to views/src/test/java/tools/vitruv/framework/views/util/XmiIdEdgeCaseTest.java index b5ea0cf865..79d8c4622c 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/util/XmiIdEdgeCaseTest.java +++ b/views/src/test/java/tools/vitruv/framework/views/util/XmiIdEdgeCaseTest.java @@ -4,7 +4,7 @@ import static edu.kit.ipd.sdq.commons.util.org.eclipse.emf.ecore.resource.ResourceSetUtil.withGlobalFactories; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static tools.vitruv.testutils.metamodels.UmlMockupCreators.uml; +import static tools.vitruv.change.testutils.metamodels.UmlMockupCreators.uml; import java.io.File; import java.nio.file.Path; @@ -23,10 +23,10 @@ import edu.kit.ipd.sdq.commons.util.java.Pair; import edu.kit.ipd.sdq.commons.util.org.eclipse.emf.ecore.resource.ResourceCopier; -import tools.vitruv.testutils.RegisterMetamodelsInStandalone; -import tools.vitruv.testutils.TestLogging; -import tools.vitruv.testutils.TestProject; -import tools.vitruv.testutils.TestProjectManager; +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone; +import tools.vitruv.change.testutils.TestLogging; +import tools.vitruv.change.testutils.TestProject; +import tools.vitruv.change.testutils.TestProjectManager; import uml_mockup.Identified; import uml_mockup.UClass; import uml_mockup.UPackage; diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/BasicStateChangePropagationTest.xtend b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/BasicStateChangePropagationTest.xtend similarity index 98% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/BasicStateChangePropagationTest.xtend rename to views/src/test/xtend/tools/vitruv/framework/views/changederivation/BasicStateChangePropagationTest.xtend index 3175d61706..6ed3f83459 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/BasicStateChangePropagationTest.xtend +++ b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/BasicStateChangePropagationTest.xtend @@ -12,17 +12,17 @@ import tools.vitruv.change.atomic.feature.attribute.ReplaceSingleValuedEAttribut import tools.vitruv.change.atomic.root.InsertRootEObject import tools.vitruv.change.atomic.root.RemoveRootEObject import tools.vitruv.change.composite.description.VitruviusChangeResolver -import tools.vitruv.testutils.Capture +import tools.vitruv.change.testutils.Capture import static org.hamcrest.CoreMatchers.instanceOf import static org.hamcrest.MatcherAssert.assertThat import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertTrue -import static tools.vitruv.testutils.matchers.ModelMatchers.containsModelOf -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet +import static tools.vitruv.change.testutils.matchers.ModelMatchers.containsModelOf +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet import static extension edu.kit.ipd.sdq.commons.util.org.eclipse.emf.ecore.resource.ResourceSetUtil.withGlobalFactories -import static extension tools.vitruv.testutils.Capture.operator_doubleGreaterThan +import static extension tools.vitruv.change.testutils.Capture.operator_doubleGreaterThan class BasicStateChangePropagationTest extends StateChangePropagationTest { private def getTestUri() { diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/EdgeCaseStateChangeTest.xtend b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/EdgeCaseStateChangeTest.xtend similarity index 100% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/EdgeCaseStateChangeTest.xtend rename to views/src/test/xtend/tools/vitruv/framework/views/changederivation/EdgeCaseStateChangeTest.xtend diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/PcmStateChangeTest.xtend b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/PcmStateChangeTest.xtend similarity index 97% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/PcmStateChangeTest.xtend rename to views/src/test/xtend/tools/vitruv/framework/views/changederivation/PcmStateChangeTest.xtend index 64ac2d08d9..df3d13711b 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/PcmStateChangeTest.xtend +++ b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/PcmStateChangeTest.xtend @@ -3,7 +3,7 @@ package tools.vitruv.framework.views.changederivation import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource -import static tools.vitruv.testutils.metamodels.PcmMockupCreators.pcm +import static tools.vitruv.change.testutils.metamodels.PcmMockupCreators.pcm class PcmStateChangeTest extends StateChangePropagationTest { @ParameterizedTest() diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/StateChangePropagationTest.xtend b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/StateChangePropagationTest.xtend similarity index 94% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/StateChangePropagationTest.xtend rename to views/src/test/xtend/tools/vitruv/framework/views/changederivation/StateChangePropagationTest.xtend index a30d64e748..7a6a388cdb 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/StateChangePropagationTest.xtend +++ b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/StateChangePropagationTest.xtend @@ -19,15 +19,15 @@ import pcm_mockup.Repository import tools.vitruv.change.composite.description.VitruviusChange import tools.vitruv.change.composite.description.VitruviusChangeResolver import tools.vitruv.change.composite.recording.ChangeRecorder -import tools.vitruv.testutils.RegisterMetamodelsInStandalone -import tools.vitruv.testutils.TestLogging -import tools.vitruv.testutils.TestProject -import tools.vitruv.testutils.TestProjectManager +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone +import tools.vitruv.change.testutils.TestLogging +import tools.vitruv.change.testutils.TestProject +import tools.vitruv.change.testutils.TestProjectManager import uml_mockup.UPackage import static org.junit.jupiter.api.Assertions.* -import static tools.vitruv.testutils.metamodels.PcmMockupCreators.pcm -import static tools.vitruv.testutils.metamodels.UmlMockupCreators.uml +import static tools.vitruv.change.testutils.metamodels.PcmMockupCreators.pcm +import static tools.vitruv.change.testutils.metamodels.UmlMockupCreators.uml import static extension edu.kit.ipd.sdq.commons.util.org.eclipse.emf.common.util.URIUtil.createFileURI import static extension edu.kit.ipd.sdq.commons.util.org.eclipse.emf.ecore.resource.ResourceSetUtil.withGlobalFactories diff --git a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/UmlStateChangeTest.xtend b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/UmlStateChangeTest.xtend similarity index 97% rename from tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/UmlStateChangeTest.xtend rename to views/src/test/xtend/tools/vitruv/framework/views/changederivation/UmlStateChangeTest.xtend index c21e11d991..866b365653 100644 --- a/tests/tools.vitruv.framework.views.tests/src/tools/vitruv/framework/views/changederivation/UmlStateChangeTest.xtend +++ b/views/src/test/xtend/tools/vitruv/framework/views/changederivation/UmlStateChangeTest.xtend @@ -5,7 +5,7 @@ import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.EnumSource import org.junit.jupiter.params.provider.MethodSource -import static tools.vitruv.testutils.metamodels.UmlMockupCreators.uml +import static tools.vitruv.change.testutils.metamodels.UmlMockupCreators.uml class UmlStateChangeTest extends StateChangePropagationTest { @ParameterizedTest() diff --git a/vsum/pom.xml b/vsum/pom.xml new file mode 100644 index 0000000000..816924bd18 --- /dev/null +++ b/vsum/pom.xml @@ -0,0 +1,137 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.framework + 3.1.0-SNAPSHOT + + + tools.vitruv.framework.vsum + + Vitruv V-SUM definition + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.utils + ${project.version} + compile + + + ${project.groupId} + tools.vitruv.change.composite + ${project.version} + + + ${project.groupId} + tools.vitruv.change.propagation + ${project.version} + + + ${project.groupId} + tools.vitruv.change.correspondence + ${project.version} + + + ${project.groupId} + tools.vitruv.change.interaction + ${project.version} + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + ${project.groupId} + tools.vitruv.framework.views + ${project.version} + + + + + ${project.groupId} + tools.vitruv.change.testutils.metamodels + ${project.version} + test + + + ${project.groupId} + tools.vitruv.change.testutils.core + ${project.version} + test + + + + + com.google.guava + guava + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + org.eclipse.xtend + org.eclipse.xtend.lib + + + log4j + log4j + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + + + org.hamcrest + hamcrest + test + + + xannotations + edu.kit.ipd.sdq.activextendannotations + test + + + org.junit.jupiter + junit-jupiter-api + test + + + sdq-commons + edu.kit.ipd.sdq.commons.util.java + test + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/ResourceRepositoryImpl.java b/vsum/src/main/java/tools/vitruv/framework/vsum/internal/ResourceRepositoryImpl.java similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/ResourceRepositoryImpl.java rename to vsum/src/main/java/tools/vitruv/framework/vsum/internal/ResourceRepositoryImpl.java diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/VirtualModelImpl.java b/vsum/src/main/java/tools/vitruv/framework/vsum/internal/VirtualModelImpl.java similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/VirtualModelImpl.java rename to vsum/src/main/java/tools/vitruv/framework/vsum/internal/VirtualModelImpl.java diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/VirtualModelRegistry.java b/vsum/src/main/java/tools/vitruv/framework/vsum/internal/VirtualModelRegistry.java similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/VirtualModelRegistry.java rename to vsum/src/main/java/tools/vitruv/framework/vsum/internal/VirtualModelRegistry.java diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/VirtualModel.xtend b/vsum/src/main/xtend/tools/vitruv/framework/vsum/VirtualModel.xtend similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/VirtualModel.xtend rename to vsum/src/main/xtend/tools/vitruv/framework/vsum/VirtualModel.xtend diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/VirtualModelBuilder.xtend b/vsum/src/main/xtend/tools/vitruv/framework/vsum/VirtualModelBuilder.xtend similarity index 98% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/VirtualModelBuilder.xtend rename to vsum/src/main/xtend/tools/vitruv/framework/vsum/VirtualModelBuilder.xtend index 3b16eb0373..773ea2ab64 100644 --- a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/VirtualModelBuilder.xtend +++ b/vsum/src/main/xtend/tools/vitruv/framework/vsum/VirtualModelBuilder.xtend @@ -15,7 +15,7 @@ import tools.vitruv.framework.views.ViewTypeRepository import tools.vitruv.framework.vsum.helper.VsumFileSystemLayout import tools.vitruv.framework.vsum.internal.InternalVirtualModel import tools.vitruv.framework.vsum.internal.VirtualModelImpl -import tools.vitruv.change.propagation.ProjectMarker +import tools.vitruv.change.utils.ProjectMarker import static com.google.common.base.Preconditions.checkState diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/VirtualModelManager.xtend b/vsum/src/main/xtend/tools/vitruv/framework/vsum/VirtualModelManager.xtend similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/VirtualModelManager.xtend rename to vsum/src/main/xtend/tools/vitruv/framework/vsum/VirtualModelManager.xtend diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/helper/VsumFileSystemLayout.xtend b/vsum/src/main/xtend/tools/vitruv/framework/vsum/helper/VsumFileSystemLayout.xtend similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/helper/VsumFileSystemLayout.xtend rename to vsum/src/main/xtend/tools/vitruv/framework/vsum/helper/VsumFileSystemLayout.xtend diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/InternalVirtualModel.xtend b/vsum/src/main/xtend/tools/vitruv/framework/vsum/internal/InternalVirtualModel.xtend similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/InternalVirtualModel.xtend rename to vsum/src/main/xtend/tools/vitruv/framework/vsum/internal/InternalVirtualModel.xtend diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/ModelInstance.xtend b/vsum/src/main/xtend/tools/vitruv/framework/vsum/internal/ModelInstance.xtend similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/ModelInstance.xtend rename to vsum/src/main/xtend/tools/vitruv/framework/vsum/internal/ModelInstance.xtend diff --git a/bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/ModelRepository.xtend b/vsum/src/main/xtend/tools/vitruv/framework/vsum/internal/ModelRepository.xtend similarity index 100% rename from bundles/tools.vitruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/ModelRepository.xtend rename to vsum/src/main/xtend/tools/vitruv/framework/vsum/internal/ModelRepository.xtend diff --git a/tests/tools.vitruv.framework.vsum.tests/src/tools/vitruv/framework/vsum/VirtualModelTest.xtend b/vsum/src/test/xtend/tools/vitruv/framework/vsum/VirtualModelTest.xtend similarity index 98% rename from tests/tools.vitruv.framework.vsum.tests/src/tools/vitruv/framework/vsum/VirtualModelTest.xtend rename to vsum/src/test/xtend/tools/vitruv/framework/vsum/VirtualModelTest.xtend index a90f4b059b..e6b7088681 100644 --- a/tests/tools.vitruv.framework.vsum.tests/src/tools/vitruv/framework/vsum/VirtualModelTest.xtend +++ b/vsum/src/test/xtend/tools/vitruv/framework/vsum/VirtualModelTest.xtend @@ -19,16 +19,16 @@ import tools.vitruv.change.composite.recording.ChangeRecorder import tools.vitruv.framework.views.View import tools.vitruv.framework.views.ViewTypeFactory import tools.vitruv.framework.vsum.VirtualModelTestUtil.RedundancyChangePropagationSpecification -import tools.vitruv.testutils.TestProject -import tools.vitruv.testutils.TestProjectManager +import tools.vitruv.change.testutils.TestProject +import tools.vitruv.change.testutils.TestProjectManager import static org.hamcrest.CoreMatchers.* import static org.hamcrest.MatcherAssert.assertThat import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertNotEquals import static org.junit.jupiter.api.Assertions.assertNull -import static tools.vitruv.testutils.matchers.ModelMatchers.containsModelOf -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet +import static tools.vitruv.change.testutils.matchers.ModelMatchers.containsModelOf +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet import static extension com.google.common.base.Preconditions.checkNotNull import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.claimOne diff --git a/tests/tools.vitruv.framework.vsum.tests/src/tools/vitruv/framework/vsum/VirtualModelTestUtil.xtend b/vsum/src/test/xtend/tools/vitruv/framework/vsum/VirtualModelTestUtil.xtend similarity index 97% rename from tests/tools.vitruv.framework.vsum.tests/src/tools/vitruv/framework/vsum/VirtualModelTestUtil.xtend rename to vsum/src/test/xtend/tools/vitruv/framework/vsum/VirtualModelTestUtil.xtend index 6eb6031b19..2083a7ae36 100644 --- a/tests/tools.vitruv.framework.vsum.tests/src/tools/vitruv/framework/vsum/VirtualModelTestUtil.xtend +++ b/vsum/src/test/xtend/tools/vitruv/framework/vsum/VirtualModelTestUtil.xtend @@ -18,11 +18,11 @@ import tools.vitruv.change.composite.recording.ChangeRecorder import tools.vitruv.change.correspondence.Correspondence import tools.vitruv.change.correspondence.view.EditableCorrespondenceModelView import tools.vitruv.change.interaction.UserInteractionFactory -import tools.vitruv.change.propagation.ResourceAccess +import tools.vitruv.change.utils.ResourceAccess import tools.vitruv.change.propagation.impl.AbstractChangePropagationSpecification import static org.junit.jupiter.api.Assertions.assertEquals -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet /** * Utility methods for the VSUM and view test cases.