From c4598c24a71e1386aa738d655cd9b5fa0c27d222 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 15 Jul 2013 18:26:52 +0200
Subject: [PATCH] remove inspectiongadgets. intentionpowerpack and
 generate-tostring modules

---
 .idea/modules.xml                              |  4 ----
 build/scripts/layouts.gant                     |  5 -----
 java/java-analysis-impl/java-analysis-impl.iml |  3 +++
 java/java-impl/java-impl.iml                   | 15 +++++++++++++++
 java/java-tests/java-tests.iml                 |  2 --
 plugins/groovy/jetgroovy.iml                   |  1 -
 resources/resources.iml                        |  3 ---
 xml/tests/xml-tests.iml                        |  1 -
 8 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index c9b64c74cd29..ca8fa849b426 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,13 +3,10 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/plugins/ByteCodeViewer/ByteCodeViewer.iml" filepath="$PROJECT_DIR$/plugins/ByteCodeViewer/ByteCodeViewer.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/InspectionGadgets/InspectionGadgetsAnalysis/InspectionGadgetsAnalysis.iml" filepath="$PROJECT_DIR$/plugins/InspectionGadgets/InspectionGadgetsAnalysis/InspectionGadgetsAnalysis.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml" filepath="$PROJECT_DIR$/plugins/InspectionGadgets/InspectionGadgetsPlugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang.iml" group="plugins/IntelliLang" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-java.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-java.iml" group="plugins/IntelliLang" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-javaee.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-javaee.iml" group="plugins/IntelliLang" />
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-xml.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-xml.iml" group="plugins/IntelliLang" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml" filepath="$PROJECT_DIR$/plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/RegExpSupport/RegExpSupport.iml" filepath="$PROJECT_DIR$/RegExpSupport/RegExpSupport.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" filepath="$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" group="platform" />
@@ -55,7 +52,6 @@
       <module fileurl="file://$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" filepath="$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" filepath="$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" filepath="$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" group="platform" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/generate-tostring/generate-tostring.iml" filepath="$PROJECT_DIR$/plugins/generate-tostring/generate-tostring.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/git4idea.iml" filepath="$PROJECT_DIR$/plugins/git4idea/git4idea.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/rt/git4idea-rt.iml" filepath="$PROJECT_DIR$/plugins/git4idea/rt/git4idea-rt.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/github.iml" filepath="$PROJECT_DIR$/plugins/github/github.iml" group="plugins" />
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 3e48237f3209..87f5f6dc6528 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -80,10 +80,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "platform-main",
     "testFramework",
     "tests_bootstrap",
-    "InspectionGadgetsAnalysis",
-    "InspectionGadgetsPlugin",
-    "IntentionPowerPackPlugin",
-    "generate-tostring",
           ].flatten()
 
   ant.patternset(id: "resources.included") {
@@ -762,7 +758,6 @@ def layout_core_upsource(String home, String target) {
       module("analysis-impl")
       module("java-analysis-api")
       module("java-analysis-impl")
-      module("InspectionGadgetsAnalysis")
       module("xml-psi-api")
       module("xml-psi-impl")
       module("resources")
diff --git a/java/java-analysis-impl/java-analysis-impl.iml b/java/java-analysis-impl/java-analysis-impl.iml
index ad06d8cb0445..10896739e203 100644
--- a/java/java-analysis-impl/java-analysis-impl.iml
+++ b/java/java-analysis-impl/java-analysis-impl.iml
@@ -5,6 +5,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
+    <content url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/InspectionGadgetsAnalysis">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/InspectionGadgetsAnalysis/src" isTestSource="false" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="analysis-impl" exported="" />
diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index bf44242b28b0..0e65b921e41f 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -5,6 +5,19 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
+    <content url="file://$MODULE_DIR$/../../plugins/InspectionGadgets">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/testsrc" isTestSource="true" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../plugins/IntentionPowerPak">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/IntentionPowerPak/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/IntentionPowerPak/testSrc" isTestSource="true" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../plugins/generate-tostring">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/testSrc" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/resources" isTestSource="false" />
+    </content>
     <orderEntry type="module" module-name="boot" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -37,6 +50,8 @@
     <orderEntry type="library" name="asm4" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="Xerces" level="project" />
+    <orderEntry type="library" name="Velocity" level="project" />
+    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/java/java-tests/java-tests.iml b/java/java-tests/java-tests.iml
index eb7ea3108a08..e7dbd3d1515a 100644
--- a/java/java-tests/java-tests.iml
+++ b/java/java-tests/java-tests.iml
@@ -27,8 +27,6 @@
     <orderEntry type="module" module-name="eclipse" scope="TEST" />
     <orderEntry type="module" module-name="execution-openapi" />
     <orderEntry type="module" module-name="platform-tests" scope="TEST" />
-    <orderEntry type="module" module-name="IntentionPowerPackPlugin" scope="TEST" />
-    <orderEntry type="module" module-name="InspectionGadgetsPlugin" scope="TEST" />
     <orderEntry type="module" module-name="java-indexing-api" scope="TEST" />
     <orderEntry type="module" module-name="external-system-impl" scope="RUNTIME" />
   </component>
diff --git a/plugins/groovy/jetgroovy.iml b/plugins/groovy/jetgroovy.iml
index 38452af447cc..d8531aeafeda 100644
--- a/plugins/groovy/jetgroovy.iml
+++ b/plugins/groovy/jetgroovy.iml
@@ -31,7 +31,6 @@
     <orderEntry type="module" module-name="IntelliLang-xml" scope="TEST" />
     <orderEntry type="module" module-name="jps-builders" />
     <orderEntry type="module" module-name="spellchecker" />
-    <orderEntry type="module" module-name="InspectionGadgetsPlugin" scope="TEST" />
     <orderEntry type="module" module-name="junit" scope="TEST" />
     <orderEntry type="module" module-name="java-indexing-api" />
     <orderEntry type="module" module-name="groovy-jps-plugin" />
diff --git a/resources/resources.iml b/resources/resources.iml
index 0e8c4a289246..cdb317ece799 100644
--- a/resources/resources.iml
+++ b/resources/resources.iml
@@ -12,10 +12,7 @@
     <orderEntry type="module" module-name="images" exported="" />
     <orderEntry type="module" module-name="community-resources" exported="" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="InspectionGadgetsPlugin" />
-    <orderEntry type="module" module-name="IntentionPowerPackPlugin" />
     <orderEntry type="module" module-name="remote-servers-impl" exported="" scope="RUNTIME" />
-    <orderEntry type="module" module-name="generate-tostring" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/xml/tests/xml-tests.iml b/xml/tests/xml-tests.iml
index d196eb2f2d56..a6274e349d36 100644
--- a/xml/tests/xml-tests.iml
+++ b/xml/tests/xml-tests.iml
@@ -18,7 +18,6 @@
     <orderEntry type="module" module-name="xpath" scope="TEST" />
     <orderEntry type="module" module-name="dom-impl" scope="TEST" />
     <orderEntry type="library" name="XmlBeans" level="project" />
-    <orderEntry type="module" module-name="InspectionGadgetsPlugin" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>