diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b8c0876d..b9772318 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1 @@ -* @TomWerm * @vitruv-tools/maintainers diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 52a258cc..c6f9cfc9 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 69452252..0f0e911f 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: '35 2 * * *' # run nightly at 2:35 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 Change Artifact - if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v4 - with: - name: change - path: releng/tools.vitruv.change.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/change - publish_dir: releng/tools.vitruv.change.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/change/${{ github.event.release.tag_name }} - publish_dir: releng/tools.vitruv.change.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 a245825b..00000000 --- a/.github/workflows/validation.yml +++ /dev/null @@ -1,178 +0,0 @@ -name: Validation - -on: - pull_request: - -jobs: - validate_change: - name: Change - uses: ./.github/workflows/ci.yml - - validate_framework: - needs: validate_change - name: Framework - runs-on: ubuntu-latest - steps: - - name: Download Change Artifact - uses: actions/download-artifact@v4 - with: - name: change - path: change - - name: Checkout Framework - uses: actions/checkout@v4 - with: - path: framework - repository: vitruv-tools/Vitruv - ref: main - fetch-depth: 0 - - name: Checkout Matching Framework Branch - run: | - cd framework - 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 Framework - working-directory: ./framework - run: > - ./mvnw -B -U clean verify - '-Dvitruv.change.url=file:///${{ github.workspace }}/change' - '-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 - uses: actions/upload-artifact@v4 - with: - name: framework - path: framework/releng/tools.vitruv.updatesite/target/repository - retention-days: 1 - - validate_DSLs: - needs: validate_change - name: DSLs - runs-on: ubuntu-latest - steps: - - name: Download Change Artifact - uses: actions/download-artifact@v4 - with: - name: change - path: change - - 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 and Verify DSLs - uses: coactions/setup-xvfb@v1 - with: - working-directory: ./dsls - run: > - ./mvnw -B -U clean verify - -Dvitruv.change.url=file:///${{ github.workspace }}/change - -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_change, validate_framework, validate_DSLs] - name: Case Studies - runs-on: ubuntu-latest - steps: - - name: Download Change Artifact - uses: actions/download-artifact@v4 - with: - name: change - path: change - - 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.change.url=file:///${{ github.workspace }}/change - -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 ea8d7021..078418f5 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 754e2587..00000000 --- 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 00000000..4e39a1cd --- /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 d8b2495a..346d645f 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/atomic/.project b/atomic/.project new file mode 100644 index 00000000..ef05f0fd --- /dev/null +++ b/atomic/.project @@ -0,0 +1,29 @@ + + + tools.vitruv.change.atomic + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + + + 1700568570080 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/bundles/tools.vitruv.change.atomic/plugin.xml b/atomic/plugin.xml similarity index 81% rename from bundles/tools.vitruv.change.atomic/plugin.xml rename to atomic/plugin.xml index f7aea6d0..4526d8f3 100644 --- a/bundles/tools.vitruv.change.atomic/plugin.xml +++ b/atomic/plugin.xml @@ -6,22 +6,12 @@ - - - - - - - - - - + genModel="src/main/ecore/atomicModelChange.genmodel"/> @@ -29,7 +19,7 @@ + genModel="src/main/ecore/atomicModelChange.genmodel"/> @@ -37,7 +27,7 @@ + genModel="src/main/ecore/atomicModelChange.genmodel"/> @@ -45,7 +35,7 @@ + genModel="src/main/ecore/atomicModelChange.genmodel"/> @@ -53,7 +43,7 @@ + genModel="src/main/ecore/atomicModelChange.genmodel"/> @@ -61,7 +51,7 @@ + genModel="src/main/ecore/atomicModelChange.genmodel"/> @@ -69,7 +59,7 @@ + genModel="src/main/ecore/atomicModelChange.genmodel"/> @@ -77,6 +67,7 @@ + genModel="src/main/ecore/atomicModelChange.genmodel"/> + diff --git a/atomic/pom.xml b/atomic/pom.xml new file mode 100644 index 00000000..7b131c4b --- /dev/null +++ b/atomic/pom.xml @@ -0,0 +1,120 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.atomic + + Vitruv Atomic Change Metamodel + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.codehaus.mojo + exec-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + maven-jar-plugin + + + ${project.basedir}/META-INF/MANIFEST.MF + + + + + + + + + + ${project.groupId} + tools.vitruv.change.testutils.core + ${project.version} + test + + + ${project.groupId} + tools.vitruv.change.testutils.metamodels + ${project.version} + test + + + + + log4j + log4j + + + com.google.guava + guava + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + org.eclipse.emf + org.eclipse.emf.edit + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + xannotations + edu.kit.ipd.sdq.activextendannotations + + + + + org.eclipse.xtend + org.eclipse.xtend.lib + test + + + 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 + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.change.atomic/metamodel/atomicModelChange.ecore b/atomic/src/main/ecore/atomicModelChange.ecore similarity index 91% rename from bundles/tools.vitruv.change.atomic/metamodel/atomicModelChange.ecore rename to atomic/src/main/ecore/atomicModelChange.ecore index 22c24b93..5150498f 100644 --- a/bundles/tools.vitruv.change.atomic/metamodel/atomicModelChange.ecore +++ b/atomic/src/main/ecore/atomicModelChange.ecore @@ -98,9 +98,9 @@ - + + eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/> @@ -138,7 +138,7 @@ - +
@@ -150,7 +150,7 @@ + eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
@@ -198,7 +198,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -268,27 +268,27 @@
- + - + - +
- +
- + @@ -313,10 +313,10 @@ - + @@ -328,10 +328,10 @@
- + - + @@ -353,7 +353,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -387,7 +387,7 @@
- + @@ -399,7 +399,7 @@ - + @@ -413,7 +413,7 @@
- + @@ -438,14 +438,14 @@
- + - + @@ -458,14 +458,14 @@
- + - + @@ -478,14 +478,14 @@
- + - + @@ -507,7 +507,7 @@ - +
@@ -515,7 +515,7 @@ - + @@ -525,7 +525,7 @@ - + @@ -556,7 +556,7 @@ - + @@ -572,7 +572,7 @@ - + @@ -588,7 +588,7 @@ - + diff --git a/bundles/tools.vitruv.change.atomic/metamodel/atomicModelChange.genmodel b/atomic/src/main/ecore/atomicModelChange.genmodel similarity index 98% rename from bundles/tools.vitruv.change.atomic/metamodel/atomicModelChange.genmodel rename to atomic/src/main/ecore/atomicModelChange.genmodel index 26afba43..7149e2e0 100644 --- a/bundles/tools.vitruv.change.atomic/metamodel/atomicModelChange.genmodel +++ b/atomic/src/main/ecore/atomicModelChange.genmodel @@ -1,9 +1,9 @@ atomicModelChange.ecore - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.change.atomic/.project b/bundles/tools.vitruv.change.atomic/.project deleted file mode 100644 index a25b6a70..00000000 --- a/bundles/tools.vitruv.change.atomic/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.atomic - - - - - - 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.change.atomic/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.change.atomic/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.change.atomic/.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.change.atomic/META-INF/MANIFEST.MF b/bundles/tools.vitruv.change.atomic/META-INF/MANIFEST.MF deleted file mode 100644 index 1d011179..00000000 --- a/bundles/tools.vitruv.change.atomic/META-INF/MANIFEST.MF +++ /dev/null @@ -1,38 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: tools.vitruv.change.atomic;singleton:=true -Automatic-Module-Name: tools.vitruv.change.atomic -Bundle-Version: 3.0.1.qualifier -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: tools.vitruv.change.atomic, - tools.vitruv.change.atomic.eobject, - tools.vitruv.change.atomic.eobject.util, - tools.vitruv.change.atomic.feature, - tools.vitruv.change.atomic.feature.attribute, - tools.vitruv.change.atomic.feature.attribute.util, - tools.vitruv.change.atomic.feature.list, - tools.vitruv.change.atomic.feature.list.util, - tools.vitruv.change.atomic.feature.reference, - tools.vitruv.change.atomic.feature.reference.util, - tools.vitruv.change.atomic.feature.single, - tools.vitruv.change.atomic.feature.single.util, - tools.vitruv.change.atomic.feature.util, - tools.vitruv.change.atomic.hid, - tools.vitruv.change.atomic.root, - tools.vitruv.change.atomic.root.util, - tools.vitruv.change.atomic.util, - tools.vitruv.change.atomic.uuid -Require-Bundle: org.eclipse.xtend.lib, - org.apache.log4j, - org.eclipse.emf.ecore.edit, - org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.xtext.xbase.lib, - edu.kit.ipd.sdq.activextendannotations, - edu.kit.ipd.sdq.commons.util.emf, - edu.kit.ipd.sdq.commons.util.java -Bundle-ActivationPolicy: lazy diff --git a/bundles/tools.vitruv.change.atomic/build.properties b/bundles/tools.vitruv.change.atomic/build.properties deleted file mode 100644 index b85e097e..00000000 --- a/bundles/tools.vitruv.change.atomic/build.properties +++ /dev/null @@ -1,12 +0,0 @@ -# - -bin.includes = .,\ - META-INF/,\ - plugin.xml,\ - plugin.properties,\ - metamodel/ -jars.compile.order = . -source.. = src-gen/,\ - src/,\ - xtend-gen/ -output.. = target/classes/ diff --git a/bundles/tools.vitruv.change.atomic/plugin.properties b/bundles/tools.vitruv.change.atomic/plugin.properties deleted file mode 100644 index 306ca537..00000000 --- a/bundles/tools.vitruv.change.atomic/plugin.properties +++ /dev/null @@ -1,4 +0,0 @@ -# - -pluginName = Vitruv Atomic Change Metamodel -providerName = vitruv.tools diff --git a/bundles/tools.vitruv.change.changederivation/.classpath b/bundles/tools.vitruv.change.changederivation/.classpath deleted file mode 100644 index ef548cb9..00000000 --- a/bundles/tools.vitruv.change.changederivation/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.change.changederivation/.project b/bundles/tools.vitruv.change.changederivation/.project deleted file mode 100644 index 0fd10b61..00000000 --- a/bundles/tools.vitruv.change.changederivation/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.changederivation - - - - - - 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.change.changederivation/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.change.changederivation/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.change.changederivation/.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.change.changederivation/META-INF/MANIFEST.MF b/bundles/tools.vitruv.change.changederivation/META-INF/MANIFEST.MF deleted file mode 100644 index 2a1fec1f..00000000 --- a/bundles/tools.vitruv.change.changederivation/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Change Derivation -Bundle-SymbolicName: tools.vitruv.change.changederivation -Automatic-Module-Name: tools.vitruv.change.changederivation -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.commons.util.emf -Export-Package: tools.vitruv.change.changederivation -Bundle-Vendor: vitruv.tools diff --git a/bundles/tools.vitruv.change.changederivation/build.properties b/bundles/tools.vitruv.change.changederivation/build.properties deleted file mode 100644 index 3c36c1d7..00000000 --- a/bundles/tools.vitruv.change.changederivation/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.change.composite/.classpath b/bundles/tools.vitruv.change.composite/.classpath deleted file mode 100644 index ef548cb9..00000000 --- a/bundles/tools.vitruv.change.composite/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.change.composite/.project b/bundles/tools.vitruv.change.composite/.project deleted file mode 100644 index 72cb3ec4..00000000 --- a/bundles/tools.vitruv.change.composite/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.composite - - - - - - 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.change.composite/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.change.composite/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.change.composite/.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.change.composite/META-INF/MANIFEST.MF b/bundles/tools.vitruv.change.composite/META-INF/MANIFEST.MF deleted file mode 100644 index caf5b9fa..00000000 --- a/bundles/tools.vitruv.change.composite/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Composite Change Metamodel -Bundle-SymbolicName: tools.vitruv.change.composite -Automatic-Module-Name: tools.vitruv.change.composite -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.apache.log4j, - org.eclipse.xtend.lib, - org.eclipse.emf.ecore.change, - tools.vitruv.change.atomic;visibility:=reexport, - tools.vitruv.change.interaction.model;visibility:=reexport, - edu.kit.ipd.sdq.activextendannotations, - edu.kit.ipd.sdq.commons.util.java, - edu.kit.ipd.sdq.commons.util.emf -Export-Package: tools.vitruv.change.composite, - tools.vitruv.change.composite.propagation, - tools.vitruv.change.composite.recording, - tools.vitruv.change.composite.description -Bundle-Vendor: vitruv.tools diff --git a/bundles/tools.vitruv.change.composite/build.properties b/bundles/tools.vitruv.change.composite/build.properties deleted file mode 100644 index 3c36c1d7..00000000 --- a/bundles/tools.vitruv.change.composite/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.change.correspondence/.classpath b/bundles/tools.vitruv.change.correspondence/.classpath deleted file mode 100644 index aae21769..00000000 --- a/bundles/tools.vitruv.change.correspondence/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.change.correspondence/.project b/bundles/tools.vitruv.change.correspondence/.project deleted file mode 100644 index ffe2b05b..00000000 --- a/bundles/tools.vitruv.change.correspondence/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - tools.vitruv.change.correspondence - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/bundles/tools.vitruv.change.correspondence/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.change.correspondence/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.change.correspondence/.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.change.correspondence/META-INF/MANIFEST.MF b/bundles/tools.vitruv.change.correspondence/META-INF/MANIFEST.MF deleted file mode 100644 index 970688ab..00000000 --- a/bundles/tools.vitruv.change.correspondence/META-INF/MANIFEST.MF +++ /dev/null @@ -1,23 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: tools.vitruv.change.correspondence;singleton:=true -Automatic-Module-Name: tools.vitruv.change.correspondence -Bundle-ClassPath: . -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.apache.log4j, - org.eclipse.emf.ecore.change, - edu.kit.ipd.sdq.commons.util.emf, - com.google.guava, - org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport -Bundle-ActivationPolicy: lazy -Export-Package: tools.vitruv.change.correspondence, - tools.vitruv.change.correspondence.impl, - tools.vitruv.change.correspondence.util, - tools.vitruv.change.correspondence.view, - tools.vitruv.change.correspondence.model -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Import-Package: tools.vitruv.change.changederivation diff --git a/bundles/tools.vitruv.change.correspondence/build.properties b/bundles/tools.vitruv.change.correspondence/build.properties deleted file mode 100644 index 78ce07c7..00000000 --- a/bundles/tools.vitruv.change.correspondence/build.properties +++ /dev/null @@ -1,11 +0,0 @@ -# - -bin.includes = .,\ - META-INF/,\ - plugin.xml,\ - plugin.properties,\ - metamodel/ -jars.compile.order = . -source.. = src-gen/,\ - src/ -output.. = target/classes/ diff --git a/bundles/tools.vitruv.change.correspondence/plugin.properties b/bundles/tools.vitruv.change.correspondence/plugin.properties deleted file mode 100644 index b0ac3158..00000000 --- a/bundles/tools.vitruv.change.correspondence/plugin.properties +++ /dev/null @@ -1,4 +0,0 @@ -# - -pluginName = Vitruv Correspondence Metamodel -providerName = vitruv.tools diff --git a/bundles/tools.vitruv.change.interaction.model/.classpath b/bundles/tools.vitruv.change.interaction.model/.classpath deleted file mode 100644 index 8a04cdec..00000000 --- a/bundles/tools.vitruv.change.interaction.model/.classpath +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.change.interaction.model/.project b/bundles/tools.vitruv.change.interaction.model/.project deleted file mode 100644 index 84b13291..00000000 --- a/bundles/tools.vitruv.change.interaction.model/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.interaction.model - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/bundles/tools.vitruv.change.interaction.model/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.change.interaction.model/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.change.interaction.model/.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.change.interaction.model/META-INF/MANIFEST.MF b/bundles/tools.vitruv.change.interaction.model/META-INF/MANIFEST.MF deleted file mode 100644 index 0230632b..00000000 --- a/bundles/tools.vitruv.change.interaction.model/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: tools.vitruv.change.interaction.model;singleton:=true -Automatic-Module-Name: tools.vitruv.change.interaction.model -Bundle-Version: 3.0.1.qualifier -Bundle-ClassPath: . -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: tools.vitruv.change.interaction, - tools.vitruv.change.interaction.impl, - tools.vitruv.change.interaction.util -Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.core.runtime -Bundle-ActivationPolicy: lazy diff --git a/bundles/tools.vitruv.change.interaction.model/build.properties b/bundles/tools.vitruv.change.interaction.model/build.properties deleted file mode 100644 index 88c6d1b3..00000000 --- a/bundles/tools.vitruv.change.interaction.model/build.properties +++ /dev/null @@ -1,10 +0,0 @@ -# - -bin.includes = .,\ - metamodel/,\ - META-INF/,\ - plugin.xml,\ - plugin.properties -jars.compile.order = . -source.. = src-gen/ -output.. = target/classes/ diff --git a/bundles/tools.vitruv.change.interaction.model/plugin.properties b/bundles/tools.vitruv.change.interaction.model/plugin.properties deleted file mode 100644 index f2484fb5..00000000 --- a/bundles/tools.vitruv.change.interaction.model/plugin.properties +++ /dev/null @@ -1,4 +0,0 @@ -# - -pluginName = Vitruv Change Interactions Metamodel -providerName = vitruv.tools diff --git a/bundles/tools.vitruv.change.interaction/.classpath b/bundles/tools.vitruv.change.interaction/.classpath deleted file mode 100644 index ef548cb9..00000000 --- a/bundles/tools.vitruv.change.interaction/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.change.interaction/.project b/bundles/tools.vitruv.change.interaction/.project deleted file mode 100644 index 7d081cec..00000000 --- a/bundles/tools.vitruv.change.interaction/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.interaction - - - - - - 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.change.interaction/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.change.interaction/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.change.interaction/.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.change.interaction/META-INF/MANIFEST.MF b/bundles/tools.vitruv.change.interaction/META-INF/MANIFEST.MF deleted file mode 100644 index 6f3e5584..00000000 --- a/bundles/tools.vitruv.change.interaction/META-INF/MANIFEST.MF +++ /dev/null @@ -1,18 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Change Interactions -Bundle-SymbolicName: tools.vitruv.change.interaction -Automatic-Module-Name: tools.vitruv.change.interaction -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Bundle-ActivationPolicy: lazy -Require-Bundle: org.apache.log4j, - org.eclipse.swt, - org.eclipse.ui.workbench, - org.eclipse.jface, - org.eclipse.xtend.lib, - edu.kit.ipd.sdq.commons.util.java, - tools.vitruv.change.interaction.model;visibility:=reexport -Export-Package: tools.vitruv.change.interaction, - tools.vitruv.change.interaction.builder -Bundle-Vendor: vitruv.tools diff --git a/bundles/tools.vitruv.change.interaction/build.properties b/bundles/tools.vitruv.change.interaction/build.properties deleted file mode 100644 index 3c36c1d7..00000000 --- a/bundles/tools.vitruv.change.interaction/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.change.propagation/.classpath b/bundles/tools.vitruv.change.propagation/.classpath deleted file mode 100644 index 07857d42..00000000 --- a/bundles/tools.vitruv.change.propagation/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.change.propagation/.project b/bundles/tools.vitruv.change.propagation/.project deleted file mode 100644 index 77610f7a..00000000 --- a/bundles/tools.vitruv.change.propagation/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.propagation - - - - - - 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.change.propagation/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.change.propagation/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.change.propagation/.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.change.propagation/META-INF/MANIFEST.MF b/bundles/tools.vitruv.change.propagation/META-INF/MANIFEST.MF deleted file mode 100644 index 119019dc..00000000 --- a/bundles/tools.vitruv.change.propagation/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Framework Change Processing -Bundle-SymbolicName: tools.vitruv.change.propagation;singleton:=true -Automatic-Module-Name: tools.vitruv.change.propagation -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.apache.log4j, - org.eclipse.xtend.lib, - tools.vitruv.change.correspondence;visibility:=reexport, - tools.vitruv.change.interaction;visibility:=reexport, - tools.vitruv.change.composite;visibility:=reexport, - edu.kit.ipd.sdq.commons.util.java, - edu.kit.ipd.sdq.commons.util.emf -Export-Package: tools.vitruv.change.propagation, - tools.vitruv.change.propagation.impl -Bundle-Vendor: vitruv.tools diff --git a/bundles/tools.vitruv.change.propagation/build.properties b/bundles/tools.vitruv.change.propagation/build.properties deleted file mode 100644 index 3c36c1d7..00000000 --- a/bundles/tools.vitruv.change.propagation/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.changevisualization/.classpath b/bundles/tools.vitruv.testutils.changevisualization/.classpath deleted file mode 100644 index fe1a2053..00000000 --- a/bundles/tools.vitruv.testutils.changevisualization/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/bundles/tools.vitruv.testutils.changevisualization/.project b/bundles/tools.vitruv.testutils.changevisualization/.project deleted file mode 100644 index ea5c0413..00000000 --- a/bundles/tools.vitruv.testutils.changevisualization/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - tools.vitruv.testutils.changevisualization - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/bundles/tools.vitruv.testutils.changevisualization/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.testutils.changevisualization/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.testutils.changevisualization/.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.changevisualization/META-INF/MANIFEST.MF b/bundles/tools.vitruv.testutils.changevisualization/META-INF/MANIFEST.MF deleted file mode 100644 index 656d193a..00000000 --- a/bundles/tools.vitruv.testutils.changevisualization/META-INF/MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Change Visualization -Bundle-SymbolicName: tools.vitruv.testutils.changevisualization;singleton:=true -Automatic-Module-Name: tools.vitruv.testutils.changevisualization -Bundle-Version: 3.0.1.qualifier -Require-Bundle: org.eclipse.ui, - org.eclipse.core.resources, - org.eclipse.core.runtime, - tools.vitruv.change.composite -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: tools.vitruv.testutils.changevisualization -Bundle-Vendor: vitruv.tools diff --git a/bundles/tools.vitruv.testutils.changevisualization/build.properties b/bundles/tools.vitruv.testutils.changevisualization/build.properties deleted file mode 100644 index 56d77655..00000000 --- a/bundles/tools.vitruv.testutils.changevisualization/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/bundles/tools.vitruv.testutils.metamodels/.classpath b/bundles/tools.vitruv.testutils.metamodels/.classpath deleted file mode 100644 index 84fee6c3..00000000 --- a/bundles/tools.vitruv.testutils.metamodels/.classpath +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.testutils.metamodels/.project b/bundles/tools.vitruv.testutils.metamodels/.project deleted file mode 100644 index 8a82a430..00000000 --- a/bundles/tools.vitruv.testutils.metamodels/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.testutils.metamodels - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/bundles/tools.vitruv.testutils.metamodels/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.testutils.metamodels/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.testutils.metamodels/.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.metamodels/META-INF/MANIFEST.MF b/bundles/tools.vitruv.testutils.metamodels/META-INF/MANIFEST.MF deleted file mode 100644 index 301ad4a5..00000000 --- a/bundles/tools.vitruv.testutils.metamodels/META-INF/MANIFEST.MF +++ /dev/null @@ -1,44 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: tools.vitruv.testutils.metamodels;singleton:=true -Automatic-Module-Name: tools.vitruv.testutils.metamodels -Bundle-Version: 3.0.1.qualifier -Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: allElementTypes, - allElementTypes.impl, - allElementTypes.util, - allElementTypes2, - allElementTypes2.impl, - allElementTypes2.util, - attribute_to_structure_attr, - attribute_to_structure_attr.impl, - attribute_to_structure_attr.util, - attribute_to_structure_struct_1, - attribute_to_structure_struct_1.impl, - attribute_to_structure_struct_1.util, - multicontainment_a, - multicontainment_a.impl, - multicontainment_a.util, - multicontainment_b, - multicontainment_b.impl, - multicontainment_b.util, - pcm_mockup, - pcm_mockup.impl, - pcm_mockup.util, - tools.vitruv.testutils.metamodels, - uml_mockup, - uml_mockup.impl, - uml_mockup.util -Import-Package: org.junit.jupiter.api.extension, - org.junit.jupiter.params.converter, - org.junit.platform.commons -Require-Bundle: edu.kit.ipd.sdq.activextendannotations, - org.eclipse.xtend.lib, - tools.vitruv.testutils, - org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport -Bundle-ActivationPolicy: lazy -Bundle-Vendor: %providerName -Bundle-Localization: plugin diff --git a/bundles/tools.vitruv.testutils.metamodels/build.properties b/bundles/tools.vitruv.testutils.metamodels/build.properties deleted file mode 100644 index c45784e8..00000000 --- a/bundles/tools.vitruv.testutils.metamodels/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -bin.includes = .,\ - META-INF/,\ - plugin.xml,\ - plugin.properties,\ - metamodels/ -source.. = src-gen/,\ - src/,\ - xtend-gen/ -output.. = target/classes/ diff --git a/bundles/tools.vitruv.testutils.metamodels/plugin.properties b/bundles/tools.vitruv.testutils.metamodels/plugin.properties deleted file mode 100644 index 097d36fa..00000000 --- a/bundles/tools.vitruv.testutils.metamodels/plugin.properties +++ /dev/null @@ -1,4 +0,0 @@ -# - -pluginName = Vitruv Test Utilities Metamodels -providerName = vitruv.tools diff --git a/bundles/tools.vitruv.testutils/.classpath b/bundles/tools.vitruv.testutils/.classpath deleted file mode 100644 index ef548cb9..00000000 --- a/bundles/tools.vitruv.testutils/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/bundles/tools.vitruv.testutils/.project b/bundles/tools.vitruv.testutils/.project deleted file mode 100644 index 63442f18..00000000 --- a/bundles/tools.vitruv.testutils/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.testutils - - - - - - 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/.settings/org.eclipse.core.resources.prefs b/bundles/tools.vitruv.testutils/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/bundles/tools.vitruv.testutils/.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/META-INF/MANIFEST.MF b/bundles/tools.vitruv.testutils/META-INF/MANIFEST.MF deleted file mode 100644 index cfb13684..00000000 --- a/bundles/tools.vitruv.testutils/META-INF/MANIFEST.MF +++ /dev/null @@ -1,27 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Test Utilities -Bundle-SymbolicName: tools.vitruv.testutils -Automatic-Module-Name: tools.vitruv.testutils -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.junit.jupiter.api.extension, - org.junit.jupiter.params.converter, - org.junit.platform.commons.support -Require-Bundle: org.apache.log4j, - org.hamcrest.core, - org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.emf.compare, - org.eclipse.xtend.lib, - edu.kit.ipd.sdq.activextendannotations, - edu.kit.ipd.sdq.commons.util.eclipse, - edu.kit.ipd.sdq.commons.util.emf, - edu.kit.ipd.sdq.commons.util.java, - tools.vitruv.change.propagation;visibility:=reexport -Export-Package: tools.vitruv.testutils, - tools.vitruv.testutils.activeannotations, - tools.vitruv.testutils.matchers, - tools.vitruv.testutils.printing, - tools.vitruv.testutils.views -Bundle-Vendor: vitruv.tools diff --git a/bundles/tools.vitruv.testutils/build.properties b/bundles/tools.vitruv.testutils/build.properties deleted file mode 100644 index 3c36c1d7..00000000 --- a/bundles/tools.vitruv.testutils/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/changederivation/pom.xml b/changederivation/pom.xml new file mode 100644 index 00000000..96caf086 --- /dev/null +++ b/changederivation/pom.xml @@ -0,0 +1,71 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.changederivation + + Vitruv Change Derivation + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + ${project.groupId} + tools.vitruv.change.composite + ${project.version} + + + + + com.google.guava + guava + + + emf-compare + org.eclipse.emf.compare + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/StateBasedChangeResolutionStrategy.java b/changederivation/src/main/java/tools/vitruv/change/changederivation/StateBasedChangeResolutionStrategy.java similarity index 100% rename from bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/StateBasedChangeResolutionStrategy.java rename to changederivation/src/main/java/tools/vitruv/change/changederivation/StateBasedChangeResolutionStrategy.java diff --git a/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/AbstractStateBasedChangeResolutionStrategy.xtend b/changederivation/src/main/xtend/tools/vitruv/change/changederivation/AbstractStateBasedChangeResolutionStrategy.xtend similarity index 100% rename from bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/AbstractStateBasedChangeResolutionStrategy.xtend rename to changederivation/src/main/xtend/tools/vitruv/change/changederivation/AbstractStateBasedChangeResolutionStrategy.xtend diff --git a/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend b/changederivation/src/main/xtend/tools/vitruv/change/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend similarity index 100% rename from bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend rename to changederivation/src/main/xtend/tools/vitruv/change/changederivation/DefaultStateBasedChangeResolutionStrategy.xtend diff --git a/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend b/changederivation/src/main/xtend/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend similarity index 100% rename from bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend rename to changederivation/src/main/xtend/tools/vitruv/change/changederivation/persistence/DeltaBasedResource.xtend diff --git a/bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend b/changederivation/src/main/xtend/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend similarity index 100% rename from bundles/tools.vitruv.change.changederivation/src/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend rename to changederivation/src/main/xtend/tools/vitruv/change/changederivation/persistence/DeltaBasedResourceFactory.xtend diff --git a/composite/pom.xml b/composite/pom.xml new file mode 100644 index 00000000..8c006cee --- /dev/null +++ b/composite/pom.xml @@ -0,0 +1,114 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.composite + + Vitruv Composite Change Metamodel + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + ${project.groupId} + tools.vitruv.change.interaction.model + ${project.version} + + + + + ${project.groupId} + tools.vitruv.change.testutils.core + ${project.version} + test + + + ${project.groupId} + tools.vitruv.change.testutils.metamodels + ${project.version} + test + + + + + com.google.guava + guava + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + org.eclipse.emf + org.eclipse.emf.ecore.change + + + org.eclipse.xtend + org.eclipse.xtend.lib + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + sdq-commons + edu.kit.ipd.sdq.commons.util.java + + + xannotations + edu.kit.ipd.sdq.activextendannotations + + + + + org.hamcrest + hamcrest + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params + test + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/VitruviusChange.java b/composite/src/main/java/tools/vitruv/change/composite/description/VitruviusChange.java similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/VitruviusChange.java rename to composite/src/main/java/tools/vitruv/change/composite/description/VitruviusChange.java diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/VitruviusChangeResolver.java b/composite/src/main/java/tools/vitruv/change/composite/description/VitruviusChangeResolver.java similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/VitruviusChangeResolver.java rename to composite/src/main/java/tools/vitruv/change/composite/description/VitruviusChangeResolver.java diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java b/composite/src/main/java/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java rename to composite/src/main/java/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/VitruviusChangeHierarchicalIdResolver.java b/composite/src/main/java/tools/vitruv/change/composite/description/impl/VitruviusChangeHierarchicalIdResolver.java similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/VitruviusChangeHierarchicalIdResolver.java rename to composite/src/main/java/tools/vitruv/change/composite/description/impl/VitruviusChangeHierarchicalIdResolver.java diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/VitruviusChangeUuidResolver.java b/composite/src/main/java/tools/vitruv/change/composite/description/impl/VitruviusChangeUuidResolver.java similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/VitruviusChangeUuidResolver.java rename to composite/src/main/java/tools/vitruv/change/composite/description/impl/VitruviusChangeUuidResolver.java diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/propagation/ChangePropagationListener.java b/composite/src/main/java/tools/vitruv/change/composite/propagation/ChangePropagationListener.java similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/propagation/ChangePropagationListener.java rename to composite/src/main/java/tools/vitruv/change/composite/propagation/ChangePropagationListener.java diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/propagation/ChangeableModelRepository.java b/composite/src/main/java/tools/vitruv/change/composite/propagation/ChangeableModelRepository.java similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/propagation/ChangeableModelRepository.java rename to composite/src/main/java/tools/vitruv/change/composite/propagation/ChangeableModelRepository.java diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/MetamodelDescriptor.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/MetamodelDescriptor.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/MetamodelDescriptor.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/MetamodelDescriptor.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/CompositeChange.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/description/CompositeChange.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/CompositeChange.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/description/CompositeChange.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/CompositeContainerChange.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/description/CompositeContainerChange.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/CompositeContainerChange.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/description/CompositeContainerChange.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/PropagatedChange.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/description/PropagatedChange.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/PropagatedChange.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/description/PropagatedChange.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/TransactionalChange.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/description/TransactionalChange.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/TransactionalChange.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/description/TransactionalChange.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/VitruviusChangeFactory.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/description/VitruviusChangeFactory.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/VitruviusChangeFactory.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/description/VitruviusChangeFactory.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/AbstractCompositeChangeImpl.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/description/impl/AbstractCompositeChangeImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/AbstractCompositeChangeImpl.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/description/impl/AbstractCompositeChangeImpl.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/CompositeContainerChangeImpl.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/description/impl/CompositeContainerChangeImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/CompositeContainerChangeImpl.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/description/impl/CompositeContainerChangeImpl.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/TransactionalChangeImpl.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/description/impl/TransactionalChangeImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/TransactionalChangeImpl.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/description/impl/TransactionalChangeImpl.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/recording/ChangeRecorder.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/recording/ChangeRecorder.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/recording/ChangeRecorder.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/recording/ChangeRecorder.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/recording/EChangeCreationUtil.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/recording/EChangeCreationUtil.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/recording/EChangeCreationUtil.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/recording/EChangeCreationUtil.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/recording/NotificationInfo.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/recording/NotificationInfo.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/recording/NotificationInfo.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/recording/NotificationInfo.xtend diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/recording/NotificationToEChangeConverter.xtend b/composite/src/main/xtend/tools/vitruv/change/composite/recording/NotificationToEChangeConverter.xtend similarity index 100% rename from bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/recording/NotificationToEChangeConverter.xtend rename to composite/src/main/xtend/tools/vitruv/change/composite/recording/NotificationToEChangeConverter.xtend diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/ChangeDescription2ChangeTransformationTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/ChangeDescription2ChangeTransformationTest.xtend similarity index 94% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/ChangeDescription2ChangeTransformationTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/ChangeDescription2ChangeTransformationTest.xtend index 125ba20c..184b5278 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/ChangeDescription2ChangeTransformationTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/ChangeDescription2ChangeTransformationTest.xtend @@ -18,17 +18,17 @@ import tools.vitruv.change.atomic.uuid.UuidResolver 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.TestProject -import tools.vitruv.testutils.TestProjectManager +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone +import tools.vitruv.change.testutils.TestProject +import tools.vitruv.change.testutils.TestProjectManager import static com.google.common.base.Preconditions.checkState import static org.hamcrest.MatcherAssert.assertThat import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertNotNull import static org.junit.jupiter.api.Assertions.assertTrue -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 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.loadOrCreateResource diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/VitruviusChangeURITest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/VitruviusChangeURITest.xtend similarity index 93% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/VitruviusChangeURITest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/VitruviusChangeURITest.xtend index b8c3bc0c..01b94a30 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/VitruviusChangeURITest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/VitruviusChangeURITest.xtend @@ -2,7 +2,7 @@ package tools.vitruv.change.composite import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest import org.junit.jupiter.api.Test -import static extension tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static extension tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import static org.junit.jupiter.api.Assertions.assertEquals import static org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.DisplayName diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2InsertEAttributeValueTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2InsertEAttributeValueTest.xtend similarity index 97% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2InsertEAttributeValueTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2InsertEAttributeValueTest.xtend index 0a1251c0..b49c2fa4 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2InsertEAttributeValueTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2InsertEAttributeValueTest.xtend @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest import static allElementTypes.AllElementTypesPackage.Literals.* -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import static extension tools.vitruv.change.composite.util.AtomicEChangeAssertHelper.* import static extension tools.vitruv.change.composite.util.CompoundEChangeAssertHelper.* diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2MoveEAttributeTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2MoveEAttributeTest.xtend similarity index 100% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2MoveEAttributeTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2MoveEAttributeTest.xtend diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2RemoveEAttributeValueTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2RemoveEAttributeValueTest.xtend similarity index 100% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2RemoveEAttributeValueTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2RemoveEAttributeValueTest.xtend diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2ReplaceSingleValuedEAttributeTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2ReplaceSingleValuedEAttributeTest.xtend similarity index 100% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/attribute/ChangeDescription2ReplaceSingleValuedEAttributeTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/attribute/ChangeDescription2ReplaceSingleValuedEAttributeTest.xtend diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/integration/ChangeDescriptionComplexSequencesTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/integration/ChangeDescriptionComplexSequencesTest.xtend similarity index 97% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/integration/ChangeDescriptionComplexSequencesTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/integration/ChangeDescriptionComplexSequencesTest.xtend index 6410d1c9..e6fd43e9 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/integration/ChangeDescriptionComplexSequencesTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/integration/ChangeDescriptionComplexSequencesTest.xtend @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest import static allElementTypes.AllElementTypesPackage.Literals.* -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import static extension tools.vitruv.change.composite.util.AtomicEChangeAssertHelper.* import static extension tools.vitruv.change.composite.util.CompoundEChangeAssertHelper.* diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/recording/ChangeRecorderTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/recording/ChangeRecorderTest.xtend similarity index 98% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/recording/ChangeRecorderTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/recording/ChangeRecorderTest.xtend index 382e150f..7c147198 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/recording/ChangeRecorderTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/recording/ChangeRecorderTest.xtend @@ -28,16 +28,16 @@ import tools.vitruv.change.atomic.root.InsertRootEObject import tools.vitruv.change.atomic.root.RemoveRootEObject import tools.vitruv.change.atomic.uuid.UuidResolver import tools.vitruv.change.composite.description.TransactionalChange -import tools.vitruv.testutils.RegisterMetamodelsInStandalone -import tools.vitruv.testutils.TestProject -import tools.vitruv.testutils.TestProjectManager +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone +import tools.vitruv.change.testutils.TestProject +import tools.vitruv.change.testutils.TestProjectManager import static org.hamcrest.CoreMatchers.is import static org.hamcrest.MatcherAssert.assertThat import static org.junit.jupiter.api.Assertions.assertDoesNotThrow import static org.junit.jupiter.api.Assertions.assertThrows -import static tools.vitruv.testutils.matchers.ModelMatchers.* -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet +import static tools.vitruv.change.testutils.matchers.ModelMatchers.* +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 org.eclipse.emf.ecore.util.EcoreUtil.* diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2InsertEReferenceTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2InsertEReferenceTest.xtend similarity index 98% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2InsertEReferenceTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2InsertEReferenceTest.xtend index 366e3fb8..f4c545b3 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2InsertEReferenceTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2InsertEReferenceTest.xtend @@ -12,7 +12,7 @@ import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest import static allElementTypes.AllElementTypesPackage.Literals.* import static java.util.stream.StreamSupport.stream import static org.junit.jupiter.api.Assertions.assertEquals -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.mapFixed import static extension tools.vitruv.change.composite.util.AtomicEChangeAssertHelper.* diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2MoveERefenceTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2MoveERefenceTest.xtend similarity index 98% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2MoveERefenceTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2MoveERefenceTest.xtend index 8673b991..65a94eca 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2MoveERefenceTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2MoveERefenceTest.xtend @@ -2,7 +2,7 @@ package tools.vitruv.change.composite.reference import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest import org.junit.jupiter.api.Test -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import static extension tools.vitruv.change.composite.util.AtomicEChangeAssertHelper.* import static allElementTypes.AllElementTypesPackage.Literals.* diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2RemoveEReferenceTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2RemoveEReferenceTest.xtend similarity index 98% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2RemoveEReferenceTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2RemoveEReferenceTest.xtend index 1a7dbfb8..cfe5b8c3 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2RemoveEReferenceTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2RemoveEReferenceTest.xtend @@ -7,7 +7,7 @@ import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest import static allElementTypes.AllElementTypesPackage.Literals.* import static org.junit.jupiter.api.Assertions.assertTrue import static tools.vitruv.change.composite.util.ChangeAssertHelper.* -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import static extension tools.vitruv.change.composite.util.AtomicEChangeAssertHelper.* import static extension tools.vitruv.change.composite.util.CompoundEChangeAssertHelper.* diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2ReplaceSingleValuedEReferenceTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2ReplaceSingleValuedEReferenceTest.xtend similarity index 98% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2ReplaceSingleValuedEReferenceTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2ReplaceSingleValuedEReferenceTest.xtend index 29aaeffd..f3a26038 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/reference/ChangeDescription2ReplaceSingleValuedEReferenceTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/reference/ChangeDescription2ReplaceSingleValuedEReferenceTest.xtend @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest import static allElementTypes.AllElementTypesPackage.Literals.* -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import static extension tools.vitruv.change.composite.util.AtomicEChangeAssertHelper.* import static extension tools.vitruv.change.composite.util.CompoundEChangeAssertHelper.* diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/rootobject/ChangeDescription2InsertRootEObjectTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/rootobject/ChangeDescription2InsertRootEObjectTest.xtend similarity index 95% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/rootobject/ChangeDescription2InsertRootEObjectTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/rootobject/ChangeDescription2InsertRootEObjectTest.xtend index 6794bd9c..df685c82 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/rootobject/ChangeDescription2InsertRootEObjectTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/rootobject/ChangeDescription2InsertRootEObjectTest.xtend @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest import static allElementTypes.AllElementTypesPackage.Literals.* -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import static extension tools.vitruv.change.composite.util.AtomicEChangeAssertHelper.* diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/rootobject/ChangeDescription2MoveRootTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/rootobject/ChangeDescription2MoveRootTest.xtend similarity index 94% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/rootobject/ChangeDescription2MoveRootTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/rootobject/ChangeDescription2MoveRootTest.xtend index bece6be5..a877e4de 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/rootobject/ChangeDescription2MoveRootTest.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/rootobject/ChangeDescription2MoveRootTest.xtend @@ -2,7 +2,7 @@ package tools.vitruv.change.composite.rootobject import org.junit.jupiter.api.Test import static extension tools.vitruv.change.composite.util.AtomicEChangeAssertHelper.* -import static extension tools.vitruv.testutils.metamodels.AllElementTypesCreators.* +import static extension tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.* import tools.vitruv.change.composite.ChangeDescription2ChangeTransformationTest class ChangeDescription2MoveRootTest extends ChangeDescription2ChangeTransformationTest { diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/rootobject/ChangeDescription2RemoveRootEObjectTest.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/rootobject/ChangeDescription2RemoveRootEObjectTest.xtend similarity index 100% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/rootobject/ChangeDescription2RemoveRootEObjectTest.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/rootobject/ChangeDescription2RemoveRootEObjectTest.xtend diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/util/AtomicEChangeAssertHelper.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/util/AtomicEChangeAssertHelper.xtend similarity index 100% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/util/AtomicEChangeAssertHelper.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/util/AtomicEChangeAssertHelper.xtend diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/util/ChangeAssertHelper.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/util/ChangeAssertHelper.xtend similarity index 98% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/util/ChangeAssertHelper.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/util/ChangeAssertHelper.xtend index e81bba3c..e0aef500 100644 --- a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/util/ChangeAssertHelper.xtend +++ b/composite/src/test/xtend/tools/vitruv/change/composite/util/ChangeAssertHelper.xtend @@ -20,7 +20,7 @@ import edu.kit.ipd.sdq.activextendannotations.Utility import static org.hamcrest.MatcherAssert.assertThat import static org.hamcrest.core.IsInstanceOf.instanceOf import static org.hamcrest.core.Is.is -import static tools.vitruv.testutils.matchers.ModelMatchers.equalsDeeply +import static tools.vitruv.change.testutils.matchers.ModelMatchers.equalsDeeply @Utility class ChangeAssertHelper { diff --git a/tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/util/CompoundEChangeAssertHelper.xtend b/composite/src/test/xtend/tools/vitruv/change/composite/util/CompoundEChangeAssertHelper.xtend similarity index 100% rename from tests/tools.vitruv.change.composite.tests/src/tools/vitruv/change/composite/util/CompoundEChangeAssertHelper.xtend rename to composite/src/test/xtend/tools/vitruv/change/composite/util/CompoundEChangeAssertHelper.xtend diff --git a/correspondence/.project b/correspondence/.project new file mode 100644 index 00000000..6ea697a5 --- /dev/null +++ b/correspondence/.project @@ -0,0 +1,29 @@ + + + tools.vitruv.change.correspondence + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + + + 1700568570084 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/bundles/tools.vitruv.change.correspondence/plugin.xml b/correspondence/plugin.xml similarity index 85% rename from bundles/tools.vitruv.change.correspondence/plugin.xml rename to correspondence/plugin.xml index 4554b572..0d2b167f 100644 --- a/bundles/tools.vitruv.change.correspondence/plugin.xml +++ b/correspondence/plugin.xml @@ -11,8 +11,7 @@ + genModel="src/main/ecore/correspondence.genmodel"/> - diff --git a/correspondence/pom.xml b/correspondence/pom.xml new file mode 100644 index 00000000..ea609905 --- /dev/null +++ b/correspondence/pom.xml @@ -0,0 +1,98 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.correspondence + + Vitruv Correspondence Metamodel + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + org.codehaus.mojo + exec-maven-plugin + + + maven-jar-plugin + + + ${project.basedir}/META-INF/MANIFEST.MF + + + + + + + + + + ${project.groupId} + tools.vitruv.change.testutils.core + ${project.version} + test + + + ${project.groupId} + tools.vitruv.change.testutils.metamodels + ${project.version} + test + + + + + com.google.guava + guava + + + log4j + log4j + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + 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.change.correspondence/metamodel/correspondence.ecore b/correspondence/src/main/ecore/correspondence.ecore similarity index 100% rename from bundles/tools.vitruv.change.correspondence/metamodel/correspondence.ecore rename to correspondence/src/main/ecore/correspondence.ecore diff --git a/bundles/tools.vitruv.change.correspondence/metamodel/correspondence.genmodel b/correspondence/src/main/ecore/correspondence.genmodel similarity index 92% rename from bundles/tools.vitruv.change.correspondence/metamodel/correspondence.genmodel rename to correspondence/src/main/ecore/correspondence.genmodel index b997b887..bb23d3b3 100644 --- a/bundles/tools.vitruv.change.correspondence/metamodel/correspondence.genmodel +++ b/correspondence/src/main/ecore/correspondence.genmodel @@ -1,6 +1,6 @@ diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/model/CorrespondenceModel.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/model/CorrespondenceModel.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/model/CorrespondenceModel.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/model/CorrespondenceModel.java diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/model/CorrespondenceModelFactory.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/model/CorrespondenceModelFactory.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/model/CorrespondenceModelFactory.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/model/CorrespondenceModelFactory.java diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/model/PersistableCorrespondenceModel.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/model/PersistableCorrespondenceModel.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/model/PersistableCorrespondenceModel.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/model/PersistableCorrespondenceModel.java diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/model/PersistableCorrespondenceModelImpl.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/model/PersistableCorrespondenceModelImpl.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/model/PersistableCorrespondenceModelImpl.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/model/PersistableCorrespondenceModelImpl.java diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/CorrespondenceModelView.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/view/CorrespondenceModelView.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/CorrespondenceModelView.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/view/CorrespondenceModelView.java diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/CorrespondenceModelViewFactory.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/view/CorrespondenceModelViewFactory.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/CorrespondenceModelViewFactory.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/view/CorrespondenceModelViewFactory.java diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/CorrespondenceModelViewImpl.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/view/CorrespondenceModelViewImpl.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/CorrespondenceModelViewImpl.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/view/CorrespondenceModelViewImpl.java diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/EditableCorrespondenceModelView.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/view/EditableCorrespondenceModelView.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/EditableCorrespondenceModelView.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/view/EditableCorrespondenceModelView.java diff --git a/bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/EditableCorrespondenceModelViewImpl.java b/correspondence/src/main/java/tools/vitruv/change/correspondence/view/EditableCorrespondenceModelViewImpl.java similarity index 100% rename from bundles/tools.vitruv.change.correspondence/src/tools/vitruv/change/correspondence/view/EditableCorrespondenceModelViewImpl.java rename to correspondence/src/main/java/tools/vitruv/change/correspondence/view/EditableCorrespondenceModelViewImpl.java diff --git a/tests/tools.vitruv.change.correspondence.tests/src/tools/vitruv/change/correspondence/CorrespondenceTest.xtend b/correspondence/src/test/xtend/tools/vitruv/change/correspondence/CorrespondenceTest.xtend similarity index 97% rename from tests/tools.vitruv.change.correspondence.tests/src/tools/vitruv/change/correspondence/CorrespondenceTest.xtend rename to correspondence/src/test/xtend/tools/vitruv/change/correspondence/CorrespondenceTest.xtend index 6b10b904..c7ae9917 100644 --- a/tests/tools.vitruv.change.correspondence.tests/src/tools/vitruv/change/correspondence/CorrespondenceTest.xtend +++ b/correspondence/src/test/xtend/tools/vitruv/change/correspondence/CorrespondenceTest.xtend @@ -14,10 +14,10 @@ import pcm_mockup.PInterface import pcm_mockup.Pcm_mockupFactory import pcm_mockup.Repository import tools.vitruv.change.correspondence.Correspondence -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 uml_mockup.Uml_mockupFactory diff --git a/correspondence/workflow/generate.mwe2 b/correspondence/workflow/generate.mwe2 new file mode 100644 index 00000000..dd5e0a6b --- /dev/null +++ b/correspondence/workflow/generate.mwe2 @@ -0,0 +1,21 @@ +module tools.vitruv.change.correspondence + +import org.eclipse.emf.mwe2.ecore.EcoreGenerator +import org.eclipse.emf.mwe.utils.StandaloneSetup + +var workspaceRoot = ".." + +Workflow { + + bean = StandaloneSetup { + scanClassPath = true + platformUri = workspaceRoot + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.correspondence/src/main/ecore/correspondence.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.correspondence/target/generated-sources/ecore" + generateCustomClasses = false + } + +} diff --git a/features/tools.vitruv.change.feature/.project b/features/tools.vitruv.change.feature/.project deleted file mode 100644 index 926fd609..00000000 --- a/features/tools.vitruv.change.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - tools.vitruv.change.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/tools.vitruv.change.feature/.settings/org.eclipse.core.resources.prefs b/features/tools.vitruv.change.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/features/tools.vitruv.change.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.change.feature/build.properties b/features/tools.vitruv.change.feature/build.properties deleted file mode 100644 index b3a611b5..00000000 --- a/features/tools.vitruv.change.feature/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties diff --git a/features/tools.vitruv.change.feature/feature.properties b/features/tools.vitruv.change.feature/feature.properties deleted file mode 100644 index c1536ff1..00000000 --- a/features/tools.vitruv.change.feature/feature.properties +++ /dev/null @@ -1,7 +0,0 @@ -featureName=Vitruv Change and Propagation Framework -description=The Vitruv change and propagation framework providing change propagation specification and execution capabilities -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.change.feature/feature.xml b/features/tools.vitruv.change.feature/feature.xml deleted file mode 100644 index 48d10a9f..00000000 --- a/features/tools.vitruv.change.feature/feature.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/features/tools.vitruv.testutils.changevisualization.feature/.project b/features/tools.vitruv.testutils.changevisualization.feature/.project deleted file mode 100644 index a6a702a0..00000000 --- a/features/tools.vitruv.testutils.changevisualization.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - tools.vitruv.testutils.changevisualization.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/tools.vitruv.testutils.changevisualization.feature/.settings/org.eclipse.core.resources.prefs b/features/tools.vitruv.testutils.changevisualization.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/features/tools.vitruv.testutils.changevisualization.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.changevisualization.feature/build.properties b/features/tools.vitruv.testutils.changevisualization.feature/build.properties deleted file mode 100644 index b3a611b5..00000000 --- a/features/tools.vitruv.testutils.changevisualization.feature/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties diff --git a/features/tools.vitruv.testutils.changevisualization.feature/feature.properties b/features/tools.vitruv.testutils.changevisualization.feature/feature.properties deleted file mode 100644 index c304939d..00000000 --- a/features/tools.vitruv.testutils.changevisualization.feature/feature.properties +++ /dev/null @@ -1,7 +0,0 @@ -featureName=Vitruv Test Utilities: Change Visualization -description=Utilities for visualization changes on models -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.changevisualization.feature/feature.xml b/features/tools.vitruv.testutils.changevisualization.feature/feature.xml deleted file mode 100644 index c8c8647e..00000000 --- a/features/tools.vitruv.testutils.changevisualization.feature/feature.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - diff --git a/features/tools.vitruv.testutils.feature/.project b/features/tools.vitruv.testutils.feature/.project deleted file mode 100644 index 3219ada1..00000000 --- a/features/tools.vitruv.testutils.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - tools.vitruv.testutils.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/tools.vitruv.testutils.feature/.settings/org.eclipse.core.resources.prefs b/features/tools.vitruv.testutils.feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/features/tools.vitruv.testutils.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.feature/build.properties b/features/tools.vitruv.testutils.feature/build.properties deleted file mode 100644 index b3a611b5..00000000 --- a/features/tools.vitruv.testutils.feature/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties diff --git a/features/tools.vitruv.testutils.feature/feature.properties b/features/tools.vitruv.testutils.feature/feature.properties deleted file mode 100644 index 2bf3c249..00000000 --- a/features/tools.vitruv.testutils.feature/feature.properties +++ /dev/null @@ -1,7 +0,0 @@ -featureName=Vitruv Test Utilities -description=Utilities for defining tests using the Vitruv change and propagation specifications -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.feature/feature.xml b/features/tools.vitruv.testutils.feature/feature.xml deleted file mode 100644 index 779c1dae..00000000 --- a/features/tools.vitruv.testutils.feature/feature.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/interaction.model/.project b/interaction.model/.project new file mode 100644 index 00000000..2fa3ba77 --- /dev/null +++ b/interaction.model/.project @@ -0,0 +1,29 @@ + + + tools.vitruv.change.interaction.model + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + + + 1700568570086 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/bundles/tools.vitruv.change.interaction.model/plugin.xml b/interaction.model/plugin.xml similarity index 85% rename from bundles/tools.vitruv.change.interaction.model/plugin.xml rename to interaction.model/plugin.xml index 21dce55d..35388b03 100644 --- a/bundles/tools.vitruv.change.interaction.model/plugin.xml +++ b/interaction.model/plugin.xml @@ -11,7 +11,7 @@ + genModel="src/main/ecore/interaction.genmodel"/> diff --git a/interaction.model/pom.xml b/interaction.model/pom.xml new file mode 100644 index 00000000..9aa9123c --- /dev/null +++ b/interaction.model/pom.xml @@ -0,0 +1,51 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.interaction.model + + Vitruv Change Interactions Metamodel + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.codehaus.mojo + exec-maven-plugin + + + maven-jar-plugin + + + ${project.basedir}/META-INF/MANIFEST.MF + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.change.interaction.model/metamodel/interaction.ecore b/interaction.model/src/main/ecore/interaction.ecore similarity index 100% rename from bundles/tools.vitruv.change.interaction.model/metamodel/interaction.ecore rename to interaction.model/src/main/ecore/interaction.ecore diff --git a/bundles/tools.vitruv.change.interaction.model/metamodel/interaction.genmodel b/interaction.model/src/main/ecore/interaction.genmodel similarity index 96% rename from bundles/tools.vitruv.change.interaction.model/metamodel/interaction.genmodel rename to interaction.model/src/main/ecore/interaction.genmodel index af2acb71..3a1864bb 100644 --- a/bundles/tools.vitruv.change.interaction.model/metamodel/interaction.genmodel +++ b/interaction.model/src/main/ecore/interaction.genmodel @@ -1,7 +1,7 @@ + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.interaction + + Vitruv Change Interactions + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.interaction.model + ${project.version} + + + + + com.google.guava + guava + + + log4j + log4j + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.platform + org.eclipse.jface + + + org.eclipse.platform + org.eclipse.swt.${swt.platform} + + + org.eclipse.platform + org.eclipse.ui.workbench + + + org.eclipse.xtend + org.eclipse.xtend.lib + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + sdq-commons + edu.kit.ipd.sdq.commons.util.java + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/UserInteractionListener.java b/interaction/src/main/java/tools/vitruv/change/interaction/UserInteractionListener.java similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/UserInteractionListener.java rename to interaction/src/main/java/tools/vitruv/change/interaction/UserInteractionListener.java diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/UserInteractor.java b/interaction/src/main/java/tools/vitruv/change/interaction/UserInteractor.java similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/UserInteractor.java rename to interaction/src/main/java/tools/vitruv/change/interaction/UserInteractor.java diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/InteractionResultProvider.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/InteractionResultProvider.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/InteractionResultProvider.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/InteractionResultProvider.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/InternalUserInteractor.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/InternalUserInteractor.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/InternalUserInteractor.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/InternalUserInteractor.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/PredefinedInteractionResultProvider.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/PredefinedInteractionResultProvider.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/PredefinedInteractionResultProvider.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/PredefinedInteractionResultProvider.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/UserInteractionFactory.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/UserInteractionFactory.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/UserInteractionFactory.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/UserInteractionFactory.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/UserInteractionOptions.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/UserInteractionOptions.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/UserInteractionOptions.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/UserInteractionOptions.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/ConfirmationInteractionBuilder.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/ConfirmationInteractionBuilder.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/ConfirmationInteractionBuilder.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/ConfirmationInteractionBuilder.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/InteractionBuilder.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/InteractionBuilder.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/InteractionBuilder.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/InteractionBuilder.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/MultipleChoiceSelectionInteractionBuilder.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/MultipleChoiceSelectionInteractionBuilder.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/MultipleChoiceSelectionInteractionBuilder.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/MultipleChoiceSelectionInteractionBuilder.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/NotificationInteractionBuilder.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/NotificationInteractionBuilder.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/NotificationInteractionBuilder.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/NotificationInteractionBuilder.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/TextInputInteractionBuilder.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/TextInputInteractionBuilder.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/TextInputInteractionBuilder.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/TextInputInteractionBuilder.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/BaseInteractionBuilder.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/BaseInteractionBuilder.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/BaseInteractionBuilder.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/BaseInteractionBuilder.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/ConfirmationInteractionBuilderImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/ConfirmationInteractionBuilderImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/ConfirmationInteractionBuilderImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/ConfirmationInteractionBuilderImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/MultipleChoiceMultiSelectionInteractionBuilderImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/MultipleChoiceMultiSelectionInteractionBuilderImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/MultipleChoiceMultiSelectionInteractionBuilderImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/MultipleChoiceMultiSelectionInteractionBuilderImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/MultipleChoiceSelectionInteractionBuilderBaseImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/MultipleChoiceSelectionInteractionBuilderBaseImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/MultipleChoiceSelectionInteractionBuilderBaseImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/MultipleChoiceSelectionInteractionBuilderBaseImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/MultipleChoiceSingleSelectionInteractionBuilderImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/MultipleChoiceSingleSelectionInteractionBuilderImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/MultipleChoiceSingleSelectionInteractionBuilderImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/MultipleChoiceSingleSelectionInteractionBuilderImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/NotificationInteractionBuilderImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/NotificationInteractionBuilderImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/NotificationInteractionBuilderImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/NotificationInteractionBuilderImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/TextInputInteractionBuilderImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/TextInputInteractionBuilderImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/builder/impl/TextInputInteractionBuilderImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/builder/impl/TextInputInteractionBuilderImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/BaseDialogWindow.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/BaseDialogWindow.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/BaseDialogWindow.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/BaseDialogWindow.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/ConfirmationDialogWindow.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/ConfirmationDialogWindow.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/ConfirmationDialogWindow.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/ConfirmationDialogWindow.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/MultipleChoiceSelectionDialogWindow.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/MultipleChoiceSelectionDialogWindow.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/MultipleChoiceSelectionDialogWindow.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/MultipleChoiceSelectionDialogWindow.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/NotificationDialogWindow.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/NotificationDialogWindow.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/NotificationDialogWindow.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/NotificationDialogWindow.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/TextInputDialogWindow.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/TextInputDialogWindow.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/dialogs/TextInputDialogWindow.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/dialogs/TextInputDialogWindow.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/DialogInteractionResultProviderImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/impl/DialogInteractionResultProviderImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/DialogInteractionResultProviderImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/impl/DialogInteractionResultProviderImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/PredefinedInteractionMatcher.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/impl/PredefinedInteractionMatcher.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/PredefinedInteractionMatcher.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/impl/PredefinedInteractionMatcher.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/PredefinedInteractionResultProviderImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/impl/PredefinedInteractionResultProviderImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/PredefinedInteractionResultProviderImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/impl/PredefinedInteractionResultProviderImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/ThinktimeSimulatingInteractionResultProvider.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/impl/ThinktimeSimulatingInteractionResultProvider.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/ThinktimeSimulatingInteractionResultProvider.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/impl/ThinktimeSimulatingInteractionResultProvider.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/UserInteractorImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/impl/UserInteractorImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/impl/UserInteractorImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/impl/UserInteractorImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/BaseInteraction.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/BaseInteraction.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/BaseInteraction.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/BaseInteraction.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/ConfirmationInteraction.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/ConfirmationInteraction.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/ConfirmationInteraction.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/ConfirmationInteraction.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/InteractionFactory.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/InteractionFactory.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/InteractionFactory.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/InteractionFactory.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/InteractionFactoryImpl.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/InteractionFactoryImpl.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/InteractionFactoryImpl.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/InteractionFactoryImpl.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/MultipleChoiceMultipleSelectionInteraction.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/MultipleChoiceMultipleSelectionInteraction.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/MultipleChoiceMultipleSelectionInteraction.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/MultipleChoiceMultipleSelectionInteraction.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/MultipleChoiceSelectionInteraction.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/MultipleChoiceSelectionInteraction.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/MultipleChoiceSelectionInteraction.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/MultipleChoiceSelectionInteraction.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/MultipleChoiceSingleSelectionInteraction.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/MultipleChoiceSingleSelectionInteraction.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/MultipleChoiceSingleSelectionInteraction.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/MultipleChoiceSingleSelectionInteraction.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/NotificationInteraction.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/NotificationInteraction.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/NotificationInteraction.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/NotificationInteraction.xtend diff --git a/bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/TextInputInteraction.xtend b/interaction/src/main/xtend/tools/vitruv/change/interaction/types/TextInputInteraction.xtend similarity index 100% rename from bundles/tools.vitruv.change.interaction/src/tools/vitruv/change/interaction/types/TextInputInteraction.xtend rename to interaction/src/main/xtend/tools/vitruv/change/interaction/types/TextInputInteraction.xtend diff --git a/pom.xml b/pom.xml index 3faf9ee7..b42c5ff6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,23 +1,289 @@ - - - 4.0.0 - - tools.vitruv - change-parent - 3.0.1-SNAPSHOT - releng/tools.vitruv.change.parent - - tools.vitruv - pom - - - releng/tools.vitruv.change.workflow - bundles - tests - features - releng/tools.vitruv.change.updatesite - - - + + + 4.0.0 + + + + tools.vitruv + parent + 3.0.0-SNAPSHOT + + + + tools.vitruv.change + 3.1.0-SNAPSHOT + pom + + Vitruv Change and Propagation Framework + The Vitruv change and propagation framework providing change propagation specification and execution capabilities + https://github.com/vitruv-tools/Vitruv-Change + + + + + Eclipse Public License - v 1.0 + https://www.eclipse.org/org/documents/epl-v10.php + + + + + scm:git:git://github.com/vitruv-tools/Vitruv-Change.git + scm:git:https://github.com/vitruv-tools/Vitruv-Change.git + https://github.com/vitruv-tools/Vitruv-Change/tree/main + + + + + atomic + changederivation + composite + correspondence + interaction + interaction.model + propagation + testutils + utils + + + + + 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} + + + + + + + + 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.change + 2.17.0 + + + org.eclipse.emf + org.eclipse.emf.ecore.xmi + 2.38.0 + + + org.eclipse.emf + org.eclipse.emf.edit + 2.22.0 + + + org.eclipse.platform + org.eclipse.core.resources + 3.21.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.jface + 3.35.0 + + + + org.eclipse.platform + org.eclipse.swt + + + + + org.eclipse.platform + org.eclipse.swt.${swt.platform} + 3.124.100 + + + + org.eclipse.platform + org.eclipse.swt + + + + + org.eclipse.platform + org.eclipse.ui.workbench + 3.133.0 + + + + org.eclipse.platform + org.eclipse.swt + + + + + org.eclipse.xtend + org.eclipse.xtend.lib + 2.36.0 + + + org.eclipse.xtend + org.eclipse.xtend.lib.macro + 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 + + + org.junit.platform + junit-platform-commons + 1.10.1 + + + org.slf4j + slf4j-api + 2.0.16 + + + sdq-commons + edu.kit.ipd.sdq.commons.util.eclipse + 2.3.0.202304271319 + + + + * + * + + + + + 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 + + + + \ No newline at end of file diff --git a/propagation/pom.xml b/propagation/pom.xml new file mode 100644 index 00000000..9b77ba85 --- /dev/null +++ b/propagation/pom.xml @@ -0,0 +1,99 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.propagation + + Vitruv Framework Change Processing + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + ${project.groupId} + tools.vitruv.change.composite + ${project.version} + + + ${project.groupId} + tools.vitruv.change.correspondence + ${project.version} + + + ${project.groupId} + tools.vitruv.change.interaction + ${project.version} + + + ${project.groupId} + tools.vitruv.change.interaction.model + ${project.version} + + + ${project.groupId} + tools.vitruv.change.utils + ${project.version} + + + + + com.google.guava + guava + + + log4j + log4j + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + org.eclipse.xtend + org.eclipse.xtend.lib + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + sdq-commons + edu.kit.ipd.sdq.commons.util.java + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationMode.java b/propagation/src/main/java/tools/vitruv/change/propagation/ChangePropagationMode.java similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationMode.java rename to propagation/src/main/java/tools/vitruv/change/propagation/ChangePropagationMode.java diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangeRecordingModelRepository.java b/propagation/src/main/java/tools/vitruv/change/propagation/ChangeRecordingModelRepository.java similarity index 97% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangeRecordingModelRepository.java rename to propagation/src/main/java/tools/vitruv/change/propagation/ChangeRecordingModelRepository.java index 77ee2e6f..b5b66bee 100644 --- a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangeRecordingModelRepository.java +++ b/propagation/src/main/java/tools/vitruv/change/propagation/ChangeRecordingModelRepository.java @@ -9,6 +9,7 @@ import tools.vitruv.change.correspondence.Correspondence; import tools.vitruv.change.correspondence.model.CorrespondenceModel; import tools.vitruv.change.correspondence.view.EditableCorrespondenceModelView; +import tools.vitruv.change.utils.ResourceAccess; public interface ChangeRecordingModelRepository extends ResourceAccess, AutoCloseable { /** diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/PersistableChangeRecordingModelRepository.java b/propagation/src/main/java/tools/vitruv/change/propagation/PersistableChangeRecordingModelRepository.java similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/PersistableChangeRecordingModelRepository.java rename to propagation/src/main/java/tools/vitruv/change/propagation/PersistableChangeRecordingModelRepository.java diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/DefaultChangeRecordingModelRepository.java b/propagation/src/main/java/tools/vitruv/change/propagation/impl/DefaultChangeRecordingModelRepository.java similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/DefaultChangeRecordingModelRepository.java rename to propagation/src/main/java/tools/vitruv/change/propagation/impl/DefaultChangeRecordingModelRepository.java diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/DefaultChangeableModelRepository.java b/propagation/src/main/java/tools/vitruv/change/propagation/impl/DefaultChangeableModelRepository.java similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/DefaultChangeableModelRepository.java rename to propagation/src/main/java/tools/vitruv/change/propagation/impl/DefaultChangeableModelRepository.java diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationObservable.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationObservable.xtend similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationObservable.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationObservable.xtend diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationObserver.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationObserver.xtend similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationObserver.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationObserver.xtend diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationSpecification.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationSpecification.xtend similarity index 98% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationSpecification.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationSpecification.xtend index 1e377d02..ed86703d 100644 --- a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationSpecification.xtend +++ b/propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationSpecification.xtend @@ -6,6 +6,7 @@ import tools.vitruv.change.composite.MetamodelDescriptor import tools.vitruv.change.correspondence.Correspondence import tools.vitruv.change.correspondence.view.EditableCorrespondenceModelView import tools.vitruv.change.interaction.UserInteractor +import tools.vitruv.change.utils.ResourceAccess /** * A specification of change propagation, which is able to process changes diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationSpecificationProvider.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationSpecificationProvider.xtend similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationSpecificationProvider.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationSpecificationProvider.xtend diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationSpecificationRepository.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationSpecificationRepository.xtend similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ChangePropagationSpecificationRepository.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/ChangePropagationSpecificationRepository.xtend diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/AbstractChangePropagationSpecification.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/impl/AbstractChangePropagationSpecification.xtend similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/AbstractChangePropagationSpecification.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/impl/AbstractChangePropagationSpecification.xtend diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/ChangePropagator.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/impl/ChangePropagator.xtend similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/ChangePropagator.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/impl/ChangePropagator.xtend diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/CompositeChangePropagationSpecification.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/impl/CompositeChangePropagationSpecification.xtend similarity index 98% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/CompositeChangePropagationSpecification.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/impl/CompositeChangePropagationSpecification.xtend index f5ca805e..373aff4e 100644 --- a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/CompositeChangePropagationSpecification.xtend +++ b/propagation/src/main/xtend/tools/vitruv/change/propagation/impl/CompositeChangePropagationSpecification.xtend @@ -7,7 +7,7 @@ import tools.vitruv.change.propagation.ChangePropagationSpecification import org.apache.log4j.Logger import tools.vitruv.change.propagation.ChangePropagationObserver import org.eclipse.emf.ecore.EObject -import tools.vitruv.change.propagation.ResourceAccess +import tools.vitruv.change.utils.ResourceAccess import org.eclipse.xtend.lib.annotations.Accessors import tools.vitruv.change.atomic.EChange import tools.vitruv.change.composite.MetamodelDescriptor diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/ResourceRegistrationAdapter.xtend b/propagation/src/main/xtend/tools/vitruv/change/propagation/impl/ResourceRegistrationAdapter.xtend similarity index 100% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/impl/ResourceRegistrationAdapter.xtend rename to propagation/src/main/xtend/tools/vitruv/change/propagation/impl/ResourceRegistrationAdapter.xtend diff --git a/README.md b/readme.md similarity index 85% rename from README.md rename to readme.md index 6339882d..af27855f 100644 --- a/README.md +++ b/readme.md @@ -11,7 +11,3 @@ For general information on Vitruvius, see our [GitHub Organisation](https://gith This project contains the underlying definition of changes in Ecore-based models and interfaces for specifying the propagation of changes between models to preserve their consistency with the central interface `ChangePropagationSpecification`, as well as an interface and a default implementation for orchestrating the execution of such specifications. In addition, interactions to involve the user into the change preservation process are provided. - -## Installation - -Vitruvius can be installed in Eclipse via the [nightly update site](https://vitruv.tools/updatesite/nightly). A wiki page provides [detailed instructions for using or extending Vitruvius or parts of it](https://github.com/vitruv-tools/.github/wiki/Getting-Started). diff --git a/releng/tools.vitruv.change.parent/pom.xml b/releng/tools.vitruv.change.parent/pom.xml deleted file mode 100644 index 984e7093..00000000 --- a/releng/tools.vitruv.change.parent/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - 4.0.0 - - tools.vitruv - parent - 2.1.5 - - change-parent - 3.0.1-SNAPSHOT - pom - - - - 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 - - - - - - - - diff --git a/releng/tools.vitruv.change.updatesite/.project b/releng/tools.vitruv.change.updatesite/.project deleted file mode 100644 index c942d6fa..00000000 --- a/releng/tools.vitruv.change.updatesite/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - tools.vitruv.change.updatesite - - - - - - - - diff --git a/releng/tools.vitruv.change.updatesite/.settings/org.eclipse.core.resources.prefs b/releng/tools.vitruv.change.updatesite/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/releng/tools.vitruv.change.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.change.updatesite/category.xml b/releng/tools.vitruv.change.updatesite/category.xml deleted file mode 100644 index 525f94d7..00000000 --- a/releng/tools.vitruv.change.updatesite/category.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - The Vitruv core for change specification and propagation - - - diff --git a/releng/tools.vitruv.change.updatesite/pom.xml b/releng/tools.vitruv.change.updatesite/pom.xml deleted file mode 100644 index 30f5a3ea..00000000 --- a/releng/tools.vitruv.change.updatesite/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - 4.0.0 - - tools.vitruv - change-parent - 3.0.1-SNAPSHOT - ../tools.vitruv.change.parent - - - tools.vitruv.change.updatesite - Vitruv Change Update Site - eclipse-repository - - \ No newline at end of file diff --git a/releng/tools.vitruv.change.workflow/.classpath b/releng/tools.vitruv.change.workflow/.classpath deleted file mode 100644 index c362d17e..00000000 --- a/releng/tools.vitruv.change.workflow/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/releng/tools.vitruv.change.workflow/.project b/releng/tools.vitruv.change.workflow/.project deleted file mode 100644 index 80804a9f..00000000 --- a/releng/tools.vitruv.change.workflow/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.workflow - - - - - - 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/releng/tools.vitruv.change.workflow/.settings/org.eclipse.core.resources.prefs b/releng/tools.vitruv.change.workflow/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/releng/tools.vitruv.change.workflow/.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.change.workflow/META-INF/MANIFEST.MF b/releng/tools.vitruv.change.workflow/META-INF/MANIFEST.MF deleted file mode 100644 index cfaa537c..00000000 --- a/releng/tools.vitruv.change.workflow/META-INF/MANIFEST.MF +++ /dev/null @@ -1,8 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Metamodel Generation Workflow -Bundle-SymbolicName: tools.vitruv.change.workflow -Bundle-Version: 3.0.1.qualifier -Bundle-Vendor: vitruv.tools -Automatic-Module-Name: tools.vitruv.change.workflow -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/releng/tools.vitruv.change.workflow/build.properties b/releng/tools.vitruv.change.workflow/build.properties deleted file mode 100644 index f9585985..00000000 --- a/releng/tools.vitruv.change.workflow/build.properties +++ /dev/null @@ -1,11 +0,0 @@ -bin.includes = META-INF/,\ - . -additional.bundles = org.eclipse.equinox.common,\ - org.eclipse.emf.mwe.utils,\ - org.eclipse.emf.mwe2.launch,\ - org.eclipse.emf.mwe2.lib,\ - org.eclipse.emf.mwe2.runtime,\ - org.apache.log4j,\ - org.apache.commons.logging,\ - org.eclipse.emf.codegen.ecore,\ - org.objectweb.asm \ No newline at end of file diff --git a/releng/tools.vitruv.change.workflow/pom.xml b/releng/tools.vitruv.change.workflow/pom.xml deleted file mode 100644 index 1d655508..00000000 --- a/releng/tools.vitruv.change.workflow/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - tools.vitruv - change-parent - 3.0.1-SNAPSHOT - ../tools.vitruv.change.parent - - tools.vitruv.change.workflow - Vitruv Metamodel Generation Workflow - eclipse-plugin - \ No newline at end of file diff --git a/releng/tools.vitruv.change.workflow/workflow/clean.mwe2 b/releng/tools.vitruv.change.workflow/workflow/clean.mwe2 deleted file mode 100644 index f7e3fb9d..00000000 --- a/releng/tools.vitruv.change.workflow/workflow/clean.mwe2 +++ /dev/null @@ -1,26 +0,0 @@ -module clean - -import org.eclipse.emf.mwe.utils.DirectoryCleaner - -// This variable is adapted by the Maven build -var workspaceRoot = "../../" - -Workflow { - - component = DirectoryCleaner { - directory = "${workspaceRoot}/bundles/tools.vitruv.change.atomic/src-gen" - } - - component = DirectoryCleaner { - directory = "${workspaceRoot}/bundles/tools.vitruv.change.interaction.model/src-gen" - } - - component = DirectoryCleaner { - directory = "${workspaceRoot}/bundles/tools.vitruv.change.correspondence/src-gen" - } - - component = DirectoryCleaner { - directory = "${workspaceRoot}/bundles/tools.vitruv.testutils.metamodels/src-gen" - } - -} diff --git a/releng/tools.vitruv.change.workflow/workflow/generate.mwe2 b/releng/tools.vitruv.change.workflow/workflow/generate.mwe2 deleted file mode 100644 index 58c85864..00000000 --- a/releng/tools.vitruv.change.workflow/workflow/generate.mwe2 +++ /dev/null @@ -1,84 +0,0 @@ -module generate - -import org.eclipse.emf.mwe2.ecore.EcoreGenerator -import org.eclipse.emf.mwe.utils.StandaloneSetup - -var testutilsMetamodelsPluginPath = "platform:/resource/tools.vitruv.testutils.metamodels" - -// This variable is adapted by the Maven build -var workspaceRoot = "../../" - -Workflow { - - bean = StandaloneSetup { - scanClassPath = true - platformUri = workspaceRoot - } - - component = EcoreGenerator { - srcPath = "platform:/resource/tools.vitruv.change.atomic/src-gen" - genModel = "platform:/resource/tools.vitruv.change.atomic/metamodel/atomicModelChange.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "platform:/resource/tools.vitruv.change.interaction.model/src-gen" - genModel = "platform:/resource/tools.vitruv.change.interaction.model/metamodel/interaction.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "platform:/resource/tools.vitruv.change.correspondence/src-gen" - genModel = "platform:/resource/tools.vitruv.change.correspondence/metamodel/correspondence.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "${testutilsMetamodelsPluginPath}/metamodels/src" - genModel = "${testutilsMetamodelsPluginPath}/metamodels/allElementTypes.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "${testutilsMetamodelsPluginPath}/src" - genModel = "${testutilsMetamodelsPluginPath}/metamodels/allElementTypes2.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "${testutilsMetamodelsPluginPath}/src" - genModel = "${testutilsMetamodelsPluginPath}/metamodels/attributeToStructureAttr.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "${testutilsMetamodelsPluginPath}/src" - genModel = "${testutilsMetamodelsPluginPath}/metamodels/attributeToStructureStruct1.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "${testutilsMetamodelsPluginPath}/src" - genModel = "${testutilsMetamodelsPluginPath}/metamodels/multicontainment_a.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "${testutilsMetamodelsPluginPath}/src" - genModel = "${testutilsMetamodelsPluginPath}/metamodels/multicontainment_b.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "${testutilsMetamodelsPluginPath}/src" - genModel = "${testutilsMetamodelsPluginPath}/metamodels/pcm_mockup.genmodel" - generateCustomClasses = false - } - - component = EcoreGenerator { - srcPath = "${testutilsMetamodelsPluginPath}/src" - genModel = "${testutilsMetamodelsPluginPath}/metamodels/uml_mockup.genmodel" - generateCustomClasses = false - } - -} diff --git a/tests/tools.vitruv.change.atomic.tests/.classpath b/tests/tools.vitruv.change.atomic.tests/.classpath deleted file mode 100644 index ef548cb9..00000000 --- a/tests/tools.vitruv.change.atomic.tests/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/tools.vitruv.change.atomic.tests/.project b/tests/tools.vitruv.change.atomic.tests/.project deleted file mode 100644 index 456bde1c..00000000 --- a/tests/tools.vitruv.change.atomic.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.atomic.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.change.atomic.tests/.settings/org.eclipse.core.resources.prefs b/tests/tools.vitruv.change.atomic.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/tests/tools.vitruv.change.atomic.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.change.atomic.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.change.atomic.tests/META-INF/MANIFEST.MF deleted file mode 100644 index a13a2721..00000000 --- a/tests/tools.vitruv.change.atomic.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Atomic Change Metamodel Tests -Bundle-SymbolicName: tools.vitruv.change.atomic.tests -Automatic-Module-Name: tools.vitruv.change.atomic.tests -Bundle-Version: 3.0.1.qualifier -Bundle-Vendor: vitruv.tools -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Fragment-Host: tools.vitruv.change.atomic -Import-Package: org.junit.jupiter.api, - org.junit.jupiter.api.extension, - org.junit.jupiter.api.function, - org.junit.jupiter.api.io, - org.junit.jupiter.params, - org.junit.jupiter.params.provider -Require-Bundle: org.eclipse.xtend.lib, - org.hamcrest.core, - tools.vitruv.testutils, - tools.vitruv.testutils.metamodels, - edu.kit.ipd.sdq.commons.util.java, - edu.kit.ipd.sdq.commons.util.emf diff --git a/tests/tools.vitruv.change.atomic.tests/build.properties b/tests/tools.vitruv.change.atomic.tests/build.properties deleted file mode 100644 index 6b66dfe8..00000000 --- a/tests/tools.vitruv.change.atomic.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . -additional.bundles = org.eclipse.emf.ecore.xmi diff --git a/tests/tools.vitruv.change.composite.tests/.classpath b/tests/tools.vitruv.change.composite.tests/.classpath deleted file mode 100644 index ef548cb9..00000000 --- a/tests/tools.vitruv.change.composite.tests/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/tools.vitruv.change.composite.tests/.project b/tests/tools.vitruv.change.composite.tests/.project deleted file mode 100644 index fc1a0b4f..00000000 --- a/tests/tools.vitruv.change.composite.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.composite.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.change.composite.tests/.settings/org.eclipse.core.resources.prefs b/tests/tools.vitruv.change.composite.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/tests/tools.vitruv.change.composite.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.change.composite.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.change.composite.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 93bacd35..00000000 --- a/tests/tools.vitruv.change.composite.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Composite Change Metamodel Tests -Bundle-SymbolicName: tools.vitruv.change.composite.tests -Automatic-Module-Name: tools.vitruv.change.composite.tests -Bundle-Version: 3.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Fragment-Host: tools.vitruv.change.composite -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.eclipse.xtend.lib, - org.hamcrest.core, - edu.kit.ipd.sdq.activextendannotations, - tools.vitruv.testutils, - tools.vitruv.testutils.metamodels -Bundle-Vendor: vitruv.tools diff --git a/tests/tools.vitruv.change.composite.tests/build.properties b/tests/tools.vitruv.change.composite.tests/build.properties deleted file mode 100644 index 6b66dfe8..00000000 --- a/tests/tools.vitruv.change.composite.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . -additional.bundles = org.eclipse.emf.ecore.xmi diff --git a/tests/tools.vitruv.change.correspondence.tests/.classpath b/tests/tools.vitruv.change.correspondence.tests/.classpath deleted file mode 100644 index 47de4eea..00000000 --- a/tests/tools.vitruv.change.correspondence.tests/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/tools.vitruv.change.correspondence.tests/.project b/tests/tools.vitruv.change.correspondence.tests/.project deleted file mode 100644 index 272c35d3..00000000 --- a/tests/tools.vitruv.change.correspondence.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.change.correspondence.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.change.correspondence.tests/.settings/org.eclipse.core.resources.prefs b/tests/tools.vitruv.change.correspondence.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/tests/tools.vitruv.change.correspondence.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.change.correspondence.tests/.settings/org.eclipse.jdt.core.prefs b/tests/tools.vitruv.change.correspondence.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index c9545f06..00000000 --- a/tests/tools.vitruv.change.correspondence.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 diff --git a/tests/tools.vitruv.change.correspondence.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.change.correspondence.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 6f88bf1f..00000000 --- a/tests/tools.vitruv.change.correspondence.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Correspondence Tests -Bundle-SymbolicName: tools.vitruv.change.correspondence.tests -Bundle-Version: 3.0.1.qualifier -Bundle-Vendor: vitruv.tools -Automatic-Module-Name: tools.vitruv.change.correspondence.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Fragment-Host: tools.vitruv.change.correspondence -Import-Package: org.junit.jupiter.api, - org.junit.jupiter.api.extension -Require-Bundle: com.google.guava, - org.eclipse.emf.ecore.xmi, - org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.lib, - org.eclipse.xtend.lib.macro, - edu.kit.ipd.sdq.commons.util.java, - tools.vitruv.testutils.metamodels, - tools.vitruv.testutils diff --git a/tests/tools.vitruv.change.correspondence.tests/build.properties b/tests/tools.vitruv.change.correspondence.tests/build.properties deleted file mode 100644 index 3c36c1d7..00000000 --- a/tests/tools.vitruv.change.correspondence.tests/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . diff --git a/tests/tools.vitruv.testutils.tests/.classpath b/tests/tools.vitruv.testutils.tests/.classpath deleted file mode 100644 index 58d1a70f..00000000 --- a/tests/tools.vitruv.testutils.tests/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/tools.vitruv.testutils.tests/.project b/tests/tools.vitruv.testutils.tests/.project deleted file mode 100644 index 00a5d7b9..00000000 --- a/tests/tools.vitruv.testutils.tests/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - tools.vitruv.testutils.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.testutils.tests/.settings/org.eclipse.core.resources.prefs b/tests/tools.vitruv.testutils.tests/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/tests/tools.vitruv.testutils.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.testutils.tests/META-INF/MANIFEST.MF b/tests/tools.vitruv.testutils.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 2727144e..00000000 --- a/tests/tools.vitruv.testutils.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,18 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Vitruv Test Utilities Tests -Bundle-SymbolicName: tools.vitruv.testutils.tests -Bundle-Version: 3.0.1.qualifier -Automatic-Module-Name: tools.vitruv.testutils.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Bundle-Vendor: vitruv.tools -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: tools.vitruv.testutils, - tools.vitruv.testutils.metamodels, - org.hamcrest.core, - com.google.guava, - org.eclipse.xtend.lib diff --git a/tests/tools.vitruv.testutils.tests/build.properties b/tests/tools.vitruv.testutils.tests/build.properties deleted file mode 100644 index 6b66dfe8..00000000 --- a/tests/tools.vitruv.testutils.tests/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/,\ - xtend-gen/ -output.. = target/classes/ -bin.includes = META-INF/,\ - . -additional.bundles = org.eclipse.emf.ecore.xmi diff --git a/testutils/changevisualization/pom.xml b/testutils/changevisualization/pom.xml new file mode 100644 index 00000000..1e504c5c --- /dev/null +++ b/testutils/changevisualization/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change.testutils + 3.1.0-SNAPSHOT + + + tools.vitruv.change.testutils.changevisualization + + Vitruv Change Visualization + Utilities for visualization changes on models + + + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + ${project.groupId} + tools.vitruv.change.composite + ${project.version} + + + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ChangeVisualizationDataModel.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ChangeVisualizationDataModel.java similarity index 90% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ChangeVisualizationDataModel.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ChangeVisualizationDataModel.java index bedb3d98..380ed209 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ChangeVisualizationDataModel.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ChangeVisualizationDataModel.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization; +package tools.vitruv.change.testutils.changevisualization; import java.io.File; import java.io.IOException; @@ -8,8 +8,8 @@ import java.util.Map; import tools.vitruv.change.composite.propagation.ChangeableModelRepository; -import tools.vitruv.testutils.changevisualization.common.ModelRepositoryChanges; -import tools.vitruv.testutils.changevisualization.persistence.ChangeDataSetPersistenceHelper; +import tools.vitruv.change.testutils.changevisualization.common.ModelRepositoryChanges; +import tools.vitruv.change.testutils.changevisualization.persistence.ChangeDataSetPersistenceHelper; /** * This class manages the data used for change visualization. diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ChangeVisualizationUI.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ChangeVisualizationUI.java similarity index 96% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ChangeVisualizationUI.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ChangeVisualizationUI.java index 6d0d9dc0..56e84dc4 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ChangeVisualizationUI.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ChangeVisualizationUI.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization; +package tools.vitruv.change.testutils.changevisualization; import java.awt.Component; import java.awt.Font; @@ -29,10 +29,10 @@ import javax.swing.event.ChangeListener; import javax.swing.filechooser.FileFilter; -import tools.vitruv.testutils.changevisualization.common.ModelRepositoryChanges; -import tools.vitruv.testutils.changevisualization.persistence.ChangeDataSetPersistenceHelper; -import tools.vitruv.testutils.changevisualization.ui.ChangesTab; -import tools.vitruv.testutils.changevisualization.ui.CloseableTabComponent; +import tools.vitruv.change.testutils.changevisualization.common.ModelRepositoryChanges; +import tools.vitruv.change.testutils.changevisualization.persistence.ChangeDataSetPersistenceHelper; +import tools.vitruv.change.testutils.changevisualization.ui.ChangesTab; +import tools.vitruv.change.testutils.changevisualization.ui.CloseableTabComponent; /** * The frame in which the change visualization is displayed. Also holds default fonts. diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/MonitoredRepositoryAddedListener.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/MonitoredRepositoryAddedListener.java similarity index 62% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/MonitoredRepositoryAddedListener.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/MonitoredRepositoryAddedListener.java index 0b8fbb9e..a5ad4f92 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/MonitoredRepositoryAddedListener.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/MonitoredRepositoryAddedListener.java @@ -1,6 +1,6 @@ -package tools.vitruv.testutils.changevisualization; +package tools.vitruv.change.testutils.changevisualization; -import tools.vitruv.testutils.changevisualization.common.ModelRepositoryChanges; +import tools.vitruv.change.testutils.changevisualization.common.ModelRepositoryChanges; public interface MonitoredRepositoryAddedListener { public void addedMonitoredRepository(ModelRepositoryChanges newModelRepositoryChanges); diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/StandaloneChangeVisualization.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/StandaloneChangeVisualization.java similarity index 85% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/StandaloneChangeVisualization.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/StandaloneChangeVisualization.java index 0005d5f4..778681cc 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/StandaloneChangeVisualization.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/StandaloneChangeVisualization.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization; +package tools.vitruv.change.testutils.changevisualization; public final class StandaloneChangeVisualization { public StandaloneChangeVisualization() { diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ChangeDataSet.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ChangeDataSet.java similarity index 98% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ChangeDataSet.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ChangeDataSet.java index ddb6275d..cbf6898b 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ChangeDataSet.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ChangeDataSet.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.common; +package tools.vitruv.change.testutils.changevisualization.common; import java.io.Serializable; import java.text.SimpleDateFormat; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ChangeDataSetGenerationListener.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ChangeDataSetGenerationListener.java similarity index 64% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ChangeDataSetGenerationListener.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ChangeDataSetGenerationListener.java index 56c18632..2aca8618 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ChangeDataSetGenerationListener.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ChangeDataSetGenerationListener.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.common; +package tools.vitruv.change.testutils.changevisualization.common; public interface ChangeDataSetGenerationListener { public void changeDataSetGenerated(ChangeDataSet changeDataSet); diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ModelRepositoryChanges.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ModelRepositoryChanges.java similarity index 94% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ModelRepositoryChanges.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ModelRepositoryChanges.java index 83ee1a9f..bac23863 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/common/ModelRepositoryChanges.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/common/ModelRepositoryChanges.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.common; +package tools.vitruv.change.testutils.changevisualization.common; import java.io.Serializable; import java.util.ArrayList; @@ -11,7 +11,7 @@ import tools.vitruv.change.composite.description.VitruviusChange; import tools.vitruv.change.composite.propagation.ChangePropagationListener; import tools.vitruv.change.composite.propagation.ChangeableModelRepository; -import tools.vitruv.testutils.changevisualization.tree.decoder.TreeChangeDataSetDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.TreeChangeDataSetDecoder; public class ModelRepositoryChanges implements ChangePropagationListener, Serializable { private static final long serialVersionUID = 4992108309750505218L; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/persistence/ChangeDataSetPersistenceHelper.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/persistence/ChangeDataSetPersistenceHelper.java similarity index 94% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/persistence/ChangeDataSetPersistenceHelper.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/persistence/ChangeDataSetPersistenceHelper.java index b8fd9fa5..dca26986 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/persistence/ChangeDataSetPersistenceHelper.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/persistence/ChangeDataSetPersistenceHelper.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.persistence; +package tools.vitruv.change.testutils.changevisualization.persistence; import java.io.File; import java.io.FileInputStream; @@ -11,7 +11,7 @@ import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import tools.vitruv.testutils.changevisualization.common.ModelRepositoryChanges; +import tools.vitruv.change.testutils.changevisualization.common.ModelRepositoryChanges; /** * This class helps to store and load {@link ModelRepositoryChanges} diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeNode.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeNode.java similarity index 96% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeNode.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeNode.java index af6798b6..13755ebc 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeNode.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeNode.java @@ -1,9 +1,9 @@ -package tools.vitruv.testutils.changevisualization.tree; +package tools.vitruv.change.testutils.changevisualization.tree; import java.awt.Component; import java.io.Serializable; -import tools.vitruv.testutils.changevisualization.ui.LabelValuePanel; +import tools.vitruv.change.testutils.changevisualization.ui.LabelValuePanel; /** * Collects all information regarding EChange-Nodes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeTree.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeTree.java similarity index 97% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeTree.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeTree.java index d5e06ae1..420c2af9 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeTree.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeTree.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree; +package tools.vitruv.change.testutils.changevisualization.tree; import java.awt.BorderLayout; import java.awt.Component; @@ -31,10 +31,10 @@ import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import tools.vitruv.testutils.changevisualization.ChangeVisualizationUI; -import tools.vitruv.testutils.changevisualization.common.ChangeDataSet; -import tools.vitruv.testutils.changevisualization.ui.ChangeComponent; -import tools.vitruv.testutils.changevisualization.ui.LabelValuePanel; +import tools.vitruv.change.testutils.changevisualization.ChangeVisualizationUI; +import tools.vitruv.change.testutils.changevisualization.common.ChangeDataSet; +import tools.vitruv.change.testutils.changevisualization.ui.ChangeComponent; +import tools.vitruv.change.testutils.changevisualization.ui.LabelValuePanel; /** * A ChangeTree visualizes propagation results in the form of a tree. diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeTreeNodeRenderer.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeTreeNodeRenderer.java similarity index 98% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeTreeNodeRenderer.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeTreeNodeRenderer.java index e979ccb8..1e7431e3 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/ChangeTreeNodeRenderer.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/ChangeTreeNodeRenderer.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree; +package tools.vitruv.change.testutils.changevisualization.tree; import java.awt.Color; import java.awt.Component; @@ -14,7 +14,7 @@ import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.TreeNode; -import tools.vitruv.testutils.changevisualization.ui.ChangesTab; +import tools.vitruv.change.testutils.changevisualization.ui.ChangesTab; /** * Used by the {@link ChangeTree} to visualize individual nodes. diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/FeatureNode.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/FeatureNode.java similarity index 97% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/FeatureNode.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/FeatureNode.java index 4bb182b2..beb468e5 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/FeatureNode.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/FeatureNode.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree; +package tools.vitruv.change.testutils.changevisualization.tree; import java.awt.Component; import java.io.Serializable; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TabHighlighting.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TabHighlighting.java similarity index 65% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TabHighlighting.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TabHighlighting.java index 5ae4873d..cfd18101 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TabHighlighting.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TabHighlighting.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree; +package tools.vitruv.change.testutils.changevisualization.tree; public interface TabHighlighting { public void setHighlightID(String highlightID); diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TreeChangeDataSet.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TreeChangeDataSet.java similarity index 97% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TreeChangeDataSet.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TreeChangeDataSet.java index 4b790bb4..36a53bd4 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TreeChangeDataSet.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TreeChangeDataSet.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree; +package tools.vitruv.change.testutils.changevisualization.tree; import java.io.Serializable; import java.util.Hashtable; @@ -13,7 +13,7 @@ import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import tools.vitruv.testutils.changevisualization.common.ChangeDataSet; +import tools.vitruv.change.testutils.changevisualization.common.ChangeDataSet; /** * TreeChangeDataSet holds the data necessary for visualization diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TreeMouseListener.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TreeMouseListener.java similarity index 97% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TreeMouseListener.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TreeMouseListener.java index 6a17efb8..ebbc370e 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/TreeMouseListener.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/TreeMouseListener.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree; +package tools.vitruv.change.testutils.changevisualization.tree; import java.awt.Point; import java.awt.Toolkit; @@ -17,7 +17,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; -import tools.vitruv.testutils.changevisualization.ChangeVisualizationUI; +import tools.vitruv.change.testutils.changevisualization.ChangeVisualizationUI; /** * This listener is used to react to mouse events for a {@link ChangeTree} diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/ChangeNodeDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/ChangeNodeDecoder.java similarity index 77% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/ChangeNodeDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/ChangeNodeDecoder.java index 4a6c673e..9aef8088 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/ChangeNodeDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/ChangeNodeDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder; +package tools.vitruv.change.testutils.changevisualization.tree.decoder; import java.util.Hashtable; import java.util.Map; @@ -6,20 +6,20 @@ import org.eclipse.emf.ecore.EObject; import tools.vitruv.change.atomic.EChange; -import tools.vitruv.testutils.changevisualization.tree.ChangeNode; -import tools.vitruv.testutils.changevisualization.tree.ChangeNode.EChangeClass; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.ChangeDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.CreateEObjectDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.DeleteEObjectDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.InsertEAttributeValueDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.InsertEReferenceDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.InsertRootEObjectDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.RemoveEAttributeValueDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.RemoveEReferenceDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.RemoveRootEObjectDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.ReplaceSingleValuedEAttributeDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.echange.ReplaceSingleValuedEReferenceDecoder; -import tools.vitruv.testutils.changevisualization.utils.ModelHelper; +import tools.vitruv.change.testutils.changevisualization.tree.ChangeNode; +import tools.vitruv.change.testutils.changevisualization.tree.ChangeNode.EChangeClass; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.ChangeDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.CreateEObjectDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.DeleteEObjectDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.InsertEAttributeValueDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.InsertEReferenceDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.InsertRootEObjectDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.RemoveEAttributeValueDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.RemoveEReferenceDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.RemoveRootEObjectDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.ReplaceSingleValuedEAttributeDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.echange.ReplaceSingleValuedEReferenceDecoder; +import tools.vitruv.change.testutils.changevisualization.utils.ModelHelper; /** * Helper class to generate {@link ChangeNode}s from eChanges. Central place to register new {@link ChangeDecoder} diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/FeatureNodeDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/FeatureNodeDecoder.java similarity index 92% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/FeatureNodeDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/FeatureNodeDecoder.java index effc9e2b..b0a4e5db 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/FeatureNodeDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/FeatureNodeDecoder.java @@ -1,7 +1,7 @@ /** * */ -package tools.vitruv.testutils.changevisualization.tree.decoder; +package tools.vitruv.change.testutils.changevisualization.tree.decoder; import java.awt.Component; import java.util.Comparator; @@ -12,10 +12,10 @@ import org.eclipse.emf.ecore.EStructuralFeature; -import tools.vitruv.testutils.changevisualization.tree.FeatureNode; -import tools.vitruv.testutils.changevisualization.tree.decoder.feature.EObjectFeatureDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.feature.FeatureDecoder; -import tools.vitruv.testutils.changevisualization.tree.decoder.feature.ObjectFeatureDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.FeatureNode; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.feature.EObjectFeatureDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.feature.FeatureDecoder; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.feature.ObjectFeatureDecoder; /** * Helper class to generate {@link FeatureNode}s from eChanges. Central place to register new {@link FeatureDecoder} diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/TreeChangeDataSetDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/TreeChangeDataSetDecoder.java similarity index 95% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/TreeChangeDataSetDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/TreeChangeDataSetDecoder.java index 8e20e758..fde045cf 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/TreeChangeDataSetDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/TreeChangeDataSetDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder; +package tools.vitruv.change.testutils.changevisualization.tree.decoder; import java.util.Hashtable; import java.util.List; @@ -14,11 +14,11 @@ import tools.vitruv.change.atomic.EChange; import tools.vitruv.change.composite.description.PropagatedChange; import tools.vitruv.change.composite.description.VitruviusChange; -import tools.vitruv.testutils.changevisualization.common.ChangeDataSet; -import tools.vitruv.testutils.changevisualization.common.ChangeDataSet.ChangeType; -import tools.vitruv.testutils.changevisualization.tree.TreeChangeDataSet; -import tools.vitruv.testutils.changevisualization.tree.decoder.feature.MultipleFeatureProcessor; -import tools.vitruv.testutils.changevisualization.tree.decoder.feature.OldValueNewValueProcessor; +import tools.vitruv.change.testutils.changevisualization.common.ChangeDataSet; +import tools.vitruv.change.testutils.changevisualization.common.ChangeDataSet.ChangeType; +import tools.vitruv.change.testutils.changevisualization.tree.TreeChangeDataSet; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.feature.MultipleFeatureProcessor; +import tools.vitruv.change.testutils.changevisualization.tree.decoder.feature.OldValueNewValueProcessor; /** * Helper class to generate {@link TreeChangeDataSets}s from propagation results and diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/AbstractChangeDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/AbstractChangeDecoder.java similarity index 97% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/AbstractChangeDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/AbstractChangeDecoder.java index 0e38fd3a..e8c575fb 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/AbstractChangeDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/AbstractChangeDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; import java.util.Hashtable; import java.util.List; @@ -9,7 +9,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import tools.vitruv.change.atomic.EChange; -import tools.vitruv.testutils.changevisualization.utils.ModelHelper; +import tools.vitruv.change.testutils.changevisualization.utils.ModelHelper; /** * A basic change decoder which ensures that only change events of a given eClassName are processed diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ChangeDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ChangeDecoder.java similarity index 88% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ChangeDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ChangeDecoder.java index 46a43cc8..84fca86f 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ChangeDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ChangeDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; import tools.vitruv.change.atomic.EChange; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/CreateEObjectDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/CreateEObjectDecoder.java similarity index 73% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/CreateEObjectDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/CreateEObjectDecoder.java index 6afb9a65..5f9acaff 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/CreateEObjectDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/CreateEObjectDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for create eObject changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/DeleteEObjectDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/DeleteEObjectDecoder.java similarity index 74% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/DeleteEObjectDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/DeleteEObjectDecoder.java index af3c72b5..29180289 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/DeleteEObjectDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/DeleteEObjectDecoder.java @@ -1,7 +1,7 @@ /** * */ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for deleteEObject changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/EObjectNameDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/EObjectNameDecoder.java similarity index 95% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/EObjectNameDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/EObjectNameDecoder.java index e221bf53..1f3f6d90 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/EObjectNameDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/EObjectNameDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; import java.util.Map; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertEAttributeValueDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertEAttributeValueDecoder.java similarity index 77% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertEAttributeValueDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertEAttributeValueDecoder.java index 1a33eb26..223bf46f 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertEAttributeValueDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertEAttributeValueDecoder.java @@ -1,7 +1,7 @@ /** * */ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for insertEAttribute value changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertEReferenceDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertEReferenceDecoder.java similarity index 74% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertEReferenceDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertEReferenceDecoder.java index 93f21209..be99f298 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertEReferenceDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertEReferenceDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for insertEReference changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertRemoveDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertRemoveDecoder.java similarity index 96% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertRemoveDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertRemoveDecoder.java index 3a14fbb7..c5d8aeb2 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertRemoveDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertRemoveDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; import java.util.Map; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertRootEObjectDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertRootEObjectDecoder.java similarity index 74% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertRootEObjectDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertRootEObjectDecoder.java index 9418c208..fe3ba311 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/InsertRootEObjectDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/InsertRootEObjectDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for insertRootEObject changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveEAttributeValueDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveEAttributeValueDecoder.java similarity index 75% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveEAttributeValueDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveEAttributeValueDecoder.java index e087ff15..5f615a53 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveEAttributeValueDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveEAttributeValueDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for removeEAttribute changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveEReferenceDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveEReferenceDecoder.java similarity index 74% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveEReferenceDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveEReferenceDecoder.java index 49b24152..0cea40b5 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveEReferenceDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveEReferenceDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for removeEReference changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveRootEObjectDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveRootEObjectDecoder.java similarity index 74% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveRootEObjectDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveRootEObjectDecoder.java index 31d64230..9bdcfce1 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/RemoveRootEObjectDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/RemoveRootEObjectDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for removeRootEObject changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceChangeDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceChangeDecoder.java similarity index 96% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceChangeDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceChangeDecoder.java index 9c978e27..58ae34f2 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceChangeDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceChangeDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; import java.util.Map; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEAttributeDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEAttributeDecoder.java similarity index 81% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEAttributeDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEAttributeDecoder.java index aeac4a42..8d5808e7 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEAttributeDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEAttributeDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * A ChangeDecoder for ReplaceSingleValuedEAttribute - changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEReferenceDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEReferenceDecoder.java similarity index 77% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEReferenceDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEReferenceDecoder.java index 150d7599..0d3cba54 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEReferenceDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/echange/ReplaceSingleValuedEReferenceDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.echange; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.echange; /** * Decoder for replaceSingleValuedEReference changes diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/EObjectFeatureDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/EObjectFeatureDecoder.java similarity index 92% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/EObjectFeatureDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/EObjectFeatureDecoder.java index 371a8b44..42c87561 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/EObjectFeatureDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/EObjectFeatureDecoder.java @@ -1,10 +1,10 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.feature; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.feature; import java.awt.Component; import org.eclipse.emf.ecore.EObject; -import tools.vitruv.testutils.changevisualization.utils.ModelHelper; +import tools.vitruv.change.testutils.changevisualization.utils.ModelHelper; /** * Feature decoder suitable for EObjects. It creates a detailedArray as detailed visualization. diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/FeatureDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/FeatureDecoder.java similarity index 95% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/FeatureDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/FeatureDecoder.java index ef4f7441..91a3c021 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/FeatureDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/FeatureDecoder.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.feature; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.feature; import java.awt.Component; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/MultipleFeatureProcessor.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/MultipleFeatureProcessor.java similarity index 97% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/MultipleFeatureProcessor.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/MultipleFeatureProcessor.java index 0f7b1d09..b8ec48b8 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/MultipleFeatureProcessor.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/MultipleFeatureProcessor.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.feature; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.feature; import java.util.List; import java.util.Map; @@ -8,7 +8,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import tools.vitruv.change.atomic.EChange; -import tools.vitruv.testutils.changevisualization.tree.FeatureNode; +import tools.vitruv.change.testutils.changevisualization.tree.FeatureNode; /** * MultipleFeatureProcessors are used to process more than one structural feature at once. diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/ObjectFeatureDecoder.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/ObjectFeatureDecoder.java similarity index 91% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/ObjectFeatureDecoder.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/ObjectFeatureDecoder.java index 61aeb8cd..667491a5 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/ObjectFeatureDecoder.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/ObjectFeatureDecoder.java @@ -1,7 +1,7 @@ /** * */ -package tools.vitruv.testutils.changevisualization.tree.decoder.feature; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.feature; import java.awt.Component; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/OldValueNewValueProcessor.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/OldValueNewValueProcessor.java similarity index 91% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/OldValueNewValueProcessor.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/OldValueNewValueProcessor.java index 19746f85..9a063244 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/tree/decoder/feature/OldValueNewValueProcessor.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/tree/decoder/feature/OldValueNewValueProcessor.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.tree.decoder.feature; +package tools.vitruv.change.testutils.changevisualization.tree.decoder.feature; import java.util.List; import java.util.Map; @@ -7,7 +7,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import tools.vitruv.change.atomic.EChange; -import tools.vitruv.testutils.changevisualization.tree.FeatureNode; +import tools.vitruv.change.testutils.changevisualization.tree.FeatureNode; /** * This multiple feature processors replaces pairs of oldValue and newValue structural features. diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangeComponent.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangeComponent.java similarity index 90% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangeComponent.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangeComponent.java index 70efc96e..a24c2a66 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangeComponent.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangeComponent.java @@ -1,11 +1,11 @@ -package tools.vitruv.testutils.changevisualization.ui; +package tools.vitruv.change.testutils.changevisualization.ui; import java.awt.LayoutManager; import java.util.List; import javax.swing.JPanel; -import tools.vitruv.testutils.changevisualization.common.ChangeDataSet; +import tools.vitruv.change.testutils.changevisualization.common.ChangeDataSet; /** * Base class for different visualization implementations. If additional implementation are needed, diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangeDataSetTable.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangeDataSetTable.java similarity index 97% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangeDataSetTable.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangeDataSetTable.java index f90dcf1b..6699fade 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangeDataSetTable.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangeDataSetTable.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.ui; +package tools.vitruv.change.testutils.changevisualization.ui; import java.awt.BorderLayout; import java.awt.Component; @@ -19,8 +19,8 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; -import tools.vitruv.testutils.changevisualization.ChangeVisualizationUI; -import tools.vitruv.testutils.changevisualization.common.ChangeDataSet; +import tools.vitruv.change.testutils.changevisualization.ChangeVisualizationUI; +import tools.vitruv.change.testutils.changevisualization.common.ChangeDataSet; /** * A ChangeDataSetTable displays all different ChangeDataSets of a given ChangesTab in a JTable diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangesTab.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangesTab.java similarity index 87% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangesTab.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangesTab.java index b30bbfb8..e473d18a 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/ChangesTab.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/ChangesTab.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.ui; +package tools.vitruv.change.testutils.changevisualization.ui; import java.awt.BorderLayout; import java.awt.Color; @@ -10,12 +10,12 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import tools.vitruv.testutils.changevisualization.ChangeVisualizationUI; -import tools.vitruv.testutils.changevisualization.common.ChangeDataSet; -import tools.vitruv.testutils.changevisualization.common.ChangeDataSetGenerationListener; -import tools.vitruv.testutils.changevisualization.common.ModelRepositoryChanges; -import tools.vitruv.testutils.changevisualization.tree.ChangeTree; -import tools.vitruv.testutils.changevisualization.tree.TabHighlighting; +import tools.vitruv.change.testutils.changevisualization.ChangeVisualizationUI; +import tools.vitruv.change.testutils.changevisualization.common.ChangeDataSet; +import tools.vitruv.change.testutils.changevisualization.common.ChangeDataSetGenerationListener; +import tools.vitruv.change.testutils.changevisualization.common.ModelRepositoryChanges; +import tools.vitruv.change.testutils.changevisualization.tree.ChangeTree; +import tools.vitruv.change.testutils.changevisualization.tree.TabHighlighting; /** * The changes tab is responsible for displaying the tab of a single model. It storage the added changeDataSets, holds diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/CloseableTabComponent.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/CloseableTabComponent.java similarity index 98% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/CloseableTabComponent.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/CloseableTabComponent.java index ea16c2c5..6b865d9d 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/CloseableTabComponent.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/CloseableTabComponent.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.ui; +package tools.vitruv.change.testutils.changevisualization.ui; import java.awt.BasicStroke; import java.awt.Color; diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/LabelValuePanel.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/LabelValuePanel.java similarity index 96% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/LabelValuePanel.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/LabelValuePanel.java index 26dd9bff..11ac8fd2 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/LabelValuePanel.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/LabelValuePanel.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.ui; +package tools.vitruv.change.testutils.changevisualization.ui; import java.awt.BorderLayout; import java.awt.GridLayout; @@ -14,7 +14,7 @@ import javax.swing.JTextField; import javax.swing.border.EmptyBorder; -import tools.vitruv.testutils.changevisualization.ChangeVisualizationUI; +import tools.vitruv.change.testutils.changevisualization.ChangeVisualizationUI; /** * Displays a String array in a scrollable UI. The string array must be of size [x][2]. diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/SelectionDialog.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/SelectionDialog.java similarity index 95% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/SelectionDialog.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/SelectionDialog.java index 83f50f61..dceb090b 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/ui/SelectionDialog.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/ui/SelectionDialog.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.ui; +package tools.vitruv.change.testutils.changevisualization.ui; import java.awt.GridLayout; import java.awt.event.ActionEvent; @@ -10,7 +10,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; -import tools.vitruv.testutils.changevisualization.ChangeVisualizationUI; +import tools.vitruv.change.testutils.changevisualization.ChangeVisualizationUI; /** * A dialog displaying some information the user can select diff --git a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/utils/ModelHelper.java b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/utils/ModelHelper.java similarity index 98% rename from bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/utils/ModelHelper.java rename to testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/utils/ModelHelper.java index da0d69ee..a91c0837 100644 --- a/bundles/tools.vitruv.testutils.changevisualization/src/tools/vitruv/testutils/changevisualization/utils/ModelHelper.java +++ b/testutils/changevisualization/src/main/java/tools/vitruv/change/testutils/changevisualization/utils/ModelHelper.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.changevisualization.utils; +package tools.vitruv.change.testutils.changevisualization.utils; import java.util.List; import java.util.Vector; diff --git a/testutils/core/pom.xml b/testutils/core/pom.xml new file mode 100644 index 00000000..916bc8ea --- /dev/null +++ b/testutils/core/pom.xml @@ -0,0 +1,134 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change.testutils + 3.1.0-SNAPSHOT + + + tools.vitruv.change.testutils.core + + Vitruv Change Test Utilities Core + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.utils + ${project.version} + + + + + ${project.groupId} + tools.vitruv.change.testutils.metamodels + ${project.version} + test + + + + + com.google.guava + guava + + + emf-compare + org.eclipse.emf.compare + + + log4j + log4j + + + org.eclipse.emf + org.eclipse.emf.common + + + org.eclipse.emf + org.eclipse.emf.ecore + + + + org.eclipse.emf + org.eclipse.emf.ecore.xmi + + + org.eclipse.platform + org.eclipse.core.resources + + + org.eclipse.platform + org.eclipse.core.runtime + + + org.eclipse.platform + org.eclipse.equinox.common + + + org.eclipse.xtend + org.eclipse.xtend.lib + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + org.hamcrest + hamcrest + + + org.junit.jupiter + junit-jupiter-api + + + org.junit.platform + junit-platform-commons + + + org.slf4j + slf4j-api + + + sdq-commons + edu.kit.ipd.sdq.commons.util.eclipse + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + sdq-commons + edu.kit.ipd.sdq.commons.util.java + + + xannotations + edu.kit.ipd.sdq.activextendannotations + + + + + org.junit.jupiter + junit-jupiter-params + test + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/Capture.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/Capture.xtend similarity index 97% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/Capture.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/Capture.xtend index 46449e31..257bfa2b 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/Capture.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/Capture.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.change.testutils import static com.google.common.base.Preconditions.checkState import org.eclipse.xtend.lib.annotations.Accessors diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/DisableAutoBuild.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/DisableAutoBuild.xtend similarity index 97% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/DisableAutoBuild.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/DisableAutoBuild.xtend index 28d675b4..06467d90 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/DisableAutoBuild.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/DisableAutoBuild.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.change.testutils import org.junit.jupiter.api.^extension.BeforeAllCallback import org.junit.jupiter.api.^extension.BeforeEachCallback diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/RegisterMetamodelsInStandalone.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/RegisterMetamodelsInStandalone.xtend similarity index 92% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/RegisterMetamodelsInStandalone.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/RegisterMetamodelsInStandalone.xtend index dba25fd5..92d9a510 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/RegisterMetamodelsInStandalone.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/RegisterMetamodelsInStandalone.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.change.testutils import org.junit.jupiter.api.^extension.BeforeAllCallback import org.junit.jupiter.api.^extension.ExtensionContext diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLauncher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestLauncher.xtend similarity index 93% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLauncher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestLauncher.xtend index 9d29f579..4ec4a9f3 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLauncher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestLauncher.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.change.testutils import edu.kit.ipd.sdq.activextendannotations.Lazy diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLogging.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestLogging.xtend similarity index 97% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLogging.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestLogging.xtend index 4a827fbc..68aa6728 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestLogging.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestLogging.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.change.testutils import edu.kit.ipd.sdq.activextendannotations.Lazy import org.apache.log4j.ConsoleAppender diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestProject.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestProject.xtend similarity index 81% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestProject.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestProject.xtend index a54f2e2c..e6b045c5 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestProject.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestProject.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.change.testutils import java.lang.annotation.Target import java.lang.annotation.Retention diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestProjectManager.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestProjectManager.xtend similarity index 98% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestProjectManager.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestProjectManager.xtend index 43850ec1..7c635641 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestProjectManager.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/TestProjectManager.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.change.testutils import java.io.IOException import java.nio.file.DirectoryNotEmptyException @@ -27,7 +27,7 @@ import static com.google.common.base.Preconditions.checkArgument import java.nio.file.NoSuchFileException import java.util.stream.Stream import org.eclipse.core.runtime.Platform -import static extension tools.vitruv.change.propagation.ProjectMarker.markAsProjectRootFolder +import static extension tools.vitruv.change.utils.ProjectMarker.markAsProjectRootFolder /** * Extension managing the test projects for Eclipse tests. Test classes using this extension can have test project diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EListMultipleContainmentMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EListMultipleContainmentMatcher.xtend similarity index 97% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EListMultipleContainmentMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EListMultipleContainmentMatcher.xtend index 04bdb7fd..ce18dec6 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EListMultipleContainmentMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EListMultipleContainmentMatcher.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.emf.ecore.EObject import org.hamcrest.CoreMatchers diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EListSingleContainmentMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EListSingleContainmentMatcher.xtend similarity index 89% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EListSingleContainmentMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EListSingleContainmentMatcher.xtend index 94968623..7cd78324 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EListSingleContainmentMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EListSingleContainmentMatcher.xtend @@ -1,10 +1,10 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.emf.ecore.EObject import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher -import static tools.vitruv.testutils.matchers.ModelMatchers.equalsDeeply +import static tools.vitruv.change.testutils.matchers.ModelMatchers.equalsDeeply /**Class to instantiate either a listContains-matcher or a listDoesNotContain-matcher (not yet). * @author Dirk Neumann diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EObjectFeatureMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EObjectFeatureMatcher.xtend similarity index 89% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EObjectFeatureMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EObjectFeatureMatcher.xtend index 6243fba3..413d0371 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EObjectFeatureMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EObjectFeatureMatcher.xtend @@ -1,14 +1,14 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.hamcrest.TypeSafeMatcher import org.eclipse.emf.ecore.EStructuralFeature import org.eclipse.emf.ecore.EObject import org.hamcrest.Description -import static tools.vitruv.testutils.printing.TestMessages.a +import static tools.vitruv.change.testutils.printing.TestMessages.a import org.hamcrest.Matcher import org.hamcrest.core.IsCollectionContaining -import static extension tools.vitruv.testutils.printing.ModelPrinting.* +import static extension tools.vitruv.change.testutils.printing.ModelPrinting.* @FinalFieldsConstructor package class EObjectFeatureMatcher extends TypeSafeMatcher { diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EObjectResourceMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EObjectResourceMatcher.xtend similarity index 88% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EObjectResourceMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EObjectResourceMatcher.xtend index 27c82d48..386889b5 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EObjectResourceMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EObjectResourceMatcher.xtend @@ -1,11 +1,11 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.hamcrest.TypeSafeMatcher import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.resource.Resource import org.hamcrest.Description -import static extension tools.vitruv.testutils.printing.ModelPrinting.* +import static extension tools.vitruv.change.testutils.printing.ModelPrinting.* @FinalFieldsConstructor package class EObjectResourceMatcher extends TypeSafeMatcher { diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityFeatureFilter.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityFeatureFilter.xtend similarity index 78% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityFeatureFilter.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityFeatureFilter.xtend index 7dcc9eb7..b0ade6cf 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityFeatureFilter.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityFeatureFilter.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.emf.ecore.EStructuralFeature diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityFeatureFilters.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityFeatureFilters.xtend similarity index 94% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityFeatureFilters.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityFeatureFilters.xtend index 07176417..330777d1 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityFeatureFilters.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityFeatureFilters.xtend @@ -1,11 +1,11 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import java.util.Set import org.eclipse.emf.ecore.EStructuralFeature import org.eclipse.emf.ecore.EClassifier -import static extension tools.vitruv.testutils.printing.TestMessages.* -import tools.vitruv.testutils.matchers.EqualityFeatureFilter +import static extension tools.vitruv.change.testutils.printing.TestMessages.* +import tools.vitruv.change.testutils.matchers.EqualityFeatureFilter import org.eclipse.emf.ecore.EClass import java.util.List diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityStrategies.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityStrategies.xtend similarity index 83% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityStrategies.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityStrategies.xtend index 3664f3d1..da48b10a 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityStrategies.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityStrategies.xtend @@ -1,12 +1,12 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EObject -import tools.vitruv.testutils.matchers.EqualityStrategy -import static tools.vitruv.testutils.matchers.EqualityStrategy.Result.* +import tools.vitruv.change.testutils.matchers.EqualityStrategy +import static tools.vitruv.change.testutils.matchers.EqualityStrategy.Result.* import java.util.Set -import static extension tools.vitruv.testutils.printing.TestMessages.* +import static extension tools.vitruv.change.testutils.printing.TestMessages.* import java.util.List @FinalFieldsConstructor diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityStrategy.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityStrategy.xtend similarity index 87% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityStrategy.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityStrategy.xtend index 4785b4d2..2db08c70 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/EqualityStrategy.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/EqualityStrategy.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.emf.ecore.EObject diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/InstanceOfEClassifierMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/InstanceOfEClassifierMatcher.xtend similarity index 81% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/InstanceOfEClassifierMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/InstanceOfEClassifierMatcher.xtend index c22ec4e7..d503c2c4 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/InstanceOfEClassifierMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/InstanceOfEClassifierMatcher.xtend @@ -1,12 +1,12 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.hamcrest.TypeSafeMatcher import org.eclipse.emf.ecore.EClassifier import org.hamcrest.Description import org.eclipse.emf.ecore.EObject -import static extension tools.vitruv.testutils.printing.ModelPrinting.* -import static tools.vitruv.testutils.printing.TestMessages.a +import static extension tools.vitruv.change.testutils.printing.ModelPrinting.* +import static tools.vitruv.change.testutils.printing.TestMessages.a @FinalFieldsConstructor package class InstanceOfEClassifierMatcher extends TypeSafeMatcher { diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelDeepEqualityMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityMatcher.xtend similarity index 94% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelDeepEqualityMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityMatcher.xtend index 8f6c63fc..018144a1 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelDeepEqualityMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityMatcher.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import java.util.HashSet import java.util.List @@ -21,33 +21,33 @@ import org.eclipse.emf.ecore.EStructuralFeature import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher -import tools.vitruv.testutils.printing.PrintResult -import tools.vitruv.testutils.printing.PrintTarget +import tools.vitruv.change.testutils.printing.PrintResult +import tools.vitruv.change.testutils.printing.PrintTarget -import static tools.vitruv.testutils.printing.PrintMode.* +import static tools.vitruv.change.testutils.printing.PrintMode.* import static java.lang.Integer.MAX_VALUE -import static extension tools.vitruv.testutils.printing.ModelPrinting.* -import static extension tools.vitruv.testutils.printing.PrintResultExtension.* +import static extension tools.vitruv.change.testutils.printing.ModelPrinting.* +import static extension tools.vitruv.change.testutils.printing.PrintResultExtension.* import org.eclipse.emf.compare.postprocessor.IPostProcessor import org.eclipse.emf.common.util.Monitor import org.eclipse.emf.compare.postprocessor.BasicPostProcessorDescriptorImpl -import tools.vitruv.testutils.printing.ModelPrinting -import tools.vitruv.testutils.printing.ModelPrinter +import tools.vitruv.change.testutils.printing.ModelPrinting +import tools.vitruv.change.testutils.printing.ModelPrinter import org.eclipse.emf.compare.match.impl.MatchEngineFactoryRegistryImpl import org.eclipse.emf.compare.postprocessor.PostProcessorDescriptorRegistryImpl import java.util.Collection -import static tools.vitruv.testutils.printing.PrintResult.* +import static tools.vitruv.change.testutils.printing.PrintResult.* import edu.kit.ipd.sdq.activextendannotations.CloseResource -import tools.vitruv.testutils.printing.DefaultPrintIdProvider -import tools.vitruv.testutils.printing.PrintIdProvider +import tools.vitruv.change.testutils.printing.DefaultPrintIdProvider +import tools.vitruv.change.testutils.printing.PrintIdProvider import org.eclipse.emf.ecore.EReference import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.* import org.eclipse.emf.compare.match.eobject.EqualityHelperExtensionProviderDescriptorRegistryImpl -import tools.vitruv.testutils.matchers.EqualityFeatureFilter -import tools.vitruv.testutils.matchers.EqualityStrategy -import static extension tools.vitruv.testutils.printing.TestMessages.* +import tools.vitruv.change.testutils.matchers.EqualityFeatureFilter +import tools.vitruv.change.testutils.matchers.EqualityStrategy +import static extension tools.vitruv.change.testutils.printing.TestMessages.* import org.eclipse.emf.compare.match.IMatchEngine import org.eclipse.emf.compare.scope.IComparisonScope import org.eclipse.xtend.lib.annotations.Accessors diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelDeepEqualityOption.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityOption.xtend similarity index 80% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelDeepEqualityOption.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityOption.xtend index 171ad88f..891625d1 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelDeepEqualityOption.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityOption.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers interface ModelDeepEqualityOption { def abstract void describeTo(StringBuilder builder) diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelMatchers.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelMatchers.xtend similarity index 99% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelMatchers.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelMatchers.xtend index e4083556..26d19f2f 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ModelMatchers.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ModelMatchers.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import edu.kit.ipd.sdq.activextendannotations.Utility import java.util.Set diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceContainmentMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceContainmentMatcher.xtend similarity index 92% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceContainmentMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceContainmentMatcher.xtend index c87db049..e4ceac57 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceContainmentMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceContainmentMatcher.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.resource.Resource @@ -8,7 +8,7 @@ import org.hamcrest.Matcher import org.hamcrest.TypeSafeMatcher import static java.lang.System.lineSeparator -import static extension tools.vitruv.testutils.printing.ModelPrinting.* +import static extension tools.vitruv.change.testutils.printing.ModelPrinting.* @FinalFieldsConstructor package class ResourceContainmentMatcher extends TypeSafeMatcher { diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceExistenceMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceExistenceMatcher.xtend similarity index 86% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceExistenceMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceExistenceMatcher.xtend index 999beba5..bb3b0398 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceExistenceMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceExistenceMatcher.xtend @@ -1,10 +1,10 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.hamcrest.TypeSafeMatcher import org.hamcrest.Description import org.eclipse.emf.ecore.resource.Resource -import static extension tools.vitruv.testutils.printing.ModelPrinting.* +import static extension tools.vitruv.change.testutils.printing.ModelPrinting.* @FinalFieldsConstructor package class ResourceExistenceMatcher extends TypeSafeMatcher { diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceExistingMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceExistingMatcher.xtend similarity index 87% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceExistingMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceExistingMatcher.xtend index 662a4103..6dfe9fa6 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceExistingMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceExistingMatcher.xtend @@ -1,11 +1,11 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.hamcrest.TypeSafeMatcher import org.eclipse.emf.common.util.URI import edu.kit.ipd.sdq.commons.util.org.eclipse.emf.common.util.URIUtil import org.hamcrest.Description -import static extension tools.vitruv.testutils.printing.ModelPrinting.* +import static extension tools.vitruv.change.testutils.printing.ModelPrinting.* @FinalFieldsConstructor package class ResourceExistingMatcher extends TypeSafeMatcher { diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceHasNoErrorsMatcher.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceHasNoErrorsMatcher.xtend similarity index 95% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceHasNoErrorsMatcher.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceHasNoErrorsMatcher.xtend index cb1c4cce..8e117ba3 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/matchers/ResourceHasNoErrorsMatcher.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/matchers/ResourceHasNoErrorsMatcher.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.matchers +package tools.vitruv.change.testutils.matchers import org.eclipse.emf.ecore.resource.Resource import org.hamcrest.Description diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/CombinedModelPrinter.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/CombinedModelPrinter.xtend similarity index 95% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/CombinedModelPrinter.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/CombinedModelPrinter.xtend index f52a26cc..fc660e17 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/CombinedModelPrinter.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/CombinedModelPrinter.xtend @@ -1,10 +1,10 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import java.util.List import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EStructuralFeature import java.util.Collection -import static tools.vitruv.testutils.printing.PrintResult.* +import static tools.vitruv.change.testutils.printing.PrintResult.* import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.* class CombinedModelPrinter implements ModelPrinter { diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultModelPrinter.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultModelPrinter.xtend similarity index 94% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultModelPrinter.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultModelPrinter.xtend index cf6b3e50..b25ab5c7 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultModelPrinter.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultModelPrinter.xtend @@ -1,15 +1,15 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EStructuralFeature import org.eclipse.emf.ecore.resource.Resource -import static tools.vitruv.testutils.printing.PrintResult.* -import static extension tools.vitruv.testutils.printing.PrintResultExtension.* +import static tools.vitruv.change.testutils.printing.PrintResult.* +import static extension tools.vitruv.change.testutils.printing.PrintResultExtension.* import java.util.Collection -import static tools.vitruv.testutils.printing.PrintMode.* +import static tools.vitruv.change.testutils.printing.PrintMode.* import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.eclipse.emf.common.util.URI -import static tools.vitruv.testutils.printing.PrintMode.multiLineIfAtLeast +import static tools.vitruv.change.testutils.printing.PrintMode.multiLineIfAtLeast import org.eclipse.emf.ecore.EReference import java.util.List diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultPrintIdProvider.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultPrintIdProvider.xtend similarity index 91% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultPrintIdProvider.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultPrintIdProvider.xtend index 66782c66..ae3864ed 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultPrintIdProvider.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultPrintIdProvider.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import java.util.HashMap import org.eclipse.emf.ecore.EObject diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultPrintTarget.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultPrintTarget.xtend similarity index 95% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultPrintTarget.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultPrintTarget.xtend index c23a76e7..7257b5ab 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/DefaultPrintTarget.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/DefaultPrintTarget.xtend @@ -1,10 +1,10 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing -import static tools.vitruv.testutils.printing.PrintResult.* +import static tools.vitruv.change.testutils.printing.PrintResult.* import java.util.ArrayList import static com.google.common.base.Preconditions.checkState import java.util.Collection -import static extension tools.vitruv.testutils.printing.PrintResultExtension.* +import static extension tools.vitruv.change.testutils.printing.PrintResultExtension.* class DefaultPrintTarget implements PrintTarget { // empty as long as we have not printed anything, diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinter.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinter.xtend similarity index 95% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinter.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinter.xtend index 45c8c1c3..178ed63b 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinter.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinter.xtend @@ -1,6 +1,6 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing -import static tools.vitruv.testutils.printing.PrintResult.NOT_RESPONSIBLE +import static tools.vitruv.change.testutils.printing.PrintResult.NOT_RESPONSIBLE import org.eclipse.emf.ecore.EObject import java.util.Collection import org.eclipse.emf.ecore.EStructuralFeature diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinterChange.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinterChange.xtend similarity index 94% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinterChange.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinterChange.xtend index 61ed7707..b2e5196c 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinterChange.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinterChange.xtend @@ -1,9 +1,9 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import org.junit.jupiter.api.^extension.BeforeAllCallback import org.junit.jupiter.api.^extension.BeforeEachCallback import org.junit.jupiter.api.^extension.ExtensionContext -import tools.vitruv.testutils.printing.ModelPrinter +import tools.vitruv.change.testutils.printing.ModelPrinter import org.junit.jupiter.api.^extension.ExtensionContext.Store.CloseableResource import org.junit.jupiter.api.^extension.ExtensionContext.Namespace import java.lang.reflect.AnnotatedElement diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinting.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinting.xtend similarity index 96% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinting.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinting.xtend index ce92b746..3a270738 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/ModelPrinting.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/ModelPrinting.xtend @@ -1,13 +1,13 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import org.eclipse.xtend.lib.annotations.Accessors import org.hamcrest.Description import java.util.List import java.util.Set import org.hamcrest.Description.NullDescription -import tools.vitruv.testutils.printing.PrintMode +import tools.vitruv.change.testutils.printing.PrintMode import static com.google.common.base.Preconditions.checkState -import static tools.vitruv.testutils.printing.PrintResult.NOT_RESPONSIBLE +import static tools.vitruv.change.testutils.printing.PrintResult.NOT_RESPONSIBLE final class ModelPrinting { private new() {} diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintIdProvider.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintIdProvider.xtend similarity index 60% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintIdProvider.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintIdProvider.xtend index 4a7bf321..d78c4afd 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintIdProvider.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintIdProvider.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing interface PrintIdProvider { def String getFallbackId(Object object) diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintMode.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintMode.xtend similarity index 93% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintMode.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintMode.xtend index e07bd9ac..b14b30ec 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintMode.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintMode.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import org.eclipse.xtend.lib.annotations.Accessors diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintResult.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintResult.xtend similarity index 87% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintResult.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintResult.xtend index 99fa55e6..09131c7d 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintResult.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintResult.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing enum PrintResult { /** diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintResultExtension.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintResultExtension.xtend similarity index 91% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintResultExtension.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintResultExtension.xtend index 449933da..8a812d8b 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintResultExtension.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintResultExtension.xtend @@ -1,7 +1,7 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import edu.kit.ipd.sdq.activextendannotations.Utility -import static tools.vitruv.testutils.printing.PrintResult.* +import static tools.vitruv.change.testutils.printing.PrintResult.* import static com.google.common.base.Preconditions.checkNotNull // Necessary because Xtend does not support methods on enums diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintTarget.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintTarget.xtend similarity index 90% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintTarget.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintTarget.xtend index 48e8eb92..bb80c852 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/PrintTarget.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/PrintTarget.xtend @@ -1,6 +1,6 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing -import static extension tools.vitruv.testutils.printing.PrintResultExtension.* +import static extension tools.vitruv.change.testutils.printing.PrintResultExtension.* interface PrintTarget { def PrintResult print(String text) diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/TestMessages.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/TestMessages.xtend similarity index 97% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/TestMessages.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/TestMessages.xtend index b11dbfa1..7d685c49 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/TestMessages.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/TestMessages.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import edu.kit.ipd.sdq.activextendannotations.Utility import java.util.Collection diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UnsetFeaturesHidingModelPrinter.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UnsetFeaturesHidingModelPrinter.xtend similarity index 79% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UnsetFeaturesHidingModelPrinter.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UnsetFeaturesHidingModelPrinter.xtend index 31e272e6..c17bc0b1 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UnsetFeaturesHidingModelPrinter.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UnsetFeaturesHidingModelPrinter.xtend @@ -1,8 +1,8 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EStructuralFeature -import static tools.vitruv.testutils.printing.PrintResult.* +import static tools.vitruv.change.testutils.printing.PrintResult.* class UnsetFeaturesHidingModelPrinter implements ModelPrinter { override PrintResult printFeature( diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UriReplacingPrinter.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UriReplacingPrinter.xtend similarity index 93% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UriReplacingPrinter.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UriReplacingPrinter.xtend index 2c9c2378..a1e21781 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UriReplacingPrinter.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UriReplacingPrinter.xtend @@ -1,7 +1,7 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing import org.eclipse.emf.common.util.URI -import static tools.vitruv.testutils.printing.PrintResult.NOT_RESPONSIBLE +import static tools.vitruv.change.testutils.printing.PrintResult.NOT_RESPONSIBLE import java.util.List import static com.google.common.base.Preconditions.checkArgument diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UseModelPrinter.xtend b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UseModelPrinter.xtend similarity index 77% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UseModelPrinter.xtend rename to testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UseModelPrinter.xtend index 8f6484c7..f17a0a46 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/printing/UseModelPrinter.xtend +++ b/testutils/core/src/main/xtend/tools/vitruv/change/testutils/printing/UseModelPrinter.xtend @@ -1,11 +1,11 @@ -package tools.vitruv.testutils.printing +package tools.vitruv.change.testutils.printing -import tools.vitruv.testutils.printing.ModelPrinter +import tools.vitruv.change.testutils.printing.ModelPrinter import java.lang.annotation.Retention import java.lang.annotation.Target import java.lang.annotation.Inherited -import tools.vitruv.testutils.printing.DefaultModelPrinter -import tools.vitruv.testutils.printing.PrintResult +import tools.vitruv.change.testutils.printing.DefaultModelPrinter +import tools.vitruv.change.testutils.printing.PrintResult /** * Annotation that allows changing which {@linkplain ModelPrinter ModelPrinters} will be used by {@link ModelPrinting}. diff --git a/tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/matchers/ModelDeepEqualityMatcherTest.xtend b/testutils/core/src/test/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityMatcherTest.xtend similarity index 97% rename from tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/matchers/ModelDeepEqualityMatcherTest.xtend rename to testutils/core/src/test/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityMatcherTest.xtend index cad87e7e..3a9fc7ae 100644 --- a/tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/matchers/ModelDeepEqualityMatcherTest.xtend +++ b/testutils/core/src/test/xtend/tools/vitruv/change/testutils/matchers/ModelDeepEqualityMatcherTest.xtend @@ -1,11 +1,11 @@ -package tools.vitruv.testutils.tests.matchers +package tools.vitruv.change.testutils.matchers import org.junit.jupiter.api.Test import org.junit.jupiter.api.DisplayName import static org.junit.jupiter.api.Assertions.assertDoesNotThrow import static org.hamcrest.MatcherAssert.assertThat -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet -import static tools.vitruv.testutils.matchers.ModelMatchers.* +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet +import static tools.vitruv.change.testutils.matchers.ModelMatchers.* import static org.junit.jupiter.api.Assertions.assertThrows import static org.hamcrest.CoreMatchers.containsString import org.junit.jupiter.params.ParameterizedTest @@ -13,20 +13,20 @@ import org.junit.jupiter.params.provider.MethodSource import java.util.stream.Stream import org.junit.jupiter.params.provider.Arguments import org.junit.jupiter.api.^extension.ExtendWith -import tools.vitruv.testutils.RegisterMetamodelsInStandalone +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone import org.eclipse.emf.ecore.EObject -import tools.vitruv.testutils.printing.ModelPrinterChange -import tools.vitruv.testutils.TestLogging -import tools.vitruv.testutils.printing.UseModelPrinter -import tools.vitruv.testutils.printing.UnsetFeaturesHidingModelPrinter +import tools.vitruv.change.testutils.printing.ModelPrinterChange +import tools.vitruv.change.testutils.TestLogging +import tools.vitruv.change.testutils.printing.UseModelPrinter +import tools.vitruv.change.testutils.printing.UnsetFeaturesHidingModelPrinter import allElementTypes.NonRoot import allElementTypes.Root -import static tools.vitruv.testutils.matchers.ModelMatchers.ignoringFeatures +import static tools.vitruv.change.testutils.matchers.ModelMatchers.ignoringFeatures import static allElementTypes.AllElementTypesPackage.Literals.* import allElementTypes.impl.NonRootImpl -import static tools.vitruv.testutils.metamodels.PcmMockupCreators.pcm -import tools.vitruv.testutils.matchers.EqualityStrategy -import static tools.vitruv.testutils.matchers.EqualityStrategy.Result.* +import static tools.vitruv.change.testutils.metamodels.PcmMockupCreators.pcm +import tools.vitruv.change.testutils.matchers.EqualityStrategy +import static tools.vitruv.change.testutils.matchers.EqualityStrategy.Result.* import pcm_mockup.PInterface import static org.hamcrest.CoreMatchers.is diff --git a/tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/printing/DefaultModelPrinterTest.xtend b/testutils/core/src/test/xtend/tools/vitruv/change/testutils/printing/DefaultModelPrinterTest.xtend similarity index 93% rename from tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/printing/DefaultModelPrinterTest.xtend rename to testutils/core/src/test/xtend/tools/vitruv/change/testutils/printing/DefaultModelPrinterTest.xtend index ab62350d..0e60124d 100644 --- a/tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/printing/DefaultModelPrinterTest.xtend +++ b/testutils/core/src/test/xtend/tools/vitruv/change/testutils/printing/DefaultModelPrinterTest.xtend @@ -1,20 +1,20 @@ -package tools.vitruv.testutils.tests.printing +package tools.vitruv.change.testutils.printing -import tools.vitruv.testutils.printing.DefaultPrintTarget -import tools.vitruv.testutils.printing.PrintTarget +import tools.vitruv.change.testutils.printing.DefaultPrintTarget +import tools.vitruv.change.testutils.printing.PrintTarget import org.junit.jupiter.api.Test import org.junit.jupiter.api.DisplayName -import tools.vitruv.testutils.printing.DefaultModelPrinter -import tools.vitruv.testutils.printing.PrintIdProvider -import tools.vitruv.testutils.printing.DefaultPrintIdProvider +import tools.vitruv.change.testutils.printing.DefaultModelPrinter +import tools.vitruv.change.testutils.printing.PrintIdProvider +import tools.vitruv.change.testutils.printing.DefaultPrintIdProvider import static org.hamcrest.MatcherAssert.assertThat import static org.hamcrest.CoreMatchers.is -import static tools.vitruv.testutils.metamodels.AllElementTypesCreators.aet +import static tools.vitruv.change.testutils.metamodels.AllElementTypesCreators.aet import allElementTypes.ValueBased import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.emf.common.util.URI import org.junit.jupiter.api.^extension.ExtendWith -import tools.vitruv.testutils.RegisterMetamodelsInStandalone +import tools.vitruv.change.testutils.RegisterMetamodelsInStandalone @ExtendWith(RegisterMetamodelsInStandalone) class DefaultModelPrinterTest { diff --git a/tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/printing/DefaultPrintTargetTest.xtend b/testutils/core/src/test/xtend/tools/vitruv/change/testutils/printing/DefaultPrintTargetTest.xtend similarity index 96% rename from tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/printing/DefaultPrintTargetTest.xtend rename to testutils/core/src/test/xtend/tools/vitruv/change/testutils/printing/DefaultPrintTargetTest.xtend index b2e14530..4a35c386 100644 --- a/tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/tests/printing/DefaultPrintTargetTest.xtend +++ b/testutils/core/src/test/xtend/tools/vitruv/change/testutils/printing/DefaultPrintTargetTest.xtend @@ -1,16 +1,16 @@ -package tools.vitruv.testutils.tests.printing +package tools.vitruv.change.testutils.printing import org.junit.jupiter.api.Test import org.junit.jupiter.api.DisplayName -import tools.vitruv.testutils.printing.DefaultPrintTarget +import tools.vitruv.change.testutils.printing.DefaultPrintTarget import static org.hamcrest.MatcherAssert.assertThat import static org.hamcrest.CoreMatchers.is -import static tools.vitruv.testutils.printing.PrintResult.* +import static tools.vitruv.change.testutils.printing.PrintResult.* import static org.junit.jupiter.api.Assertions.assertThrows import static org.junit.jupiter.api.Assertions.fail -import static tools.vitruv.testutils.printing.PrintMode.* -import tools.vitruv.testutils.printing.PrintResult -import tools.vitruv.testutils.printing.PrintTarget +import static tools.vitruv.change.testutils.printing.PrintMode.* +import tools.vitruv.change.testutils.printing.PrintResult +import tools.vitruv.change.testutils.printing.PrintTarget import java.util.List class DefaultPrintTargetTest { diff --git a/testutils/integration/pom.xml b/testutils/integration/pom.xml new file mode 100644 index 00000000..e9377465 --- /dev/null +++ b/testutils/integration/pom.xml @@ -0,0 +1,106 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change.testutils + 3.1.0-SNAPSHOT + + + tools.vitruv.change.testutils.integration + + Vitruv Change Test Utilities for Integration + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + ${project.groupId} + tools.vitruv.change.atomic + ${project.version} + + + ${project.groupId} + tools.vitruv.change.composite + ${project.version} + + + ${project.groupId} + tools.vitruv.change.interaction + ${project.version} + + + ${project.groupId} + tools.vitruv.change.propagation + ${project.version} + + + ${project.groupId} + tools.vitruv.change.testutils.core + ${project.version} + + + + + 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 + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + sdq-commons + edu.kit.ipd.sdq.commons.util.emf + + + sdq-commons + edu.kit.ipd.sdq.commons.util.java + + + xannotations + edu.kit.ipd.sdq.activextendannotations + + + + + org.hamcrest + hamcrest + test + + + org.junit.jupiter + junit-jupiter-api + test + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestModelRepositoryFactory.java b/testutils/integration/src/main/java/tools/vitruv/change/testutils/TestModelRepositoryFactory.java similarity index 98% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestModelRepositoryFactory.java rename to testutils/integration/src/main/java/tools/vitruv/change/testutils/TestModelRepositoryFactory.java index 24e4314c..e8010ac9 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestModelRepositoryFactory.java +++ b/testutils/integration/src/main/java/tools/vitruv/change/testutils/TestModelRepositoryFactory.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils; +package tools.vitruv.change.testutils; import java.io.IOException; import java.nio.file.Files; diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/UriMode.java b/testutils/integration/src/main/java/tools/vitruv/change/testutils/views/UriMode.java similarity index 87% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/UriMode.java rename to testutils/integration/src/main/java/tools/vitruv/change/testutils/views/UriMode.java index 43c89292..f4204bc7 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/UriMode.java +++ b/testutils/integration/src/main/java/tools/vitruv/change/testutils/views/UriMode.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.views; +package tools.vitruv.change.testutils.views; /** * Determines how relative paths should be resolved to EMF URIs in a test. diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestUserInteraction.xtend b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/TestUserInteraction.xtend similarity index 99% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestUserInteraction.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/change/testutils/TestUserInteraction.xtend index 5deb43c4..a3e0d89d 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/TestUserInteraction.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/TestUserInteraction.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils +package tools.vitruv.change.testutils import tools.vitruv.change.interaction.InteractionResultProvider import tools.vitruv.change.interaction.UserInteractionOptions.WindowModality @@ -8,7 +8,7 @@ import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor import java.util.LinkedList import static java.lang.System.lineSeparator import org.eclipse.xtend.lib.annotations.Accessors -import static extension tools.vitruv.testutils.printing.TestMessages.* +import static extension tools.vitruv.change.testutils.printing.TestMessages.* import java.util.Collection import java.util.List import java.util.ArrayList diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/BasicTestView.xtend b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/BasicTestView.xtend similarity index 98% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/BasicTestView.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/BasicTestView.xtend index 127bbe05..a63ff65c 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/BasicTestView.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/BasicTestView.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.views +package tools.vitruv.change.testutils.views import java.nio.file.Path import java.util.List @@ -11,7 +11,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl import org.eclipse.xtend.lib.annotations.Accessors import tools.vitruv.change.composite.description.PropagatedChange -import tools.vitruv.testutils.TestUserInteraction +import tools.vitruv.change.testutils.TestUserInteraction import static com.google.common.base.Preconditions.checkArgument import static edu.kit.ipd.sdq.commons.util.org.eclipse.emf.common.util.URIUtil.createFileURI diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/ChangePublishingTestView.xtend b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/ChangePublishingTestView.xtend similarity index 97% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/ChangePublishingTestView.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/ChangePublishingTestView.xtend index 30909afb..584c9d41 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/ChangePublishingTestView.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/ChangePublishingTestView.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.views +package tools.vitruv.change.testutils.views import java.nio.file.Files import java.nio.file.Path @@ -25,12 +25,12 @@ import tools.vitruv.change.propagation.ChangePropagationSpecification import tools.vitruv.change.propagation.ChangePropagationSpecificationRepository import tools.vitruv.change.propagation.impl.DefaultChangeRecordingModelRepository import tools.vitruv.change.propagation.impl.DefaultChangeableModelRepository -import tools.vitruv.testutils.TestUserInteraction +import tools.vitruv.change.testutils.TestUserInteraction import static com.google.common.base.Preconditions.checkArgument import static com.google.common.base.Preconditions.checkState import static edu.kit.ipd.sdq.commons.util.org.eclipse.emf.common.util.URIUtil.isPathmap -import static tools.vitruv.testutils.TestModelRepositoryFactory.createTestChangeableModelRepository +import static tools.vitruv.change.testutils.TestModelRepositoryFactory.createTestChangeableModelRepository import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.flatMapFixed import static extension edu.kit.ipd.sdq.commons.util.org.eclipse.emf.ecore.resource.ResourceSetUtil.withGlobalFactories diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/NonTransactionalTestView.xtend b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/NonTransactionalTestView.xtend similarity index 98% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/NonTransactionalTestView.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/NonTransactionalTestView.xtend index bbc65dc3..94fa0a53 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/NonTransactionalTestView.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/NonTransactionalTestView.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.views +package tools.vitruv.change.testutils.views import java.util.List import org.eclipse.emf.common.notify.Notifier diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/TestView.xtend b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/TestView.xtend similarity index 97% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/TestView.xtend rename to testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/TestView.xtend index 6b27cfe9..a7148e35 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/views/TestView.xtend +++ b/testutils/integration/src/main/xtend/tools/vitruv/change/testutils/views/TestView.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.views +package tools.vitruv.change.testutils.views import java.nio.file.Path import java.util.List @@ -8,7 +8,7 @@ import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.resource.Resource import tools.vitruv.change.composite.description.PropagatedChange -import tools.vitruv.testutils.TestUserInteraction +import tools.vitruv.change.testutils.TestUserInteraction import static com.google.common.base.Preconditions.checkState diff --git a/tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/TestUserInteractionTest.java b/testutils/integration/src/test/java/tools/vitruv/change/testutils/TestUserInteractionTest.java similarity index 99% rename from tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/TestUserInteractionTest.java rename to testutils/integration/src/test/java/tools/vitruv/change/testutils/TestUserInteractionTest.java index 2c8c6ee2..f088095e 100644 --- a/tests/tools.vitruv.testutils.tests/src/tools/vitruv/testutils/TestUserInteractionTest.java +++ b/testutils/integration/src/test/java/tools/vitruv/change/testutils/TestUserInteractionTest.java @@ -1,4 +1,4 @@ -package tools.vitruv.testutils; +package tools.vitruv.change.testutils; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -12,7 +12,7 @@ import tools.vitruv.change.interaction.UserInteractor; import tools.vitruv.change.interaction.UserInteractionFactory; -import tools.vitruv.testutils.TestUserInteraction.ResultProvider; +import tools.vitruv.change.testutils.TestUserInteraction.ResultProvider; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.equalTo; import static java.util.Collections.emptySet; diff --git a/testutils/metamodels/.project b/testutils/metamodels/.project new file mode 100644 index 00000000..f4cdb60a --- /dev/null +++ b/testutils/metamodels/.project @@ -0,0 +1,29 @@ + + + tools.vitruv.change.testutils.metamodels + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + + + 1700568570089 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/bundles/tools.vitruv.testutils.metamodels/plugin.xml b/testutils/metamodels/plugin.xml similarity index 50% rename from bundles/tools.vitruv.testutils.metamodels/plugin.xml rename to testutils/metamodels/plugin.xml index 10e6d552..ac0ae48a 100644 --- a/bundles/tools.vitruv.testutils.metamodels/plugin.xml +++ b/testutils/metamodels/plugin.xml @@ -9,120 +9,120 @@ + genModel="src/main/ecore/uml_mockup.genmodel"/> + class="tools.vitruv.change.testutils.metamodels.RandomIdUmlMockupFactory" + uri="http://tools.vitruv.change.testutils.metamodels.uml_mockup"> + genModel="src/main/ecore/pcm_mockup.genmodel"/> + class="tools.vitruv.change.testutils.metamodels.RandomIdPcmMockupFactory" + uri="http://tools.vitruv.change.testutils.metamodels.pcm_mockup"> + genModel="src/main/ecore/multicontainment_a.genmodel"/> + class="tools.vitruv.change.testutils.metamodels.RandomIdMulticontainmentAFactory" + uri="http://tools.vitruv.change.testutils.metamodels.multicontainment_a"> + genModel="src/main/ecore/multicontainment_b.genmodel"/> + class="tools.vitruv.change.testutils.metamodels.RandomIdMulticontainmentBFactory" + uri="http://tools.vitruv.change.testutils.metamodels.multicontainment_b"> + genModel="src/main/ecore/allElementTypes.genmodel"/> + class="tools.vitruv.change.testutils.metamodels.RandomIdAllElementTypesFactory" + uri="http://tools.vitruv.change.testutils.metamodels.allElementTypes"> + genModel="src/main/ecore/attributeToStructureAttr.genmodel"/> + class="tools.vitruv.change.testutils.metamodels.RandomIdAttributeToStructureAttrFactory" + uri="http://tools.vitruv.change.testutils.metamodels.attribute_to_structure_attr"> + genModel="src/main/ecore/attributeToStructureStruct1.genmodel"/> + class="tools.vitruv.change.testutils.metamodels.RandomIdAttributeToStructureStructFactory" + uri="http://tools.vitruv.change.testutils.metamodels.attribute_to_structure_struct_1"> + genModel="src/main/ecore/allElementTypes2.genmodel"/> + class="tools.vitruv.change.testutils.metamodels.RandomIdAllElementTypes2Factory" + uri="http://tools.vitruv.change.testutils.metamodels.allElementTypes2"> diff --git a/testutils/metamodels/pom.xml b/testutils/metamodels/pom.xml new file mode 100644 index 00000000..c701d215 --- /dev/null +++ b/testutils/metamodels/pom.xml @@ -0,0 +1,78 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change.testutils + 3.1.0-SNAPSHOT + + + tools.vitruv.change.testutils.metamodels + + Vitruv Change Test Utilities Metamodels + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.codehaus.mojo + exec-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + maven-jar-plugin + + + ${project.basedir}/META-INF/MANIFEST.MF + + + + + + + + + + ${project.groupId} + tools.vitruv.change.utils + ${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.junit.jupiter + junit-jupiter-params + + + xannotations + edu.kit.ipd.sdq.activextendannotations + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.testutils.metamodels/metamodels/allElementTypes.ecore b/testutils/metamodels/src/main/ecore/allElementTypes.ecore similarity index 98% rename from bundles/tools.vitruv.testutils.metamodels/metamodels/allElementTypes.ecore rename to testutils/metamodels/src/main/ecore/allElementTypes.ecore index 111c7d6e..8767471c 100644 --- a/bundles/tools.vitruv.testutils.metamodels/metamodels/allElementTypes.ecore +++ b/testutils/metamodels/src/main/ecore/allElementTypes.ecore @@ -1,6 +1,6 @@ diff --git a/bundles/tools.vitruv.testutils.metamodels/metamodels/allElementTypes2.ecore b/testutils/metamodels/src/main/ecore/allElementTypes2.ecore similarity index 96% rename from bundles/tools.vitruv.testutils.metamodels/metamodels/allElementTypes2.ecore rename to testutils/metamodels/src/main/ecore/allElementTypes2.ecore index b9a8237f..e2680e23 100644 --- a/bundles/tools.vitruv.testutils.metamodels/metamodels/allElementTypes2.ecore +++ b/testutils/metamodels/src/main/ecore/allElementTypes2.ecore @@ -1,6 +1,6 @@ diff --git a/bundles/tools.vitruv.testutils.metamodels/metamodels/attributeToStructureAttr.ecore b/testutils/metamodels/src/main/ecore/attributeToStructureAttr.ecore similarity index 93% rename from bundles/tools.vitruv.testutils.metamodels/metamodels/attributeToStructureAttr.ecore rename to testutils/metamodels/src/main/ecore/attributeToStructureAttr.ecore index 534154e8..b1e428a2 100644 --- a/bundles/tools.vitruv.testutils.metamodels/metamodels/attributeToStructureAttr.ecore +++ b/testutils/metamodels/src/main/ecore/attributeToStructureAttr.ecore @@ -1,6 +1,6 @@ diff --git a/bundles/tools.vitruv.testutils.metamodels/metamodels/attributeToStructureStruct1.ecore b/testutils/metamodels/src/main/ecore/attributeToStructureStruct1.ecore similarity index 94% rename from bundles/tools.vitruv.testutils.metamodels/metamodels/attributeToStructureStruct1.ecore rename to testutils/metamodels/src/main/ecore/attributeToStructureStruct1.ecore index 872ee3e2..9ca39a9c 100644 --- a/bundles/tools.vitruv.testutils.metamodels/metamodels/attributeToStructureStruct1.ecore +++ b/testutils/metamodels/src/main/ecore/attributeToStructureStruct1.ecore @@ -1,6 +1,6 @@ attributeToStructureStruct1.ecore diff --git a/bundles/tools.vitruv.testutils.metamodels/metamodels/multicontainment_a.ecore b/testutils/metamodels/src/main/ecore/multicontainment_a.ecore similarity index 94% rename from bundles/tools.vitruv.testutils.metamodels/metamodels/multicontainment_a.ecore rename to testutils/metamodels/src/main/ecore/multicontainment_a.ecore index 2b83fb4d..63b024c5 100644 --- a/bundles/tools.vitruv.testutils.metamodels/metamodels/multicontainment_a.ecore +++ b/testutils/metamodels/src/main/ecore/multicontainment_a.ecore @@ -1,6 +1,6 @@ multicontainment_a.ecore diff --git a/bundles/tools.vitruv.testutils.metamodels/metamodels/multicontainment_b.ecore b/testutils/metamodels/src/main/ecore/multicontainment_b.ecore similarity index 94% rename from bundles/tools.vitruv.testutils.metamodels/metamodels/multicontainment_b.ecore rename to testutils/metamodels/src/main/ecore/multicontainment_b.ecore index 09b625f4..692ecd25 100644 --- a/bundles/tools.vitruv.testutils.metamodels/metamodels/multicontainment_b.ecore +++ b/testutils/metamodels/src/main/ecore/multicontainment_b.ecore @@ -1,6 +1,6 @@ diff --git a/bundles/tools.vitruv.testutils.metamodels/metamodels/pcm_mockup.ecore b/testutils/metamodels/src/main/ecore/pcm_mockup.ecore similarity index 96% rename from bundles/tools.vitruv.testutils.metamodels/metamodels/pcm_mockup.ecore rename to testutils/metamodels/src/main/ecore/pcm_mockup.ecore index fd60ad49..9616d33c 100644 --- a/bundles/tools.vitruv.testutils.metamodels/metamodels/pcm_mockup.ecore +++ b/testutils/metamodels/src/main/ecore/pcm_mockup.ecore @@ -1,6 +1,6 @@ diff --git a/bundles/tools.vitruv.testutils.metamodels/metamodels/uml_mockup.ecore b/testutils/metamodels/src/main/ecore/uml_mockup.ecore similarity index 96% rename from bundles/tools.vitruv.testutils.metamodels/metamodels/uml_mockup.ecore rename to testutils/metamodels/src/main/ecore/uml_mockup.ecore index 0ccd5096..7c03b7cb 100644 --- a/bundles/tools.vitruv.testutils.metamodels/metamodels/uml_mockup.ecore +++ b/testutils/metamodels/src/main/ecore/uml_mockup.ecore @@ -1,6 +1,6 @@ diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/AllElementTypes2Creators.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/AllElementTypes2Creators.xtend similarity index 63% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/AllElementTypes2Creators.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/AllElementTypes2Creators.xtend index d5a2c7d6..81028b67 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/AllElementTypes2Creators.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/AllElementTypes2Creators.xtend @@ -1,7 +1,7 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import allElementTypes2.AllElementTypes2Factory -import tools.vitruv.testutils.activeannotations.ModelCreators +import tools.vitruv.change.utils.activeannotations.ModelCreators @ModelCreators(factory=AllElementTypes2Factory) final class AllElementTypes2Creators { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/AllElementTypesCreators.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/AllElementTypesCreators.xtend similarity index 64% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/AllElementTypesCreators.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/AllElementTypesCreators.xtend index 232780e4..99bdb674 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/AllElementTypesCreators.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/AllElementTypesCreators.xtend @@ -1,6 +1,6 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels -import tools.vitruv.testutils.activeannotations.ModelCreators +import tools.vitruv.change.utils.activeannotations.ModelCreators import allElementTypes.AllElementTypesFactory @ModelCreators(factory=AllElementTypesFactory) diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/PcmMockupCreators.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/PcmMockupCreators.xtend similarity index 61% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/PcmMockupCreators.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/PcmMockupCreators.xtend index f4829955..096753e3 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/PcmMockupCreators.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/PcmMockupCreators.xtend @@ -1,7 +1,7 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import pcm_mockup.Pcm_mockupFactory -import tools.vitruv.testutils.activeannotations.ModelCreators +import tools.vitruv.change.utils.activeannotations.ModelCreators @ModelCreators(factory=Pcm_mockupFactory, stripPrefix = "P") final class PcmMockupCreators { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAllElementTypes2Factory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAllElementTypes2Factory.xtend similarity index 65% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAllElementTypes2Factory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAllElementTypes2Factory.xtend index 338af534..edbdb980 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAllElementTypes2Factory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAllElementTypes2Factory.xtend @@ -1,8 +1,8 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import allElementTypes2.Identified2 import allElementTypes2.impl.AllElementTypes2FactoryImpl -import tools.vitruv.testutils.activeannotations.WithGeneratedRandomIds +import tools.vitruv.change.utils.activeannotations.WithGeneratedRandomIds @WithGeneratedRandomIds(identifierMetaclass=Identified2) class RandomIdAllElementTypes2Factory extends AllElementTypes2FactoryImpl { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAllElementTypesFactory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAllElementTypesFactory.xtend similarity index 64% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAllElementTypesFactory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAllElementTypesFactory.xtend index 0c4d4cb9..14708cba 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAllElementTypesFactory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAllElementTypesFactory.xtend @@ -1,8 +1,8 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import allElementTypes.Identified import allElementTypes.impl.AllElementTypesFactoryImpl -import tools.vitruv.testutils.activeannotations.WithGeneratedRandomIds +import tools.vitruv.change.utils.activeannotations.WithGeneratedRandomIds @WithGeneratedRandomIds(identifierMetaclass=Identified) class RandomIdAllElementTypesFactory extends AllElementTypesFactoryImpl { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAttributeToStructureAttrFactory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAttributeToStructureAttrFactory.xtend similarity index 69% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAttributeToStructureAttrFactory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAttributeToStructureAttrFactory.xtend index de4b7b2b..d5b12bc3 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAttributeToStructureAttrFactory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAttributeToStructureAttrFactory.xtend @@ -1,8 +1,8 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import attribute_to_structure_attr.Identified import attribute_to_structure_attr.impl.Attribute_to_structure_attrFactoryImpl -import tools.vitruv.testutils.activeannotations.WithGeneratedRandomIds +import tools.vitruv.change.utils.activeannotations.WithGeneratedRandomIds @WithGeneratedRandomIds(identifierMetaclass=Identified) class RandomIdAttributeToStructureAttrFactory extends Attribute_to_structure_attrFactoryImpl { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAttributeToStructureStructFactory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAttributeToStructureStructFactory.xtend similarity index 70% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAttributeToStructureStructFactory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAttributeToStructureStructFactory.xtend index 67f4ff80..9808387c 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdAttributeToStructureStructFactory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdAttributeToStructureStructFactory.xtend @@ -1,8 +1,8 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import attribute_to_structure_struct_1.Identified import attribute_to_structure_struct_1.impl.Attribute_to_structure_struct_1FactoryImpl -import tools.vitruv.testutils.activeannotations.WithGeneratedRandomIds +import tools.vitruv.change.utils.activeannotations.WithGeneratedRandomIds @WithGeneratedRandomIds(identifierMetaclass=Identified) class RandomIdAttributeToStructureStructFactory extends Attribute_to_structure_struct_1FactoryImpl { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdMulticontainmentAFactory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdMulticontainmentAFactory.xtend similarity index 65% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdMulticontainmentAFactory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdMulticontainmentAFactory.xtend index 703cb900..bd375d4d 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdMulticontainmentAFactory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdMulticontainmentAFactory.xtend @@ -1,8 +1,8 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import multicontainment_a.Identified import multicontainment_a.impl.Multicontainment_aFactoryImpl -import tools.vitruv.testutils.activeannotations.WithGeneratedRandomIds +import tools.vitruv.change.utils.activeannotations.WithGeneratedRandomIds @WithGeneratedRandomIds(identifierMetaclass=Identified) class RandomIdMulticontainmentAFactory extends Multicontainment_aFactoryImpl { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdMulticontainmentBFactory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdMulticontainmentBFactory.xtend similarity index 65% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdMulticontainmentBFactory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdMulticontainmentBFactory.xtend index 8de92255..074b9f0b 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdMulticontainmentBFactory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdMulticontainmentBFactory.xtend @@ -1,8 +1,8 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import multicontainment_b.Identified import multicontainment_b.impl.Multicontainment_bFactoryImpl -import tools.vitruv.testutils.activeannotations.WithGeneratedRandomIds +import tools.vitruv.change.utils.activeannotations.WithGeneratedRandomIds @WithGeneratedRandomIds(identifierMetaclass=Identified) class RandomIdMulticontainmentBFactory extends Multicontainment_bFactoryImpl { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdPcmMockupFactory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdPcmMockupFactory.xtend similarity index 61% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdPcmMockupFactory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdPcmMockupFactory.xtend index 835b57c0..d0b5b555 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdPcmMockupFactory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdPcmMockupFactory.xtend @@ -1,8 +1,8 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import pcm_mockup.Identified import pcm_mockup.impl.Pcm_mockupFactoryImpl -import tools.vitruv.testutils.activeannotations.WithGeneratedRandomIds +import tools.vitruv.change.utils.activeannotations.WithGeneratedRandomIds @WithGeneratedRandomIds(identifierMetaclass=Identified) class RandomIdPcmMockupFactory extends Pcm_mockupFactoryImpl { diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdUmlMockupFactory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdUmlMockupFactory.xtend similarity index 61% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdUmlMockupFactory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdUmlMockupFactory.xtend index f2401062..bb292983 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/RandomIdUmlMockupFactory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/RandomIdUmlMockupFactory.xtend @@ -1,6 +1,6 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels -import tools.vitruv.testutils.activeannotations.WithGeneratedRandomIds +import tools.vitruv.change.utils.activeannotations.WithGeneratedRandomIds import uml_mockup.Identified import uml_mockup.impl.Uml_mockupFactoryImpl diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/TestMetamodelsPathFactory.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/TestMetamodelsPathFactory.xtend similarity index 90% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/TestMetamodelsPathFactory.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/TestMetamodelsPathFactory.xtend index 456d7d4e..54d8c88b 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/TestMetamodelsPathFactory.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/TestMetamodelsPathFactory.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import edu.kit.ipd.sdq.activextendannotations.Utility import java.nio.file.Path diff --git a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/UmlMockupCreators.xtend b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/UmlMockupCreators.xtend similarity index 61% rename from bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/UmlMockupCreators.xtend rename to testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/UmlMockupCreators.xtend index 199c87c7..7e33639d 100644 --- a/bundles/tools.vitruv.testutils.metamodels/src/tools/vitruv/testutils/metamodels/UmlMockupCreators.xtend +++ b/testutils/metamodels/src/main/xtend/tools/vitruv/change/testutils/metamodels/UmlMockupCreators.xtend @@ -1,7 +1,7 @@ -package tools.vitruv.testutils.metamodels +package tools.vitruv.change.testutils.metamodels import uml_mockup.Uml_mockupFactory -import tools.vitruv.testutils.activeannotations.ModelCreators +import tools.vitruv.change.utils.activeannotations.ModelCreators @ModelCreators(factory=Uml_mockupFactory, stripPrefix = "U") final class UmlMockupCreators { diff --git a/testutils/metamodels/workflow/generate.mwe2 b/testutils/metamodels/workflow/generate.mwe2 new file mode 100644 index 00000000..7866dab3 --- /dev/null +++ b/testutils/metamodels/workflow/generate.mwe2 @@ -0,0 +1,63 @@ +module tools.vitruv.change.testutils.metamodels + +import org.eclipse.emf.mwe2.ecore.EcoreGenerator +import org.eclipse.emf.mwe.utils.StandaloneSetup + +var workspaceRoot = ".." + +Workflow { + + bean = StandaloneSetup { + scanClassPath = true + platformUri = workspaceRoot + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.testutils.metamodels/src/main/ecore/allElementTypes.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.testutils.metamodels/target/generated-sources/ecore" + generateCustomClasses = false + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.testutils.metamodels/src/main/ecore/allElementTypes2.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.testutils.metamodels/target/generated-sources/ecore" + generateCustomClasses = false + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.testutils.metamodels/src/main/ecore/attributeToStructureAttr.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.testutils.metamodels/target/generated-sources/ecore" + generateCustomClasses = false + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.testutils.metamodels/src/main/ecore/attributeToStructureStruct1.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.testutils.metamodels/target/generated-sources/ecore" + generateCustomClasses = false + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.testutils.metamodels/src/main/ecore/multicontainment_a.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.testutils.metamodels/target/generated-sources/ecore" + generateCustomClasses = false + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.testutils.metamodels/src/main/ecore/multicontainment_b.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.testutils.metamodels/target/generated-sources/ecore" + generateCustomClasses = false + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.testutils.metamodels/src/main/ecore/pcm_mockup.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.testutils.metamodels/target/generated-sources/ecore" + generateCustomClasses = false + } + + component = EcoreGenerator { + genModel = "platform:/resource/tools.vitruv.change.testutils.metamodels/src/main/ecore/uml_mockup.genmodel" + srcPath = "platform:/resource/tools.vitruv.change.testutils.metamodels/target/generated-sources/ecore" + generateCustomClasses = false + } + +} diff --git a/testutils/pom.xml b/testutils/pom.xml new file mode 100644 index 00000000..da405609 --- /dev/null +++ b/testutils/pom.xml @@ -0,0 +1,26 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.testutils + pom + + Vitruv Change Test Utilities + Utilities for defining tests using the Vitruv change and propagation specifications + + + changevisualization + core + integration + metamodels + + \ No newline at end of file diff --git a/utils/pom.xml b/utils/pom.xml new file mode 100644 index 00000000..f0cb6d6e --- /dev/null +++ b/utils/pom.xml @@ -0,0 +1,63 @@ + + + + 4.0.0 + + + tools.vitruv + tools.vitruv.change + 3.1.0-SNAPSHOT + + + tools.vitruv.change.utils + + Vitruv Change Utilities + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.eclipse.xtend + xtend-maven-plugin + + + + + + + + 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.macro + + + org.eclipse.xtext + org.eclipse.xtext.xbase.lib + + + org.junit.jupiter + junit-jupiter-api + + + org.junit.jupiter + junit-jupiter-params + + + \ No newline at end of file diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ProjectMarker.java b/utils/src/main/java/tools/vitruv/change/utils/ProjectMarker.java similarity index 98% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ProjectMarker.java rename to utils/src/main/java/tools/vitruv/change/utils/ProjectMarker.java index 31cd83e8..6c4fdd63 100644 --- a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ProjectMarker.java +++ b/utils/src/main/java/tools/vitruv/change/utils/ProjectMarker.java @@ -1,4 +1,4 @@ -package tools.vitruv.change.propagation; +package tools.vitruv.change.utils; import java.nio.file.Files; import java.nio.file.Path; diff --git a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ResourceAccess.java b/utils/src/main/java/tools/vitruv/change/utils/ResourceAccess.java similarity index 88% rename from bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ResourceAccess.java rename to utils/src/main/java/tools/vitruv/change/utils/ResourceAccess.java index 88495088..f9a4e1df 100644 --- a/bundles/tools.vitruv.change.propagation/src/tools/vitruv/change/propagation/ResourceAccess.java +++ b/utils/src/main/java/tools/vitruv/change/utils/ResourceAccess.java @@ -1,11 +1,11 @@ -package tools.vitruv.change.propagation; +package tools.vitruv.change.utils; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; /** - * Offers possibilities for resource access and persistence during change propagation. + * Offers possibilities for resource access and persistence. */ public interface ResourceAccess { /** diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/activeannotations/ModelCreators.xtend b/utils/src/main/xtend/tools/vitruv/change/utils/activeannotations/ModelCreators.xtend similarity index 99% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/activeannotations/ModelCreators.xtend rename to utils/src/main/xtend/tools/vitruv/change/utils/activeannotations/ModelCreators.xtend index 275f52ec..a537ed37 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/activeannotations/ModelCreators.xtend +++ b/utils/src/main/xtend/tools/vitruv/change/utils/activeannotations/ModelCreators.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.activeannotations +package tools.vitruv.change.utils.activeannotations import org.eclipse.xtend.lib.macro.Active import java.lang.annotation.Target diff --git a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/activeannotations/WithGeneratedRandomIds.xtend b/utils/src/main/xtend/tools/vitruv/change/utils/activeannotations/WithGeneratedRandomIds.xtend similarity index 98% rename from bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/activeannotations/WithGeneratedRandomIds.xtend rename to utils/src/main/xtend/tools/vitruv/change/utils/activeannotations/WithGeneratedRandomIds.xtend index 7c24bf64..68992a1f 100644 --- a/bundles/tools.vitruv.testutils/src/tools/vitruv/testutils/activeannotations/WithGeneratedRandomIds.xtend +++ b/utils/src/main/xtend/tools/vitruv/change/utils/activeannotations/WithGeneratedRandomIds.xtend @@ -1,4 +1,4 @@ -package tools.vitruv.testutils.activeannotations +package tools.vitruv.change.utils.activeannotations import org.eclipse.xtend.lib.macro.Active import java.lang.annotation.Target