[533848] Merges query.tooling.ui and query.tooling.migrator plugins

Change-Id: Ibccb326eeea2b16e14243c8a12bd34b04b3bace6
Signed-off-by: Zoltan Ujhelyi <zoltan.ujhelyi@incquerylabs.com>

23 files changed, 146 insertions, 321 deletions

diff --git a/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml b/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml
index 8601eb258..16f9a68a5 100644
--- a/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml
+++ b/query/features/org.eclipse.viatra.query.sdk.feature/feature.xml
@@ -119,13 +119,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.viatra.query.tooling.migrator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.viatra.transformation.ui"
          download-size="0"
          install-size="0"
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/.classpath b/query/plugins/org.eclipse.viatra.query.tooling.migrator/.classpath
deleted file mode 100644
index 556028443..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry excluding="**.gitignore" kind="src" path="xtend-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/.project b/query/plugins/org.eclipse.viatra.query.tooling.migrator/.project
deleted file mode 100644
index 1c0658189..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.viatra.query.tooling.migrator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/.settings/org.eclipse.jdt.core.prefs b/query/plugins/org.eclipse.viatra.query.tooling.migrator/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dc..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/.settings/org.sonarlint.eclipse.core.prefs b/query/plugins/org.eclipse.viatra.query.tooling.migrator/.settings/org.sonarlint.eclipse.core.prefs
deleted file mode 100644
index bd759389e..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/.settings/org.sonarlint.eclipse.core.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-autoEnabled=true
-eclipse.preferences.version=1
-extraProperties=
-moduleKey=org.eclipse.viatra\:org.eclipse.viatra.query.tooling.migrator
-projectKey=org.eclipse.viatra\:org.eclipse.viatra.parent.all
-serverId=build
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.migrator/META-INF/MANIFEST.MF
deleted file mode 100644
index 1c39c30ce..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: VIATRA Query Migrator
-Bundle-SymbolicName: org.eclipse.viatra.query.tooling.migrator;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.viatra.migrator.MigratorPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.xtend.lib;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.core.resources,
- org.eclipse.jdt.core;bundle-version="3.10.0",
- org.eclipse.text,
- org.eclipse.core.filebuffers,
- org.eclipse.viatra.query.tooling.core;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.viatra.query.tooling.ui;bundle-version="[2.1.0,2.2.0)",
- org.eclipse.core.expressions,
- org.eclipse.xtext.ui;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.pde.core;bundle-version="3.7.0",
- org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="2.0.0",
- org.eclipse.xtext.builder
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.log4j;version="1.2.15"
-Bundle-Vendor: Eclipse VIATRA Project
-Automatic-Module-Name: org.eclipse.viatra.query.tooling.migrator
-
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/about.html b/query/plugins/org.eclipse.viatra.query.tooling.migrator/about.html
deleted file mode 100644
index d8e198403..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/about.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/build.properties b/query/plugins/org.eclipse.viatra.query.tooling.migrator/build.properties
deleted file mode 100644
index 36523bc51..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/,xtend-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html
-src.includes = about.html
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/plugin.xml b/query/plugins/org.eclipse.viatra.query.tooling.migrator/plugin.xml
deleted file mode 100644
index ddd272f46..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/plugin.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.migrator.api.command"
-            name="Migrate IncQuery API to VIATRA Queries">
-      </command>
-      <command
-            categoryId="org.eclipse.viatra.query.tooling.category"
-            id="org.eclipse.viatra.query.tooling.migrator.metadata.command"
-            name="Add VIATRA Query Nature">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.ui.projectConfigure?after=additions">
-         <command
-               commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command"
-               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-               label="Update Query Project"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <iterate>
-                  <adapt
-                           type="org.eclipse.core.resources.IProject">
-                     <and>
-                        <test
-                              property="org.eclipse.core.resources.open"
-                              value="true">
-                        </test>
-                        <test
-                              property="org.eclipse.viatra.query.tooling.migrator.outdated">
-                        </test>
-                        <test
-                              property="org.eclipse.core.resources.projectNature"
-                              value="org.eclipse.incquery.projectnature">
-                        </test>
-                     </and>
-                  </adapt>
-               </iterate>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command"
-               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-               label="Convert to VIATRA Query Project"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <iterate>
-                  <adapt
-                           type="org.eclipse.core.resources.IProject">
-                     <and>
-                        <test
-                              property="org.eclipse.core.resources.open"
-                              value="true">
-                        </test>
-                        <test
-                              property="org.eclipse.viatra.query.tooling.migrator.outdated">
-                        </test>
-                        <not>
-                           <test
-                                 property="org.eclipse.core.resources.projectNature"
-                                 value="org.eclipse.incquery.projectnature">
-                           </test>
-                        </not>
-                     </and>
-                  </adapt>
-               </iterate>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.viatra.query.tooling.migrator.api.command"
-               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
-               label="Replace EMF-IncQuery API Usage"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <iterate>
-                  <adapt
-                        type="org.eclipse.core.resources.IProject">
-                     <and>
-                        <test
-                              property="org.eclipse.core.resources.open"
-                              value="true">
-                        </test>
-                        <test
-                              property="org.eclipse.core.resources.projectNature"
-                              value="org.eclipse.jdt.core.javanature">
-                        </test>
-                        <not>
-                           <and>
-                              <test
-                                    property="org.eclipse.viatra.query.tooling.migrator.outdated">
-                              </test>
-                              <test
-                                    property="org.eclipse.core.resources.projectNature"
-                                    value="org.eclipse.viatra.query.projectnature">
-                              </test>
-                           </and>
-                        </not>
-                     </and>
-                  </adapt>
-               </iterate>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.viatra.query.patternlanguage.emf.ui.ReusablePatternLanguageExecutableExtensionFactory:org.eclipse.viatra.migrator.metadata.ProjectNatureUpdater"
-            commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command">
-      </handler>
-      <handler
-            class="org.eclipse.viatra.migrator.MigrateProjectHandler"
-            commandId="org.eclipse.viatra.query.tooling.migrator.api.command">
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.eclipse.viatra.migrator.properties.QueryProjectVersionTester"
-            id="org.eclipse.viatra.query.tooling.migrator.projectPropertyTester"
-            namespace="org.eclipse.viatra.query.tooling.migrator"
-            properties="outdated"
-            type="org.eclipse.core.resources.IProject">
-      </propertyTester>
-   </extension>
-</plugin>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/pom.xml b/query/plugins/org.eclipse.viatra.query.tooling.migrator/pom.xml
deleted file mode 100644
index f8a118987..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>org.eclipse.viatra.parent.all</artifactId>
-        <groupId>org.eclipse.viatra</groupId>
-        <version>2.1.0-SNAPSHOT</version>
-        <relativePath>../../../releng/org.eclipse.viatra.parent.all/pom.xml</relativePath>
-    </parent>
-    <artifactId>org.eclipse.viatra.query.tooling.migrator</artifactId>
-    <packaging>eclipse-plugin</packaging>
-    <build>
-        <resources>
-            <resource>
-                <directory>src</directory>
-            </resource>
-            <resource>
-                <directory>xtend-gen</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>xtend-gen</directory>
-                            <excludes>
-                                <exclude>.gitignore</exclude>
-                            </excludes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>xtend-maven-plugin</artifactId>
-                <version>${xtend.compiler.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/xtend-gen/.gitignore b/query/plugins/org.eclipse.viatra.query.tooling.migrator/xtend-gen/.gitignore
deleted file mode 100644
index c96a04f00..000000000
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/xtend-gen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.viatra.query.tooling.ui/META-INF/MANIFEST.MF
index 3df2ca749..592192e18 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/META-INF/MANIFEST.MF
@@ -36,7 +36,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.viatra.query.runtime.ui;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.viatra.transformation.evm;bundle-version="[2.1.0,2.2.0)",
  org.eclipse.ui.views.properties.tabbed,
- org.eclipse.xtend.lib
+ org.eclipse.xtend.lib,
+ org.eclipse.pde.core;bundle-version="3.7.0"
 Bundle-Activator: org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.viatra.query.tooling.ui,
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml b/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml
index a0862783f..bec589da1 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/plugin.xml
@@ -849,4 +849,136 @@
             type="java.lang.Object">
       </propertyTester>
    </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.migrator.api.command"
+            name="Migrate IncQuery API to VIATRA Queries">
+      </command>
+      <command
+            categoryId="org.eclipse.viatra.query.tooling.category"
+            id="org.eclipse.viatra.query.tooling.migrator.metadata.command"
+            name="Add VIATRA Query Nature">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.ui.projectConfigure?after=additions">
+         <command
+               commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command"
+               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+               label="Update Query Project"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <iterate>
+                  <adapt
+                           type="org.eclipse.core.resources.IProject">
+                     <and>
+                        <test
+                              property="org.eclipse.core.resources.open"
+                              value="true">
+                        </test>
+                        <test
+                              property="org.eclipse.viatra.query.tooling.migrator.outdated">
+                        </test>
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.incquery.projectnature">
+                        </test>
+                     </and>
+                  </adapt>
+               </iterate>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command"
+               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+               label="Convert to VIATRA Query Project"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <iterate>
+                  <adapt
+                           type="org.eclipse.core.resources.IProject">
+                     <and>
+                        <test
+                              property="org.eclipse.core.resources.open"
+                              value="true">
+                        </test>
+                        <test
+                              property="org.eclipse.viatra.query.tooling.migrator.outdated">
+                        </test>
+                        <not>
+                           <test
+                                 property="org.eclipse.core.resources.projectNature"
+                                 value="org.eclipse.incquery.projectnature">
+                           </test>
+                        </not>
+                     </and>
+                  </adapt>
+               </iterate>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.viatra.query.tooling.migrator.api.command"
+               icon="platform:/plugin/org.eclipse.viatra.query.tooling.ui/icons/logo2.png"
+               label="Replace EMF-IncQuery API Usage"
+               style="push">
+            <visibleWhen
+                  checkEnabled="false">
+               <iterate>
+                  <adapt
+                        type="org.eclipse.core.resources.IProject">
+                     <and>
+                        <test
+                              property="org.eclipse.core.resources.open"
+                              value="true">
+                        </test>
+                        <test
+                              property="org.eclipse.core.resources.projectNature"
+                              value="org.eclipse.jdt.core.javanature">
+                        </test>
+                        <not>
+                           <and>
+                              <test
+                                    property="org.eclipse.viatra.query.tooling.migrator.outdated">
+                              </test>
+                              <test
+                                    property="org.eclipse.core.resources.projectNature"
+                                    value="org.eclipse.viatra.query.projectnature">
+                              </test>
+                           </and>
+                        </not>
+                     </and>
+                  </adapt>
+               </iterate>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.viatra.query.patternlanguage.emf.ui.ReusablePatternLanguageExecutableExtensionFactory:org.eclipse.viatra.migrator.metadata.ProjectNatureUpdater"
+            commandId="org.eclipse.viatra.query.tooling.migrator.metadata.command">
+      </handler>
+      <handler
+            class="org.eclipse.viatra.query.tooling.ui.migrator.MigrateProjectHandler"
+            commandId="org.eclipse.viatra.query.tooling.migrator.api.command">
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.eclipse.viatra.query.tooling.ui.migrator.properties.QueryProjectVersionTester"
+            id="org.eclipse.viatra.query.tooling.migrator.projectPropertyTester"
+            namespace="org.eclipse.viatra.query.tooling.migrator"
+            properties="outdated"
+            type="org.eclipse.core.resources.IProject">
+      </propertyTester>
+   </extension>
 </plugin>
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/FileStringReplacer.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/FileStringReplacer.java
index 3ec0ca2dd..574a325fe 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/FileStringReplacer.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/FileStringReplacer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Balazs Grill - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator;
+package org.eclipse.viatra.query.tooling.ui.migrator;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/JavaProjectMigrator.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigrator.xtend
index bfe9f5636..f1f728bbf 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/JavaProjectMigrator.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigrator.xtend
@@ -8,7 +8,7 @@
  * Contributors:
  *   Balazs Grill - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator
+package org.eclipse.viatra.query.tooling.ui.migrator
 
 import java.util.Map
 import java.util.Map.Entry
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/JavaProjectMigratorData.xtend b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigratorData.xtend
index dd7a9bd91..3c0fe86fa 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/JavaProjectMigratorData.xtend
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/JavaProjectMigratorData.xtend
@@ -8,7 +8,7 @@
  * Contributors:
  *   Balazs Grill - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator
+package org.eclipse.viatra.query.tooling.ui.migrator
 
 import java.util.Comparator
 import java.util.Map
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/MigrateProjectHandler.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigrateProjectHandler.java
index 4b801164f..9b1cf53d4 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/MigrateProjectHandler.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigrateProjectHandler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Balazs Grill - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator;
+package org.eclipse.viatra.query.tooling.ui.migrator;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/MigratorConstants.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorConstants.java
index 653a2b7c4..854be3901 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/MigratorConstants.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorConstants.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Zoltan Ujhelyi, Balazs Grill - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator;
+package org.eclipse.viatra.query.tooling.ui.migrator;
 
 import com.google.common.collect.ImmutableList;
 
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/MigratorPlugin.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorPlugin.java
index 49f10e1ec..0415598c4 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/MigratorPlugin.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/MigratorPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Balazs Grill - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator;
+package org.eclipse.viatra.query.tooling.ui.migrator;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/metadata/NatureUpdaterJob.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/NatureUpdaterJob.java
index 28b989905..0bcbc544f 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/metadata/NatureUpdaterJob.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/NatureUpdaterJob.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator.metadata;
+package org.eclipse.viatra.query.tooling.ui.migrator.metadata;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,10 +28,10 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.pde.internal.core.natures.PDE;
-import org.eclipse.viatra.migrator.MigratorConstants;
 import org.eclipse.viatra.query.tooling.core.project.ProjectGenerationHelper;
 import org.eclipse.viatra.query.tooling.core.project.ViatraQueryNature;
 import org.eclipse.viatra.query.tooling.ui.ViatraQueryGUIPlugin;
+import org.eclipse.viatra.query.tooling.ui.migrator.MigratorConstants;
 import org.eclipse.xtext.builder.EclipseOutputConfigurationProvider;
 import org.eclipse.xtext.ui.XtextProjectHelper;
 import org.eclipse.xtext.xbase.lib.Pair;
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/metadata/ProjectNatureUpdater.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/ProjectNatureUpdater.java
index 562df3eb6..55ed18403 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/metadata/ProjectNatureUpdater.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/metadata/ProjectNatureUpdater.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator.metadata;
+package org.eclipse.viatra.query.tooling.ui.migrator.metadata;
 
 import javax.inject.Inject;
 
@@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.viatra.migrator.MigratorConstants;
+import org.eclipse.viatra.query.tooling.ui.migrator.MigratorConstants;
 import org.eclipse.xtext.builder.EclipseOutputConfigurationProvider;
 
 /**
diff --git a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/properties/QueryProjectVersionTester.java b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/properties/QueryProjectVersionTester.java
index b5ee93993..fe7a0760e 100644
--- a/query/plugins/org.eclipse.viatra.query.tooling.migrator/src/org/eclipse/viatra/migrator/properties/QueryProjectVersionTester.java
+++ b/query/plugins/org.eclipse.viatra.query.tooling.ui/src/org/eclipse/viatra/query/tooling/ui/migrator/properties/QueryProjectVersionTester.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.viatra.migrator.properties;
+package org.eclipse.viatra.query.tooling.ui.migrator.properties;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.expressions.PropertyTester;
@@ -19,8 +19,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.pde.internal.core.natures.PDE;
-import org.eclipse.viatra.migrator.MigratorConstants;
 import org.eclipse.viatra.query.tooling.core.project.ViatraQueryNature;
+import org.eclipse.viatra.query.tooling.ui.migrator.MigratorConstants;
 import org.eclipse.xtext.ui.XtextProjectHelper;
 
 /**
diff --git a/releng/org.eclipse.viatra.parent.all/pom.xml b/releng/org.eclipse.viatra.parent.all/pom.xml
index d1fa7e9c3..74ecfa35a 100644
--- a/releng/org.eclipse.viatra.parent.all/pom.xml
+++ b/releng/org.eclipse.viatra.parent.all/pom.xml
@@ -21,7 +21,6 @@
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.core</module>
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.ui</module>
 		<module>../../query/plugins/org.eclipse.viatra.query.tooling.debug</module>
-		<module>../../query/plugins/org.eclipse.viatra.query.tooling.migrator</module>
 		<module>../../query/tests/org.eclipse.viatra.query.patternlanguage.emf.tests</module>
 		<module>../../query/tests/org.eclipse.viatra.query.patternlanguage.emf.ui.tests</module>
 		<module>../../query/tests/org.eclipse.viatra.query.runtime.tests</module>