From 5d8f0b94b7c5d38d5aba3f0e299f8f3ed010306a Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Mon, 10 Feb 2014 18:32:05 +0400
Subject: [PATCH] Move groovy importers to
 org.jetbrains.idea.maven.plugins.groovy package

---
 .../{importing => plugins/groovy}/GroovyGmavenImporter.java | 2 +-
 .../maven/{importing => plugins/groovy}/GroovyImporter.java | 5 ++++-
 .../{importing => plugins/groovy}/Groovy_1_0_Importer.java  | 2 +-
 .../groovy}/Groovy_1_1_plus_Importer.java                   | 2 +-
 .../maven/src/main/resources/META-INF/groovy-support.xml    | 6 +++---
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{importing => plugins/groovy}/GroovyGmavenImporter.java (93%)
 rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{importing => plugins/groovy}/GroovyImporter.java (92%)
 rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{importing => plugins/groovy}/Groovy_1_0_Importer.java (93%)
 rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{importing => plugins/groovy}/Groovy_1_1_plus_Importer.java (93%)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/GroovyGmavenImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyGmavenImporter.java
similarity index 93%
rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/GroovyGmavenImporter.java
rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyGmavenImporter.java
index 244593bf8b0e..133515ed5900 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/GroovyGmavenImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyGmavenImporter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.idea.maven.importing;
+package org.jetbrains.idea.maven.plugins.groovy;
 
 public class GroovyGmavenImporter extends GroovyImporter {
   public GroovyGmavenImporter() {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/GroovyImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyImporter.java
similarity index 92%
rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/GroovyImporter.java
rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyImporter.java
index d4c4628c1db4..160893284057 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/GroovyImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/GroovyImporter.java
@@ -1,8 +1,11 @@
-package org.jetbrains.idea.maven.importing;
+package org.jetbrains.idea.maven.plugins.groovy;
 
 import com.intellij.openapi.module.Module;
 import com.intellij.util.PairConsumer;
 import org.jdom.Element;
+import org.jetbrains.idea.maven.importing.MavenImporter;
+import org.jetbrains.idea.maven.importing.MavenModifiableModelsProvider;
+import org.jetbrains.idea.maven.importing.MavenRootModelAdapter;
 import org.jetbrains.idea.maven.project.MavenProject;
 import org.jetbrains.idea.maven.project.MavenProjectChanges;
 import org.jetbrains.idea.maven.project.MavenProjectsProcessorTask;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/Groovy_1_0_Importer.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/Groovy_1_0_Importer.java
similarity index 93%
rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/Groovy_1_0_Importer.java
rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/Groovy_1_0_Importer.java
index d80e9946a2b2..b92f016914cc 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/Groovy_1_0_Importer.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/Groovy_1_0_Importer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.idea.maven.importing;
+package org.jetbrains.idea.maven.plugins.groovy;
 
 public class Groovy_1_0_Importer extends GroovyImporter {
   public Groovy_1_0_Importer() {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/Groovy_1_1_plus_Importer.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/Groovy_1_1_plus_Importer.java
similarity index 93%
rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/Groovy_1_1_plus_Importer.java
rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/Groovy_1_1_plus_Importer.java
index 9b50a7ba6e0e..cb8fb92ae685 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/Groovy_1_1_plus_Importer.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/plugins/groovy/Groovy_1_1_plus_Importer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.idea.maven.importing;
+package org.jetbrains.idea.maven.plugins.groovy;
 
 public class Groovy_1_1_plus_Importer extends GroovyImporter {
   public Groovy_1_1_plus_Importer() {
diff --git a/plugins/maven/src/main/resources/META-INF/groovy-support.xml b/plugins/maven/src/main/resources/META-INF/groovy-support.xml
index bbd27cb36d87..3dc7ba1eebdb 100644
--- a/plugins/maven/src/main/resources/META-INF/groovy-support.xml
+++ b/plugins/maven/src/main/resources/META-INF/groovy-support.xml
@@ -1,8 +1,8 @@
 <idea-plugin url="http://www.jetbrains.com/idea">
   <extensions defaultExtensionNs="org.jetbrains.idea.maven">
-    <importer implementation="org.jetbrains.idea.maven.importing.Groovy_1_0_Importer"/>
-    <importer implementation="org.jetbrains.idea.maven.importing.Groovy_1_1_plus_Importer"/>
-    <importer implementation="org.jetbrains.idea.maven.importing.GroovyGmavenImporter"/>
+    <importer implementation="org.jetbrains.idea.maven.plugins.groovy.Groovy_1_0_Importer"/>
+    <importer implementation="org.jetbrains.idea.maven.plugins.groovy.Groovy_1_1_plus_Importer"/>
+    <importer implementation="org.jetbrains.idea.maven.plugins.groovy.GroovyGmavenImporter"/>
 
     <pluginDescriptor mavenId="org.codehaus.groovy.maven:gmaven-plugin">
       <param name="source" languageProvider="org.jetbrains.idea.maven.plugins.groovy.MavenGroovyLanguageProvider"/>