IDEA project configuration: the great module rename

Rename all modules in IntelliJ IDEA sources to ensure that they follow a consistent naming scheme.

Update *.iml files.

diff --git a/RegExpSupport/intellij.regexp.iml b/RegExpSupport/intellij.regexp.iml
index 7b4edc9cc7cca57055d9aca3080deee2a7db2497..531b22c52adc992c28c7b15640580c9d0de212e1 100644 (file)
--- a/RegExpSupport/intellij.regexp.iml
+++ b/RegExpSupport/intellij.regexp.iml
@@ -10,15 +10,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="Jaxen" level="project" />
-    <orderEntry type="module" module-name="dom-impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="relaxng" scope="RUNTIME" />
-    <orderEntry type="module" module-name="spellchecker" scope="RUNTIME" />
-    <orderEntry type="module" module-name="xdebugger-impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="xml-psi-api" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.relaxng" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.xml.psi" />
   </component>
 </module>
\ No newline at end of file

diff --git a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
index fa0e95e03449f190e6d74ff3dd31fc0c1855fd2a..93271f01d2885e3b262a6e6774ea1bcf2d23a370 100644 (file)
--- a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
+++ b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
@@ -31,6 +31,6 @@
     <orderEntry type="library" exported="" name="commons-codec" level="project" />
     <orderEntry type="library" exported="" name="commons-logging" level="project" />
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/build/cucumber-test-runner/intellij.cucumber.testRunner.iml b/build/cucumber-test-runner/intellij.cucumber.testRunner.iml
index f5614064520818b382131302a2706365664b3cf8..e6a27d2b64e772a9dc3df0821995bbc8560e207f 100644 (file)
--- a/build/cucumber-test-runner/intellij.cucumber.testRunner.iml
+++ b/build/cucumber-test-runner/intellij.cucumber.testRunner.iml
@@ -7,9 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="library" scope="PROVIDED" name="cucumber-core" level="project" />
-    <orderEntry type="module" module-name="cucumber-jvm-formatter" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.cucumber.jvmFormatter" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file

diff --git a/build/dependencies/intellij.tools.dependencies.iml b/build/dependencies/intellij.tools.dependencies.iml
index d028e590588b0ac1dddc404d1b59c7651f3e682b..8b673937a29621097eac28b8dd0a903381955654 100644 (file)
--- a/build/dependencies/intellij.tools.dependencies.iml
+++ b/build/dependencies/intellij.tools.dependencies.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="dependencies" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.intellij.build" external.system.module.version="1.0" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

diff --git a/build/intellij.ideaCommunity.build.iml b/build/intellij.ideaCommunity.build.iml
index bb3bdd92a5aabace22fb0f3f43121a59a209bb92..60fe8409a8da191282aaf995865ece656c25bb79 100644 (file)
--- a/build/intellij.ideaCommunity.build.iml
+++ b/build/intellij.ideaCommunity.build.iml
@@ -21,8 +21,8 @@
     <orderEntry type="library" scope="RUNTIME" name="Log4J" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="jna" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="jps-model-api" exported="" />
-    <orderEntry type="module" module-name="jps-standalone-builder" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" exported="" />
+    <orderEntry type="module" module-name="intellij.tools.jps.build.standalone" exported="" />
     <orderEntry type="module-library" exported="" scope="PROVIDED">
       <library name="commons-cli" type="repository">
         <properties maven-id="commons-cli:commons-cli:1.2" />
@@ -35,11 +35,11 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="antlayout" exported="" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="platform-build-scripts" exported="" />
-    <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="RUNTIME" />
-    <orderEntry type="module" module-name="groovy-jps-plugin" scope="RUNTIME" />
-    <orderEntry type="module" module-name="groovy_rt" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.tools.jps.antTasks" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.buildScripts" exported="" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.jps" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.groovy.jps" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.groovy.rt" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file

diff --git a/community-guitests/intellij.ideaCommunity.guiTests.iml b/community-guitests/intellij.ideaCommunity.guiTests.iml
index aa84c9d6b94f2a39899be7eda3e9835f5dd8901e..db96db967c77f350b61169e14a72970a64935d12 100644 (file)
--- a/community-guitests/intellij.ideaCommunity.guiTests.iml
+++ b/community-guitests/intellij.ideaCommunity.guiTests.iml
@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="community-main" />
-    <orderEntry type="module" module-name="testGuiFramework" />
-    <orderEntry type="module" module-name="diff-impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.ideaCommunity.main" />
+    <orderEntry type="module" module-name="intellij.platform.testGuiFramework" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/images/intellij.platform.images.iml b/images/intellij.platform.images.iml
index 96fd8bf99ba0562ac0cb490ec2c5b6e8fb88d328..3c5cdf3d8354a1faa642b39a64b17477398f90c9 100644 (file)
--- a/images/intellij.platform.images.iml
+++ b/images/intellij.platform.images.iml
@@ -7,9 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="library" name="commons-imaging" level="project" />
-    <orderEntry type="module" module-name="xml-psi-impl" />
+    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/intellij.ideaCommunity.main.iml b/intellij.ideaCommunity.main.iml
index ce6a0da2ea5d8a6dec794c0c8897660090ece988..72bf1896afdd8c3660e6e0914fe559b8c9204138 100644 (file)
--- a/intellij.ideaCommunity.main.iml
+++ b/intellij.ideaCommunity.main.iml
@@ -5,125 +5,125 @@
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="android" />
-    <orderEntry type="module" module-name="ant" />
-    <orderEntry type="module" module-name="boot" />
-    <orderEntry type="module" module-name="bootstrap" />
-    <orderEntry type="module" module-name="annotations" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="debugger-impl" />
-    <orderEntry type="module" module-name="debugger-openapi" />
-    <orderEntry type="module" module-name="diff-api" />
-    <orderEntry type="module" module-name="diff-impl" />
-    <orderEntry type="module" module-name="dom-impl" />
-    <orderEntry type="module" module-name="dom-openapi" />
-    <orderEntry type="module" module-name="execution-impl" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="extensions" />
-    <orderEntry type="module" module-name="forms_rt" />
-    <orderEntry type="module" module-name="icons" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="commander" />
-    <orderEntry type="module" module-name="jsp-openapi" />
-    <orderEntry type="module" module-name="jsp-spi" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="lvcs-api" />
-    <orderEntry type="module" module-name="lvcs-impl" />
-    <orderEntry type="module" module-name="instrumentation-util" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="platform-main" />
-    <orderEntry type="module" module-name="platform-resources" />
-    <orderEntry type="module" module-name="platform-resources-en" />
-    <orderEntry type="module" module-name="properties" />
-    <orderEntry type="module" module-name="resources" />
-    <orderEntry type="module" module-name="resources-en" />
-    <orderEntry type="module" module-name="spellchecker" />
-    <orderEntry type="module" module-name="jsp-base-openapi" />
-    <orderEntry type="module" module-name="testFramework-java" />
-    <orderEntry type="module" module-name="testRunner" />
-    <orderEntry type="module" module-name="usageView" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="module" module-name="vcs-impl" />
-    <orderEntry type="module" module-name="xdebugger-api" />
-    <orderEntry type="module" module-name="xdebugger-impl" />
-    <orderEntry type="module" module-name="xml" />
-    <orderEntry type="module" module-name="xml-openapi" />
-    <orderEntry type="module" module-name="community-resources" />
-    <orderEntry type="module" module-name="java-tests" scope="TEST" />
-    <orderEntry type="module" module-name="copyright" />
-    <orderEntry type="module" module-name="cvs-plugin" />
-    <orderEntry type="module" module-name="testFramework" />
-    <orderEntry type="module" module-name="ui-designer" />
-    <orderEntry type="module" module-name="devkit" />
-    <orderEntry type="module" module-name="eclipse" />
-    <orderEntry type="module" module-name="git4idea" />
-    <orderEntry type="module" module-name="images" />
-    <orderEntry type="module" module-name="jetgroovy" />
-    <orderEntry type="module" module-name="junit" />
-    <orderEntry type="module" module-name="maven" />
-    <orderEntry type="module" module-name="RegExpSupport" />
-    <orderEntry type="module" module-name="svn4idea" />
-    <orderEntry type="module" module-name="svn4idea-tests" scope="TEST" />
-    <orderEntry type="module" module-name="testng" />
-    <orderEntry type="module" module-name="IntelliLang-java" />
-    <orderEntry type="module" module-name="IntelliLang-xml" />
-    <orderEntry type="module" module-name="xpath" />
-    <orderEntry type="module" module-name="xslt-debugger" />
-    <orderEntry type="module" module-name="xslt-debugger-engine" />
-    <orderEntry type="module" module-name="java-i18n" />
-    <orderEntry type="module" module-name="tasks-api" />
-    <orderEntry type="module" module-name="tasks-java" />
-    <orderEntry type="module" module-name="tasks-tests" scope="TEST" />
-    <orderEntry type="module" module-name="github" />
-    <orderEntry type="module" module-name="hg4idea" />
-    <orderEntry type="module" module-name="relaxng" />
-    <orderEntry type="module" module-name="gradle" />
-    <orderEntry type="module" module-name="remote-servers-impl" />
-    <orderEntry type="module" module-name="dom-tests" scope="TEST" />
-    <orderEntry type="module" module-name="colorSchemes" />
-    <orderEntry type="module" module-name="javaFX-CE" />
-    <orderEntry type="module" module-name="javaFX-jps-plugin" />
-    <orderEntry type="module" module-name="IntelliLang-tests" scope="TEST" />
-    <orderEntry type="module" module-name="manifest" />
-    <orderEntry type="module" module-name="yaml" />
-    <orderEntry type="module" module-name="xml-tests" scope="TEST" />
-    <orderEntry type="module" module-name="devkit-jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="tasks-core" />
-    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
-    <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="jira" />
-    <orderEntry type="module" module-name="java-decompiler-plugin" />
-    <orderEntry type="module" module-name="structuralsearch" />
-    <orderEntry type="module" module-name="structuralsearch-java" />
-    <orderEntry type="module" module-name="structuralsearch-tests" scope="TEST" />
-    <orderEntry type="module" module-name="structuralsearch-groovy" />
-    <orderEntry type="module" module-name="json" />
-    <orderEntry type="module" module-name="json-tests" scope="TEST" />
-    <orderEntry type="module" module-name="typeMigration" />
-    <orderEntry type="module" module-name="platform-tests" scope="TEST" />
-    <orderEntry type="module" module-name="jps-model-tests" scope="TEST" />
-    <orderEntry type="module" module-name="diff-tests" scope="TEST" />
-    <orderEntry type="module" module-name="built-in-server-tests" scope="TEST" />
-    <orderEntry type="module" module-name="updater" scope="TEST" />
-    <orderEntry type="module" module-name="coverage" />
-    <orderEntry type="module" module-name="android-jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="script-debugger-ui" scope="TEST" />
-    <orderEntry type="module" module-name="remote-servers-git-java" />
-    <orderEntry type="module" module-name="terminal" />
-    <orderEntry type="module" module-name="javac-ref-scanner-8" scope="RUNTIME" />
-    <orderEntry type="module" module-name="platform-build-scripts" scope="TEST" />
-    <orderEntry type="module" module-name="images-build-scripts" scope="TEST" />
-    <orderEntry type="module" module-name="android-plugin" />
-    <orderEntry type="module" module-name="stats-collector" />
-    <orderEntry type="module" module-name="stream-debugger" />
-    <orderEntry type="module" module-name="jetCheck" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.android" />
+    <orderEntry type="module" module-name="intellij.ant" />
+    <orderEntry type="module" module-name="intellij.platform.boot" />
+    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.java.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" />
+    <orderEntry type="module" module-name="intellij.xml.dom" />
+    <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.platform.icons" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.commander" />
+    <orderEntry type="module" module-name="intellij.jsp" />
+    <orderEntry type="module" module-name="intellij.jsp.spi" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.main" />
+    <orderEntry type="module" module-name="intellij.platform.resources" />
+    <orderEntry type="module" module-name="intellij.platform.resources.en" />
+    <orderEntry type="module" module-name="intellij.properties" />
+    <orderEntry type="module" module-name="intellij.java.resources" />
+    <orderEntry type="module" module-name="intellij.java.resources.en" />
+    <orderEntry type="module" module-name="intellij.spellchecker" />
+    <orderEntry type="module" module-name="intellij.jsp.base" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" />
+    <orderEntry type="module" module-name="intellij.platform.usageView" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
+    <orderEntry type="module" module-name="intellij.xml" />
+    <orderEntry type="module" module-name="intellij.ideaCommunity.resources" />
+    <orderEntry type="module" module-name="intellij.java.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.copyright" />
+    <orderEntry type="module" module-name="intellij.vcs.cvs" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.designer" />
+    <orderEntry type="module" module-name="intellij.devkit" />
+    <orderEntry type="module" module-name="intellij.eclipse" />
+    <orderEntry type="module" module-name="intellij.vcs.git" />
+    <orderEntry type="module" module-name="intellij.platform.images" />
+    <orderEntry type="module" module-name="intellij.groovy" />
+    <orderEntry type="module" module-name="intellij.junit" />
+    <orderEntry type="module" module-name="intellij.maven" />
+    <orderEntry type="module" module-name="intellij.regexp" />
+    <orderEntry type="module" module-name="intellij.vcs.svn" />
+    <orderEntry type="module" module-name="intellij.vcs.svn.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.testng" />
+    <orderEntry type="module" module-name="intellij.java.langInjection" />
+    <orderEntry type="module" module-name="intellij.xml.langInjection" />
+    <orderEntry type="module" module-name="intellij.xpath" />
+    <orderEntry type="module" module-name="intellij.xslt.debugger" />
+    <orderEntry type="module" module-name="intellij.xslt.debugger.engine" />
+    <orderEntry type="module" module-name="intellij.java.i18n" />
+    <orderEntry type="module" module-name="intellij.tasks" />
+    <orderEntry type="module" module-name="intellij.tasks.java" />
+    <orderEntry type="module" module-name="intellij.tasks.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.vcs.github" />
+    <orderEntry type="module" module-name="intellij.vcs.hg" />
+    <orderEntry type="module" module-name="intellij.relaxng" />
+    <orderEntry type="module" module-name="intellij.gradle" />
+    <orderEntry type="module" module-name="intellij.platform.remoteServers.impl" />
+    <orderEntry type="module" module-name="intellij.xml.dom.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.colorSchemes" />
+    <orderEntry type="module" module-name="intellij.javaFX.community" />
+    <orderEntry type="module" module-name="intellij.javaFX.jps" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.manifest" />
+    <orderEntry type="module" module-name="intellij.yaml" />
+    <orderEntry type="module" module-name="intellij.xml.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.devkit.jps" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.tasks.core" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.jps" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.jps" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.tasks.jira" />
+    <orderEntry type="module" module-name="intellij.java.decompiler" />
+    <orderEntry type="module" module-name="intellij.platform.structuralSearch" />
+    <orderEntry type="module" module-name="intellij.java.structuralSearch" />
+    <orderEntry type="module" module-name="intellij.platform.structuralSearch.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.groovy.structuralSearch" />
+    <orderEntry type="module" module-name="intellij.json" />
+    <orderEntry type="module" module-name="intellij.json.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.typeMigration" />
+    <orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.diff.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.updater" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.coverage" />
+    <orderEntry type="module" module-name="intellij.android.jps" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.scriptDebugger.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.remoteServers.git" />
+    <orderEntry type="module" module-name="intellij.terminal" />
+    <orderEntry type="module" module-name="intellij.java.jps.javacRefScanner8" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.buildScripts" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.images.build" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.android.plugin" />
+    <orderEntry type="module" module-name="intellij.statsCollector" />
+    <orderEntry type="module" module-name="intellij.java.debugger.streams" />
+    <orderEntry type="module" module-name="intellij.tools.jetCheck" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml
index 27d957e047a0ba6347ebd6fec30b196192a8045d..746f69f0d75e1be93d77e0e6924261803f2d66c4 100644 (file)
--- a/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml
+++ b/java/compiler/forms-compiler/intellij.java.guiForms.compiler.iml
@@ -9,10 +9,10 @@
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="module" module-name="forms_rt" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
-    <orderEntry type="module" module-name="instrumentation-util" exported="" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" exported="" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml
index c5e5ce6d361bd4ecda1a3b0c684569c4c2593136..263c509d8c6365cb3265ef256aca119a54188c32 100644 (file)
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -7,26 +7,26 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="compiler-openapi" exported="" />
+    <orderEntry type="module" module-name="intellij.java.compiler" exported="" />
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="library" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="instrumentation-util" />
+    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
     <orderEntry type="library" name="ASM" level="project" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="jsp-openapi" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="jps-builders" />
-    <orderEntry type="module" module-name="jps-launcher" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.jsp" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.launcher" />
     <orderEntry type="library" name="Netty" level="project" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="java-analysis-impl" />
-    <orderEntry type="module" module-name="built-in-server" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.java.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
   <component name="copyright">

diff --git a/java/compiler/instrumentation-util-8/intellij.java.compiler.instrumentationUtil.java8.iml b/java/compiler/instrumentation-util-8/intellij.java.compiler.instrumentationUtil.java8.iml
index c946044527054ef90535348c91d452384157e21c..bc14fba7834474a2115900bf6928df3d0f9ac1bf 100644 (file)
--- a/java/compiler/instrumentation-util-8/intellij.java.compiler.instrumentationUtil.java8.iml
+++ b/java/compiler/instrumentation-util-8/intellij.java.compiler.instrumentationUtil.java8.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="instrumentation-util" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/compiler/intellij.java.compiler.tests.iml b/java/compiler/intellij.java.compiler.tests.iml
index 943b1830d3dd2df314408c2510e02463820faa79..e0d758691f0232189e4435f854cbbeb74e796dbb 100644 (file)
--- a/java/compiler/intellij.java.compiler.tests.iml
+++ b/java/compiler/intellij.java.compiler.tests.iml
@@ -7,19 +7,19 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="testFramework-java" />
-    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
+    <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" name="ASM" level="project" />
-    <orderEntry type="module" module-name="instrumentation-util" />
-    <orderEntry type="module" module-name="idea-ui" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
     <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="spellchecker" scope="RUNTIME" />
-    <orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/java/compiler/javac2/intellij.java.compiler.antTasks.iml b/java/compiler/javac2/intellij.java.compiler.antTasks.iml
index 4698c6a785ca8bd2eac7d3ca4dcfb69e6c70d310..488397e8eae8b78f775fe953abd7cf62d87002a8 100644 (file)
--- a/java/compiler/javac2/intellij.java.compiler.antTasks.iml
+++ b/java/compiler/javac2/intellij.java.compiler.antTasks.iml
@@ -8,10 +8,10 @@
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Ant" level="project" />
-    <orderEntry type="module" module-name="forms-compiler" />
-    <orderEntry type="module" module-name="forms_rt" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.compiler" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
     <orderEntry type="library" name="ASM" level="project" />
-    <orderEntry type="module" module-name="instrumentation-util" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/java/compiler/openapi/intellij.java.compiler.iml b/java/compiler/openapi/intellij.java.compiler.iml
index 9d587cd93e85712d3e3ed467769bf7dd10786684..8418b277fae88040ce0e179c2bd2339827776b25 100644 (file)
--- a/java/compiler/openapi/intellij.java.compiler.iml
+++ b/java/compiler/openapi/intellij.java.compiler.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="intellij.java" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/java/debugger/debugger-agent/intellij.java.debugger.agent.iml b/java/debugger/debugger-agent/intellij.java.debugger.agent.iml
index d3a0dcc9f4eda9fb688ea979dec5d67595e63a4f..3d1585a86a124132c4e68cb4c05cd29fb7f177f2 100644 (file)
--- a/java/debugger/debugger-agent/intellij.java.debugger.agent.iml
+++ b/java/debugger/debugger-agent/intellij.java.debugger.agent.iml
@@ -8,6 +8,6 @@
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="ASM" level="project" />
-    <orderEntry type="module" module-name="debugger-agent-storage" />
+    <orderEntry type="module" module-name="intellij.java.debugger.agent.storage" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/debugger/impl/intellij.java.debugger.impl.iml b/java/debugger/impl/intellij.java.debugger.impl.iml
index a4a7834fe60590a15c7fa1d4faed2ac51dc825f7..ab990d0aaefc63299c45d4a51a20196fb67ed2dd 100644 (file)
--- a/java/debugger/impl/intellij.java.debugger.impl.iml
+++ b/java/debugger/impl/intellij.java.debugger.impl.iml
@@ -7,21 +7,21 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="debugger-openapi" exported="" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="resources" />
-    <orderEntry type="module" module-name="xdebugger-api" />
-    <orderEntry type="module" module-name="xdebugger-impl" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="jsp-openapi" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="jps-builders" />
+    <orderEntry type="module" module-name="intellij.java.debugger" exported="" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.java.resources" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.jsp" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/java/debugger/openapi/intellij.java.debugger.iml b/java/debugger/openapi/intellij.java.debugger.iml
index 52013f3be0187e3fd8e86ab27d018e4e158e78c3..5e030ec01c52d70f75dd53046b4418fd75d7d6f1 100644 (file)
--- a/java/debugger/openapi/intellij.java.debugger.iml
+++ b/java/debugger/openapi/intellij.java.debugger.iml
@@ -7,10 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="jsp-openapi" />
-    <orderEntry type="module" module-name="java-psi-api" />
-    <orderEntry type="module" module-name="resources-en" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.jsp" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.resources.en" />
   </component>
   <component name="copyright">
     <Base>
@@ -164,5 +164,4 @@
       <option name="useAlternate" value="false" />
     </LanguageOptions>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/execution/impl/intellij.java.execution.impl.iml b/java/execution/impl/intellij.java.execution.impl.iml
index 275e4eef387c35ff4215623753dfc2bfe78d4b5c..3d5c1086d98987b7b915785f8b5c4339f4bde1cc 100644 (file)
--- a/java/execution/impl/intellij.java.execution.impl.iml
+++ b/java/execution/impl/intellij.java.execution.impl.iml
@@ -7,17 +7,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="execution-openapi" exported="" />
-    <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="debugger-impl" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.execution" exported="" />
+    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
-    <orderEntry type="module" module-name="testRunner" exported="" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="java-indexing-api" />
-    <orderEntry type="module" module-name="smRunner" />
-    <orderEntry type="module" module-name="jshell-protocol" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" />
+    <orderEntry type="module" module-name="intellij.java.jshell.protocol" />
     <orderEntry type="library" name="Coverage" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="precompiled_jshell-frontend" level="project" />
   </component>

diff --git a/java/execution/jshell-frontend/intellij.java.jshell.frontend.iml b/java/execution/jshell-frontend/intellij.java.jshell.frontend.iml
index 56221ac397cfebe53960e95a5b941de44b3985ce..d4a059298a208c33a5a29d56575f521f2e9f4220 100644 (file)
--- a/java/execution/jshell-frontend/intellij.java.jshell.frontend.iml
+++ b/java/execution/jshell-frontend/intellij.java.jshell.frontend.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jshell-protocol" />
+    <orderEntry type="module" module-name="intellij.java.jshell.protocol" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/execution/openapi/intellij.java.execution.iml b/java/execution/openapi/intellij.java.execution.iml
index fe514b5db7a96df65f2b7218c106fdaa9f243a37..ed05c92f20f69f9c4865faf27863a59d26d8b3ec 100644 (file)
--- a/java/execution/openapi/intellij.java.execution.iml
+++ b/java/execution/openapi/intellij.java.execution.iml
@@ -7,9 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="resources" />
-    <orderEntry type="module" module-name="xdebugger-api" exported="" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.resources" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" exported="" />
   </component>
   <component name="copyright">
     <Base>
@@ -163,5 +163,4 @@
       <option name="useAlternate" value="false" />
     </LanguageOptions>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml
index 4100d63fbe0044ebd29c9e1ce8405d8cdbfcf62f..4cfaa00f7ba4aa9ee2a22b61d8b57cf4a7a6f8ef 100644 (file)
--- a/java/idea-ui/intellij.java.ui.iml
+++ b/java/idea-ui/intellij.java.ui.iml
@@ -7,13 +7,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="aether-dependency-resolver" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" />
     <orderEntry type="library" name="OroMatcher" level="project" />
-    <orderEntry type="module" module-name="vcs-impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="jna" level="project" />
   </component>

diff --git a/java/idea-ui/intellij.java.ui.tests.iml b/java/idea-ui/intellij.java.ui.tests.iml
index 619f3b418b7632cbdf4852ed0635a79fa133d38c..ba10f64970559e8b13e072f23a7bfd3b6ce5be4c 100644 (file)
--- a/java/idea-ui/intellij.java.ui.tests.iml
+++ b/java/idea-ui/intellij.java.ui.tests.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/java-analysis-api/intellij.java.analysis.iml b/java/java-analysis-api/intellij.java.analysis.iml
index 84a6db05d79a1ed67ece46772521d9bfcafd3f1c..083ffa7c85282120ba6f02d1eb8b09887afd4728 100644 (file)
--- a/java/java-analysis-api/intellij.java.analysis.iml
+++ b/java/java-analysis-api/intellij.java.analysis.iml
@@ -7,10 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="analysis-api" />
-    <orderEntry type="module" module-name="java-psi-api" />
-    <orderEntry type="module" module-name="projectModel-api" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="uast-common" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.uast" exported="" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/java-analysis-impl/intellij.java.analysis.impl.iml b/java/java-analysis-impl/intellij.java.analysis.impl.iml
index ac27777d1517c9a0abf344b54b01b53991a3362f..372f9e0bdb496e19c1b185e957988ad9f6fb62e1 100644 (file)
--- a/java/java-analysis-impl/intellij.java.analysis.impl.iml
+++ b/java/java-analysis-impl/intellij.java.analysis.impl.iml
@@ -10,17 +10,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="analysis-impl" exported="" />
-    <orderEntry type="module" module-name="java-indexing-impl" exported="" />
-    <orderEntry type="module" module-name="java-psi-impl" exported="" />
-    <orderEntry type="module" module-name="projectModel-impl" exported="" />
-    <orderEntry type="module" module-name="java-analysis-api" exported="" />
-    <orderEntry type="module" module-name="resources-en" />
-    <orderEntry type="module" module-name="xml-psi-impl" />
-    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.indexing.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.psi.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.analysis" exported="" />
+    <orderEntry type="module" module-name="intellij.java.resources.en" />
+    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="library" exported="" name="ASM" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="intellij.java" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index 1e683a4600baeed09c1e0765c94a26d455453400..d98756215e23bdd034f418769680cffc83469a44 100644 (file)
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -17,36 +17,36 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="library" name="OroMatcher" level="project" />
-    <orderEntry type="module" module-name="xml" />
-    <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="lang-impl" exported="" />
-    <orderEntry type="module" module-name="jsp-openapi" />
-    <orderEntry type="module" module-name="jsp-spi" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="dom-openapi" />
-    <orderEntry type="module" module-name="dom-impl" />
-    <orderEntry type="module" module-name="vcs-impl" />
-    <orderEntry type="module" module-name="icons" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
+    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.jsp" />
+    <orderEntry type="module" module-name="intellij.jsp.spi" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.xml.dom" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.icons" />
     <orderEntry type="library" name="jcip" level="project" />
-    <orderEntry type="module" module-name="java-psi-impl" exported="" />
-    <orderEntry type="module" module-name="RegExpSupport" />
-    <orderEntry type="module" module-name="java-indexing-impl" exported="" />
-    <orderEntry type="module" module-name="java-indexing-api" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="java-analysis-impl" exported="" />
-    <orderEntry type="module" module-name="external-system-api" />
+    <orderEntry type="module" module-name="intellij.java.psi.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.regexp" />
+    <orderEntry type="module" module-name="intellij.java.indexing.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.java.analysis.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
     <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="java-structure-view" exported="" />
-    <orderEntry type="module" module-name="spellchecker" />
+    <orderEntry type="module" module-name="intellij.java.structureView" exported="" />
+    <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="library" name="nekohtml" level="project" />
-    <orderEntry type="module" module-name="built-in-server" />
-    <orderEntry type="module" module-name="uast-java" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
+    <orderEntry type="module" module-name="intellij.java.uast" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module-library">
       <library>

diff --git a/java/java-indexing-api/intellij.java.indexing.iml b/java/java-indexing-api/intellij.java.indexing.iml
index 51bc4aabe081065452d3627de5bfebebddc57fa0..cea42a35dfd9f6b1198d0c8fb2beb965397d8507 100644 (file)
--- a/java/java-indexing-api/intellij.java.indexing.iml
+++ b/java/java-indexing-api/intellij.java.indexing.iml
@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="java-psi-api" />
-    <orderEntry type="module" module-name="indexing-api" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/java-indexing-impl/intellij.java.indexing.impl.iml b/java/java-indexing-impl/intellij.java.indexing.impl.iml
index 6442f30fd02b61a3c154fb8e0be185c4b6e7c795..e18438ae264b7be4de4feb1a3c581e716a15dc25 100644 (file)
--- a/java/java-indexing-impl/intellij.java.indexing.impl.iml
+++ b/java/java-indexing-impl/intellij.java.indexing.impl.iml
@@ -7,13 +7,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="java-psi-api" exported="" />
-    <orderEntry type="module" module-name="java-psi-impl" exported="" />
-    <orderEntry type="module" module-name="indexing-api" exported="" />
-    <orderEntry type="module" module-name="indexing-impl" exported="" />
-    <orderEntry type="module" module-name="projectModel-api" exported="" />
-    <orderEntry type="module" module-name="projectModel-impl" />
-    <orderEntry type="module" module-name="java-indexing-api" exported="" />
+    <orderEntry type="module" module-name="intellij.java.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.java.psi.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
+    <orderEntry type="module" module-name="intellij.java.indexing" exported="" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>

diff --git a/java/java-psi-api/intellij.java.psi.iml b/java/java-psi-api/intellij.java.psi.iml
index 9e771bf1637262bd11c36a893f03d00aa07e7399..41eeef4653dd543a8837a16a621f71c2050faef9 100644 (file)
--- a/java/java-psi-api/intellij.java.psi.iml
+++ b/java/java-psi-api/intellij.java.psi.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/java-psi-impl/intellij.java.psi.impl.iml b/java/java-psi-impl/intellij.java.psi.impl.iml
index 6ee19d8289e99a5f508ee5b80eee17f89c4c7416..f7e14236f437a60b4e4adda9987c146cc53b3ab8 100644 (file)
--- a/java/java-psi-impl/intellij.java.psi.impl.iml
+++ b/java/java-psi-impl/intellij.java.psi.impl.iml
@@ -8,9 +8,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="java-psi-api" exported="" />
-    <orderEntry type="module" module-name="core-impl" exported="" />
-    <orderEntry type="module" module-name="resources-en" />
+    <orderEntry type="module" module-name="intellij.java.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.resources.en" />
     <orderEntry type="library" name="ASM" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="StreamEx" level="project" />

diff --git a/java/java-structure-view/intellij.java.structureView.iml b/java/java-structure-view/intellij.java.structureView.iml
index e76c09cc27882ab88143346f558b6bcbaaf5cacc..761efd80e1ad8b4676e2b85c48869c8da59f3253 100644 (file)
--- a/java/java-structure-view/intellij.java.structureView.iml
+++ b/java/java-structure-view/intellij.java.structureView.iml
@@ -7,8 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="structure-view-impl" exported="" />
-    <orderEntry type="module" module-name="java-psi-impl" />
+    <orderEntry type="module" module-name="intellij.platform.structureView.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.psi.impl" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index f9cba36b07c0b422e0596bedb2d6d6751f3c04c0..d7a7fe3c51a9e66bbbf4e000f9eb1dac520f4d35 100644 (file)
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -17,43 +17,43 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="testFramework-java" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="community-resources" scope="RUNTIME" />
-    <orderEntry type="module" module-name="execution-impl" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="java-i18n" exported="" />
-    <orderEntry type="module" module-name="compiler-impl" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.ideaCommunity.resources" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.java.i18n" exported="" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
     <orderEntry type="library" name="ASM" level="project" />
-    <orderEntry type="module" module-name="instrumentation-util" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="IntelliLang-java" scope="RUNTIME" />
-    <orderEntry type="module" module-name="IntelliLang-xml" scope="RUNTIME" />
-    <orderEntry type="module" module-name="junit" scope="TEST" />
-    <orderEntry type="module" module-name="testng" scope="TEST" />
-    <orderEntry type="module" module-name="ui-designer" scope="TEST" />
-    <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="java-indexing-api" scope="TEST" />
-    <orderEntry type="module" module-name="external-system-impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="junit_rt" scope="TEST" />
-    <orderEntry type="module" module-name="properties-psi-api" scope="TEST" />
-    <orderEntry type="module" module-name="java-decompiler-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="RegExpSupport" scope="TEST" />
-    <orderEntry type="module" module-name="spellchecker" scope="TEST" />
-    <orderEntry type="module" module-name="util-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.langInjection" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.xml.langInjection" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.junit" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.testng" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.designer" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.eclipse" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.platform.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.indexing" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.junit.rt" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.properties.psi" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.decompiler" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.regexp" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
-    <orderEntry type="module" module-name="jetgroovy" scope="TEST" />
-    <orderEntry type="module" module-name="lang-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.groovy" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang.tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="module" module-name="xml-analysis-impl" />
-    <orderEntry type="module" module-name="xml-psi-impl" />
+    <orderEntry type="module" module-name="intellij.xml.analysis.impl" />
+    <orderEntry type="module" module-name="intellij.xml.psi.impl" />
     <orderEntry type="library" scope="TEST" name="KotlinTest" level="project" />
-    <orderEntry type="module" module-name="built-in-server-api" scope="TEST" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
-    <orderEntry type="module" module-name="configuration-store-impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/jsp-base-openapi/intellij.jsp.base.iml b/java/jsp-base-openapi/intellij.jsp.base.iml
index 7060fe756ccf4296b7023139e750676d682bea59..f44049b5f4f90ebf3d4c6ffbbf732ff7f5e065ba 100644 (file)
--- a/java/jsp-base-openapi/intellij.jsp.base.iml
+++ b/java/jsp-base-openapi/intellij.jsp.base.iml
@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="xml-openapi" exported="" />
-    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.xml" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/jsp-openapi/intellij.jsp.iml b/java/jsp-openapi/intellij.jsp.iml
index deaf897e33f7320e6008e52a457b5f2fa18ef41c..bbf304f85a601909d0f8726a1ce9b70520302b6b 100644 (file)
--- a/java/jsp-openapi/intellij.jsp.iml
+++ b/java/jsp-openapi/intellij.jsp.iml
@@ -7,9 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="jsp-base-openapi" exported="" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.jsp.base" exported="" />
   </component>
   <component name="copyright">
     <Base>
@@ -163,5 +163,4 @@
       <option name="useAlternate" value="false" />
     </LanguageOptions>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/jsp-spi/intellij.jsp.spi.iml b/java/jsp-spi/intellij.jsp.spi.iml
index 416c7c0a507e05b9c21a11d5ab73695025608bcd..3e63e33547e9653c21b869a63458486f1da64cc5 100644 (file)
--- a/java/jsp-spi/intellij.jsp.spi.iml
+++ b/java/jsp-spi/intellij.jsp.spi.iml
@@ -7,14 +7,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jsp-openapi" exported="" />
-    <orderEntry type="module" module-name="openapi" exported="" />
-    <orderEntry type="module" module-name="jsp-base-openapi" />
+    <orderEntry type="module" module-name="intellij.jsp" exported="" />
+    <orderEntry type="module" module-name="intellij.java" exported="" />
+    <orderEntry type="module" module-name="intellij.jsp.base" />
   </component>
   <component name="copyright">
     <Base>
       <setting name="state" value="1" />
     </Base>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/manifest/intellij.java.manifest.iml b/java/manifest/intellij.java.manifest.iml
index 212982b8ac5c63912566afd1d6145d61c568d9f5..bf4ba1b2a0ffbae8154ccbcbf3eab5e1507e77fe 100644 (file)
--- a/java/manifest/intellij.java.manifest.iml
+++ b/java/manifest/intellij.java.manifest.iml
@@ -8,15 +8,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="analysis-api" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="core-impl" />
-    <orderEntry type="module" module-name="java-psi-api" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
-    <orderEntry type="module" module-name="spellchecker" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.spellchecker" />
   </component>
 </module>
\ No newline at end of file

diff --git a/java/openapi/intellij.java.iml b/java/openapi/intellij.java.iml
index a140fa5d9744273091de96f5903ae46d32f5b080..ea627edf70cc6a7556b1c4a775f69c3e1f52ae7c 100644 (file)
--- a/java/openapi/intellij.java.iml
+++ b/java/openapi/intellij.java.iml
@@ -8,26 +8,26 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="module" module-name="forms_rt" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
     <orderEntry type="library" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="extensions" exported="" />
-    <orderEntry type="module" module-name="icons" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.icons" />
     <orderEntry type="library" exported="" name="NanoXML" level="project" />
     <orderEntry type="library" exported="" name="microba" level="project" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
-    <orderEntry type="module" module-name="xml-openapi" exported="" />
-    <orderEntry type="module" module-name="platform-api" exported="" />
-    <orderEntry type="module" module-name="lang-api" exported="" />
-    <orderEntry type="module" module-name="vcs-api" exported="" />
+    <orderEntry type="module" module-name="intellij.xml" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" exported="" />
     <orderEntry type="library" name="XmlRPC" level="project" />
-    <orderEntry type="module" module-name="dom-openapi" />
-    <orderEntry type="module" module-name="resources-en" exported="" />
-    <orderEntry type="module" module-name="java-psi-api" exported="" />
-    <orderEntry type="module" module-name="java-indexing-api" exported="" />
-    <orderEntry type="module" module-name="java-analysis-api" exported="" />
+    <orderEntry type="module" module-name="intellij.xml.dom" />
+    <orderEntry type="module" module-name="intellij.java.resources.en" exported="" />
+    <orderEntry type="module" module-name="intellij.java.psi" exported="" />
+    <orderEntry type="module" module-name="intellij.java.indexing" exported="" />
+    <orderEntry type="module" module-name="intellij.java.analysis" exported="" />
   </component>
   <component name="copyright">
     <option name="body" value="/*&#10; * Copyright (c) $today.year Your Corporation. All Rights Reserved.&#10; */" />

diff --git a/java/remote-servers/api/intellij.java.remoteServers.iml b/java/remote-servers/api/intellij.java.remoteServers.iml
index 5e59a857cbe0f68ba8abe3f4c87720b42d1305fb..be940d8885360f70a88c896efd2665e1cfb3902f 100644 (file)
--- a/java/remote-servers/api/intellij.java.remoteServers.iml
+++ b/java/remote-servers/api/intellij.java.remoteServers.iml
@@ -7,14 +7,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="remote-servers-api" exported="" />
-    <orderEntry type="module" module-name="debugger-impl" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="xdebugger-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="compiler-impl" />
+    <orderEntry type="module" module-name="intellij.platform.remoteServers" exported="" />
+    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/remote-servers/impl/intellij.java.remoteServers.impl.iml b/java/remote-servers/impl/intellij.java.remoteServers.impl.iml
index 15781473aa45b4742bee12c8afdc9a2549261c6d..2be3240e83015128ea4284878df36014a6115d2b 100644 (file)
--- a/java/remote-servers/impl/intellij.java.remoteServers.impl.iml
+++ b/java/remote-servers/impl/intellij.java.remoteServers.impl.iml
@@ -7,15 +7,14 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="remote-servers-java-api" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="debugger-impl" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="remote-servers-impl" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="idea-ui" />
+    <orderEntry type="module" module-name="intellij.java.remoteServers" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.remoteServers.impl" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/structuralsearch-java/intellij.java.structuralSearch.iml b/java/structuralsearch-java/intellij.java.structuralSearch.iml
index 4b2ec18c28e6eeaa6485906dfb5ae5650f9f4c32..de5458acabce06dcb744bb8a080bf04ef20c05df 100644 (file)
--- a/java/structuralsearch-java/intellij.java.structuralSearch.iml
+++ b/java/structuralsearch-java/intellij.java.structuralSearch.iml
@@ -7,11 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="structuralsearch" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="duplicates-analysis" />
+    <orderEntry type="module" module-name="intellij.platform.structuralSearch" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.duplicates.analysis" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/java/testFramework/intellij.java.testFramework.iml b/java/testFramework/intellij.java.testFramework.iml
index 90a2a5d0ce1f0f8490df6f54b64be8d46b1d7fcb..483e6a7340eaccf97ba23ba59e1658538919a3e2 100644 (file)
--- a/java/testFramework/intellij.java.testFramework.iml
+++ b/java/testFramework/intellij.java.testFramework.iml
@@ -7,23 +7,23 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" exported="" />
-    <orderEntry type="module" module-name="util" exported="" />
+    <orderEntry type="module" module-name="intellij.java" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
-    <orderEntry type="module" module-name="lang-api" exported="" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="java-impl" exported="" />
-    <orderEntry type="module" module-name="execution-impl" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.execution.impl" exported="" scope="RUNTIME" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="testFramework" exported="" />
-    <orderEntry type="module" module-name="relaxng" exported="" scope="TEST" />
-    <orderEntry type="module" module-name="idea-ui" exported="" />
-    <orderEntry type="module" module-name="debugger-impl" exported="" />
-    <orderEntry type="module" module-name="execution-openapi" exported="" />
-    <orderEntry type="module" module-name="external-system-impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" />
+    <orderEntry type="module" module-name="intellij.relaxng" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.ui" exported="" />
+    <orderEntry type="module" module-name="intellij.java.debugger.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.java.execution" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="RUNTIME" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/java/typeMigration/intellij.java.typeMigration.iml b/java/typeMigration/intellij.java.typeMigration.iml
index ac3679760ed4b61b4129439e1776565774e455d8..a9b891e9f4f799f5a7d9b7fc96c0404488eee063 100644 (file)
--- a/java/typeMigration/intellij.java.typeMigration.iml
+++ b/java/typeMigration/intellij.java.typeMigration.iml
@@ -8,14 +8,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="structuralsearch" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
-    <orderEntry type="module" module-name="structuralsearch-java" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.structuralSearch" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.structuralSearch" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/jetCheck/intellij.tools.jetCheck.iml b/jetCheck/intellij.tools.jetCheck.iml
index c81202696506cc70722d67e4d263a28d0eb09a81..e91aa41a19e28536a558c609f0ffbd4c92dc2d28 100644 (file)
--- a/jetCheck/intellij.tools.jetCheck.iml
+++ b/jetCheck/intellij.tools.jetCheck.iml
@@ -9,6 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
   </component>
 </module>
\ No newline at end of file

diff --git a/jps/javac-ref-scanner-8/intellij.java.jps.javacRefScanner8.iml b/jps/javac-ref-scanner-8/intellij.java.jps.javacRefScanner8.iml
index e87665dad4945291ebc4052c15c660b1f2dd8032..43c512adb3f787b83dd32b6be95e84e5772fda61 100644 (file)
--- a/jps/javac-ref-scanner-8/intellij.java.jps.javacRefScanner8.iml
+++ b/jps/javac-ref-scanner-8/intellij.java.jps.javacRefScanner8.iml
@@ -8,9 +8,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-builders" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="core-api" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml b/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
index a93029e1851a5cf8628bb00180b49a1fa75c28bd..88ba1668f1918c85f8630473b7d1965d060a871f 100644 (file)
--- a/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
+++ b/jps/jps-builders-6/intellij.platform.jps.build.javac.rt.iml
@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations" />
-    <orderEntry type="module" module-name="util-rt" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="module" module-name="intellij.platform.util.rt" />
     <orderEntry type="library" name="Netty" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" name="protobuf" level="project" />

diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml
index 8621bf9e059a1479cf86a4923ddc2e18feee4a85..17993cbe355c07ae7acc269abe8eca6f14160f19 100644 (file)
--- a/jps/jps-builders/intellij.platform.jps.build.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.iml
@@ -8,28 +8,28 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-builders-6" exported="" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="forms_rt" />
-    <orderEntry type="module" module-name="forms-compiler" />
-    <orderEntry type="module" module-name="instrumentation-util" />
-    <orderEntry type="module" module-name="instrumentation-util-8" scope="RUNTIME" />
-    <orderEntry type="module" module-name="aether-dependency-resolver" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build.javac.rt" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.compiler" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil.java8" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" />
     <orderEntry type="library" exported="" name="ASM" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="NanoXML" level="project" />
     <orderEntry type="library" name="jgoodies-forms" level="project" />
     <orderEntry type="library" name="Netty" level="project" />
     <orderEntry type="library" exported="" name="protobuf" level="project" />
-    <orderEntry type="module" module-name="java-runtime" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.rt" scope="RUNTIME" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Eclipse" level="project" />
-    <orderEntry type="module" module-name="jps-model-api" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" scope="TEST" name="KotlinTest" level="project" />
     <orderEntry type="library" name="Xerces" level="project" />

diff --git a/jps/model-api/intellij.platform.jps.model.iml b/jps/model-api/intellij.platform.jps.model.iml
index 825aecafc689abe1c0a1265e0f5d51e6c1259584..c43f23e20d7e885fa5ad1b3a35aa31095f71deef 100644 (file)
--- a/jps/model-api/intellij.platform.jps.model.iml
+++ b/jps/model-api/intellij.platform.jps.model.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
   </component>
 </module>
\ No newline at end of file

diff --git a/jps/model-impl/intellij.platform.jps.model.impl.iml b/jps/model-impl/intellij.platform.jps.model.impl.iml
index 80b55e12acae3fa333c62c8821cb129f836c9bcb..717d706f4a8f2fc61566a19b2bab9132f0803661 100644 (file)
--- a/jps/model-impl/intellij.platform.jps.model.impl.iml
+++ b/jps/model-impl/intellij.platform.jps.model.impl.iml
@@ -7,8 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="jps-model-api" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/jps/model-impl/intellij.platform.jps.model.tests.iml b/jps/model-impl/intellij.platform.jps.model.tests.iml
index ea687e498b64aa5fcfe1582c311de90004cdbb6a..19fd09b671e06696314d5939dc9794ca7e3bc6ef 100644 (file)
--- a/jps/model-impl/intellij.platform.jps.model.tests.iml
+++ b/jps/model-impl/intellij.platform.jps.model.tests.iml
@@ -7,9 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="testFramework" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" exported="" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/jps/model-serialization/intellij.platform.jps.model.serialization.iml b/jps/model-serialization/intellij.platform.jps.model.serialization.iml
index 48532590df148049ba57ec981cfd2589125e78bd..2ddbaf481964e89c0d37314d1599cbeadae75fa7 100644 (file)
--- a/jps/model-serialization/intellij.platform.jps.model.serialization.iml
+++ b/jps/model-serialization/intellij.platform.jps.model.serialization.iml
@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="jps-model-api" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="library" exported="" name="JDOM" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
index 03982fdbba7f12920702197bad3d07100e7c6692..8e8909337eb69f512b62517549f335c43cc777c4 100644 (file)
--- a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
+++ b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
-    <orderEntry type="module" module-name="jps-model-tests" exported="" scope="TEST" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.tests" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
index c7865d7a1beca54e8395211b2b0fb881bfca81e3..65549e5b5a317f2bbad62823ca3a28f74ff79cea 100644 (file)
--- a/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
+++ b/jps/standalone-builder/intellij.tools.jps.build.standalone.iml
@@ -8,11 +8,11 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="jps-builders" exported="" />
-    <orderEntry type="module" module-name="jps-model-api" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="library" name="cli-parser" level="project" />
     <orderEntry type="library" name="Ant" level="project" />
-    <orderEntry type="module" module-name="jps-model-serialization" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" exported="" />
     <orderEntry type="library" scope="PROVIDED" name="gant-groovy" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
   </component>

diff --git a/json/intellij.json.iml b/json/intellij.json.iml
index 213d178ac839823a81b37bee4fe3e1fcd7a6ace0..5d8690af9e46cfd64be9e9afcd3d87730ef93ebd 100644 (file)
--- a/json/intellij.json.iml
+++ b/json/intellij.json.iml
@@ -9,11 +9,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="xml-openapi" />
-    <orderEntry type="module" module-name="spellchecker" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.xml" />
+    <orderEntry type="module" module-name="intellij.spellchecker" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="gson" level="project" />
   </component>

diff --git a/json/tests/intellij.json.tests.iml b/json/tests/intellij.json.tests.iml
index 06d046d470ac4bb505a03acbdef6ccfd7070026a..4bc2cf820518905c427515f12d21391786a423c6 100644 (file)
--- a/json/tests/intellij.json.tests.iml
+++ b/json/tests/intellij.json.tests.iml
@@ -8,9 +8,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="json" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
-    <orderEntry type="module" module-name="spellchecker" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.json" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/analysis-api/intellij.platform.analysis.iml b/platform/analysis-api/intellij.platform.analysis.iml
index ac3597a901f516d7b51950e90239d9dd877aead1..9b95ecc7e01083a4f3cd94c837ef59f47c03ed15 100644 (file)
--- a/platform/analysis-api/intellij.platform.analysis.iml
+++ b/platform/analysis-api/intellij.platform.analysis.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="module" module-name="extensions" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="projectModel-api" />
-    <orderEntry type="module" module-name="editor-ui-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/analysis-impl/intellij.platform.analysis.impl.iml b/platform/analysis-impl/intellij.platform.analysis.impl.iml
index 3806ef755c96927efa8cce70f023fe737e03a998..bd9d1ce2da73de43e64294d410de977ab2def919 100644 (file)
--- a/platform/analysis-impl/intellij.platform.analysis.impl.iml
+++ b/platform/analysis-impl/intellij.platform.analysis.impl.iml
@@ -7,16 +7,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="analysis-api" exported="" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="core-impl" exported="" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="extensions" />
-    <orderEntry type="module" module-name="resources-en" />
-    <orderEntry type="module" module-name="projectModel-impl" exported="" />
-    <orderEntry type="module" module-name="editor-ui-ex" />
-    <orderEntry type="module" module-name="indexing-impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" />
+    <orderEntry type="module" module-name="intellij.java.resources.en" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" />
+    <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="external-system-api" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/annotations/intellij.platform.annotations.java5.iml b/platform/annotations/intellij.platform.annotations.java5.iml
index 94a19cde4f67cac90bfb575c6aac555a31f35b76..3b16f96dc17a231cc6342d70727f745e6acbe245 100644 (file)
--- a/platform/annotations/intellij.platform.annotations.java5.iml
+++ b/platform/annotations/intellij.platform.annotations.java5.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations-common" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.common" exported="" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/annotations/java8/intellij.platform.annotations.iml b/platform/annotations/java8/intellij.platform.annotations.iml
index 5ae79d1d7cf96e4f3ab9a1918db3244d2f80c3d4..4933b84a0fcd5486ed163b5d1219bb14a171039c 100644 (file)
--- a/platform/annotations/java8/intellij.platform.annotations.iml
+++ b/platform/annotations/java8/intellij.platform.annotations.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations-common" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.common" exported="" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/bootstrap/intellij.platform.bootstrap.iml b/platform/bootstrap/intellij.platform.bootstrap.iml
index dfcb91a5bf9ba6fe5836c19b928373b342b5f42b..6eb4a2d8827f5b1875bb9704bc57dd550b04860c 100644 (file)
--- a/platform/bootstrap/intellij.platform.bootstrap.iml
+++ b/platform/bootstrap/intellij.platform.bootstrap.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/platform/build-scripts/icons/intellij.platform.images.build.iml b/platform/build-scripts/icons/intellij.platform.images.build.iml
index d8855041fe1b5469a3aabb1a11402ec63304f6d4..6148bab2bde7ba353f1d66d729812b8743085e85 100644 (file)
--- a/platform/build-scripts/icons/intellij.platform.images.build.iml
+++ b/platform/build-scripts/icons/intellij.platform.images.build.iml
@@ -8,11 +8,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-model-api" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml
index 69e40e523473f09a0086e2fd83a598cdff0a3ce6..180e6cc0bc94d294e8854eeec509e96fa69f5a28 100644 (file)
--- a/platform/build-scripts/intellij.platform.buildScripts.iml
+++ b/platform/build-scripts/intellij.platform.buildScripts.iml
@@ -18,13 +18,13 @@
     <orderEntry type="library" scope="RUNTIME" name="Log4J" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="jna" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="antlayout" />
-    <orderEntry type="module" module-name="jps-model-api" exported="" />
-    <orderEntry type="module" module-name="jps-standalone-builder" exported="" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="RUNTIME" />
-    <orderEntry type="module" module-name="groovy-jps-plugin" scope="RUNTIME" />
-    <orderEntry type="module" module-name="groovy_rt" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.tools.jps.antTasks" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" exported="" />
+    <orderEntry type="module" module-name="intellij.tools.jps.build.standalone" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.jps" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.groovy.jps" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.groovy.rt" scope="RUNTIME" />
     <orderEntry type="library" exported="" name="gant-groovy" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
   </component>

diff --git a/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml b/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml
index f00c7474474073a8b6e0b631e673a9bea180ed0e..3ae7014d71d37dbfed32fc575fcdcdeed35d8506 100644 (file)
--- a/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml
+++ b/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="platform-build-scripts" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.buildScripts" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml
index ddb12af2d8c7d49efe3bb9567c750767b8c20f9d..b908e9c5f734fd9226f2cecfe5b4151869f1feae 100644 (file)
--- a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml
+++ b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-build-scripts" />
+    <orderEntry type="module" module-name="intellij.platform.buildScripts" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
   </component>

diff --git a/platform/built-in-server-api/intellij.platform.builtInServer.iml b/platform/built-in-server-api/intellij.platform.builtInServer.iml
index b251db17455525fe61427ba81a883c80efe3e530..e4e21857c9e40a66b2ba5c41293d4c07ade86e7d 100644 (file)
--- a/platform/built-in-server-api/intellij.platform.builtInServer.iml
+++ b/platform/built-in-server-api/intellij.platform.builtInServer.iml
@@ -7,10 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="library" name="Netty" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/built-in-server/intellij.platform.builtInServer.impl.iml b/platform/built-in-server/intellij.platform.builtInServer.impl.iml
index cc22f16b61f1195d232fe9518862d62e31336fc7..011debcc893df407843086dd106311b7997a3793 100644 (file)
--- a/platform/built-in-server/intellij.platform.builtInServer.impl.iml
+++ b/platform/built-in-server/intellij.platform.builtInServer.impl.iml
@@ -7,19 +7,19 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="projectModel-api" />
-    <orderEntry type="module" module-name="projectModel-impl" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="Netty" level="project" />
-    <orderEntry type="module" module-name="xml-openapi" />
-    <orderEntry type="module" module-name="xdebugger-api" />
+    <orderEntry type="module" module-name="intellij.xml" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="library" name="commons-imaging" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="built-in-server-api" exported="" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/built-in-server/intellij.platform.builtInServer.tests.iml b/platform/built-in-server/intellij.platform.builtInServer.tests.iml
index e55dbdc2b1e06919e5657c7adac88f1cfb7dd466..be148b882a94f7a4edc261f2d925c755d91fe4eb 100644 (file)
--- a/platform/built-in-server/intellij.platform.builtInServer.tests.iml
+++ b/platform/built-in-server/intellij.platform.builtInServer.tests.iml
@@ -7,21 +7,21 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="projectModel-api" />
-    <orderEntry type="module" module-name="projectModel-impl" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="Netty" level="project" />
-    <orderEntry type="module" module-name="xml-openapi" />
-    <orderEntry type="module" module-name="xdebugger-api" />
+    <orderEntry type="module" module-name="intellij.xml" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="library" name="commons-imaging" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="built-in-server-api" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="module" module-name="built-in-server" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
index 560f011ecfe37ce430ee475592702afaa31ab1ae..d06e4cc3a8eeb6eef272adb6a194574f366dd8a5 100644 (file)
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
@@ -9,16 +9,16 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="projectModel-impl" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="bootstrap" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
     <orderEntry type="library" name="xpp3-1.1.4-min" level="project" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/core-api/intellij.platform.core.iml b/platform/core-api/intellij.platform.core.iml
index fedaceca9ba65794f3550c7c052795a2ddc9a966..3e46236bb0f0113086065bbe0df8290344eb6cfd 100644 (file)
--- a/platform/core-api/intellij.platform.core.iml
+++ b/platform/core-api/intellij.platform.core.iml
@@ -7,10 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="extensions" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
     <orderEntry type="library" exported="" name="picocontainer" level="project" />
-    <orderEntry type="module" module-name="platform-resources-en" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.resources.en" exported="" />
     <orderEntry type="library" name="automaton" level="project" />
     <orderEntry type="library" name="CGLIB" level="project" />
   </component>

diff --git a/platform/core-impl/intellij.platform.core.impl.iml b/platform/core-impl/intellij.platform.core.impl.iml
index 66e33896c75bd93c5444967c1e289920e550763e..2a8141a2ebe0e86f82f739933dbc4f6325863309 100644 (file)
--- a/platform/core-impl/intellij.platform.core.impl.iml
+++ b/platform/core-impl/intellij.platform.core.impl.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
     <orderEntry type="library" name="picocontainer" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
   </component>

diff --git a/platform/credential-store/intellij.platform.credentialStore.iml b/platform/credential-store/intellij.platform.credentialStore.iml
index e964e90a6b62b53b32e24d91e02c8b1382da0680..282405319c06561cce7a073c35f2538acb0283b7 100644 (file)
--- a/platform/credential-store/intellij.platform.credentialStore.iml
+++ b/platform/credential-store/intellij.platform.credentialStore.iml
@@ -9,16 +9,16 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="library" name="jna" level="project" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="bouncy-castle-provider" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="module" module-name="projectModel-impl" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/diff-api/intellij.platform.diff.iml b/platform/diff-api/intellij.platform.diff.iml
index e7003926ffb3fffa3434ac4829bf404517d05ec7..2d438213c832887e91aba91ecb77da1c9e2a0c48 100644 (file)
--- a/platform/diff-api/intellij.platform.diff.iml
+++ b/platform/diff-api/intellij.platform.diff.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/diff-impl/intellij.platform.diff.impl.iml b/platform/diff-impl/intellij.platform.diff.impl.iml
index 19c7f34041482e54c3d813c0744d3e01ef1a9957..9ea58d60209fc895f4771b8aa29dc7e3e72b6ef1 100644 (file)
--- a/platform/diff-impl/intellij.platform.diff.impl.iml
+++ b/platform/diff-impl/intellij.platform.diff.impl.iml
@@ -7,13 +7,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="diff-api" exported="" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="vcs-api-core" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.diff" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.core" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="library" name="Guava" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/diff-impl/intellij.platform.diff.tests.iml b/platform/diff-impl/intellij.platform.diff.tests.iml
index 7178eefe85a33781cf0d85fd2cbe3cde2fa0af38..8734c102a64eb8b07dd1926a053de9a8249ee324 100644 (file)
--- a/platform/diff-impl/intellij.platform.diff.tests.iml
+++ b/platform/diff-impl/intellij.platform.diff.tests.iml
@@ -7,15 +7,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="diff-api" exported="" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="vcs-api-core" />
-    <orderEntry type="module" module-name="diff-impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.diff" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.core" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
     <orderEntry type="library" scope="TEST" name="KotlinTest" level="project" />
-    <orderEntry type="module" module-name="vcs-impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml b/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
index 9c2e9b7a6602936b37176a15fad7446d7f0459ba..498ba9b3df0067626aa13622e43ac676aa6511ec 100644 (file)
--- a/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
+++ b/platform/duplicates-analysis/intellij.platform.duplicates.analysis.iml
@@ -7,13 +7,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="analysis-impl" exported="" />
-    <orderEntry type="module" module-name="annotations" exported="" />
-    <orderEntry type="module" module-name="extensions" exported="" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="indexing-api" exported="" />
-    <orderEntry type="module" module-name="projectModel-api" exported="" />
-    <orderEntry type="module" module-name="projectModel-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/dvcs-api/intellij.platform.vcs.dvcs.iml b/platform/dvcs-api/intellij.platform.vcs.dvcs.iml
index f425c986a066e66de042728b55b30c6563dfd54b..e1cad18087b5d175d7444a8cd8b514bdd7640064 100644 (file)
--- a/platform/dvcs-api/intellij.platform.vcs.dvcs.iml
+++ b/platform/dvcs-api/intellij.platform.vcs.dvcs.iml
@@ -7,12 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util-rt" />
-    <orderEntry type="module" module-name="vcs-log-graph-api" exported="" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="module" module-name="extensions" />
-    <orderEntry type="module" module-name="vcs-log-api" />
+    <orderEntry type="module" module-name="intellij.platform.util.rt" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log.graph" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
index 187ceb27890c71207993c29003ffdb81ddf5900e..affa567fc8f0d31ad2a889c4f99c1ae22de1d4a5 100644 (file)
--- a/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
+++ b/platform/dvcs-impl/intellij.platform.vcs.dvcs.impl.iml
@@ -9,18 +9,18 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="vcs-impl" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="core-impl" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="vcs-log-api" />
-    <orderEntry type="module" module-name="vcs-log-impl" />
-    <orderEntry type="module" module-name="images" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="dvcs-api" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
+    <orderEntry type="module" module-name="intellij.platform.images" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.dvcs" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito" level="project" />
-    <orderEntry type="module" module-name="vcs-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/editor-ui-api/intellij.platform.editor.iml b/platform/editor-ui-api/intellij.platform.editor.iml
index d73132f4ed76521f0278deda58b59dfac50c4d79..09ba3bdbdfb86f20f25e09ff3335a80b07e822cf 100644 (file)
--- a/platform/editor-ui-api/intellij.platform.editor.iml
+++ b/platform/editor-ui-api/intellij.platform.editor.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="annotations" />
-    <orderEntry type="module" module-name="projectModel-api" />
-    <orderEntry type="module" module-name="indexing-api" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/editor-ui-ex/intellij.platform.editor.ex.iml b/platform/editor-ui-ex/intellij.platform.editor.ex.iml
index 4b52d76f9429de0dd89bc3179daa26af125487a5..0b8734ebe0a12f62da1d0ee2df22fe896c4ade13 100644 (file)
--- a/platform/editor-ui-ex/intellij.platform.editor.ex.iml
+++ b/platform/editor-ui-ex/intellij.platform.editor.ex.iml
@@ -7,12 +7,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="editor-ui-api" exported="" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="annotations" exported="" />
-    <orderEntry type="module" module-name="core-impl" exported="" />
-    <orderEntry type="module" module-name="indexing-impl" />
-    <orderEntry type="module" module-name="projectModel-api" />
-    <orderEntry type="module" module-name="projectModel-impl" />
+    <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/extensions/intellij.platform.extensions.iml b/platform/extensions/intellij.platform.extensions.iml
index 8395ac142875ffedd4c292e59bdf730e72ca4d58..0a4a014b0f6587cf5c417bb359727897031fdefd 100644 (file)
--- a/platform/extensions/intellij.platform.extensions.iml
+++ b/platform/extensions/intellij.platform.extensions.iml
@@ -11,7 +11,7 @@
     <orderEntry type="library" exported="" name="XStream" level="project" />
     <orderEntry type="library" exported="" name="JDOM" level="project" />
     <orderEntry type="library" name="picocontainer" level="project" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="Xerces" level="project" />
     <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />

diff --git a/platform/external-system-api/intellij.platform.externalSystem.iml b/platform/external-system-api/intellij.platform.externalSystem.iml
index dd83638ca881b47b14d3ee1eee0b6e4b916f7bb8..e36d865ee66c315ef6b737d0ed0abbedea237713 100644 (file)
--- a/platform/external-system-api/intellij.platform.externalSystem.iml
+++ b/platform/external-system-api/intellij.platform.externalSystem.iml
@@ -8,13 +8,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations" exported="" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="projectModel-api" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="external-system-rt" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.rt" exported="" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="de.ruedigermoeller:fst" level="project" />
   </component>

diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
index 05a6807bbb15af82b686174397dca99df1283691..6b6be87181d5642f64b6c818ccca7a750dec27f3 100644 (file)
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -10,27 +10,27 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="external-system-api" />
-    <orderEntry type="module" module-name="projectModel-impl" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="debugger-impl" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="testRunner" />
-    <orderEntry type="module" module-name="smRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" />
+    <orderEntry type="module" module-name="intellij.platform.smRunner" exported="" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="configuration-store-impl" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
-    <orderEntry type="module" module-name="execution-impl" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/external-system-rt/intellij.platform.externalSystem.rt.iml b/platform/external-system-rt/intellij.platform.externalSystem.rt.iml
index fb9d2c09693c1e30654cce721df3be83352d2535..66bb6eb64126af9a20a956cd26ad5cc3135e3f29 100644 (file)
--- a/platform/external-system-rt/intellij.platform.externalSystem.rt.iml
+++ b/platform/external-system-rt/intellij.platform.externalSystem.rt.iml
@@ -7,6 +7,6 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/indexing-api/intellij.platform.indexing.iml b/platform/indexing-api/intellij.platform.indexing.iml
index af544092623cd9a3d8025eb06578919eb52a385a..b2754e94cf55fa725d546b83fd604909e9073fdc 100644 (file)
--- a/platform/indexing-api/intellij.platform.indexing.iml
+++ b/platform/indexing-api/intellij.platform.indexing.iml
@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" exported="" />
-    <orderEntry type="module" module-name="projectModel-api" />
+    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="library" name="NanoXML" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/indexing-impl/intellij.platform.indexing.impl.iml b/platform/indexing-impl/intellij.platform.indexing.impl.iml
index 0060995585e43d0a60958381db89d1fa31a24c64..a5a368fff35e13b1b8ce493285ec98e6d4063664 100644 (file)
--- a/platform/indexing-impl/intellij.platform.indexing.impl.iml
+++ b/platform/indexing-impl/intellij.platform.indexing.impl.iml
@@ -7,10 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-impl" />
-    <orderEntry type="module" module-name="indexing-api" exported="" />
-    <orderEntry type="module" module-name="projectModel-impl" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="library" exported="" name="NanoXML" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/lang-api/intellij.platform.lang.iml b/platform/lang-api/intellij.platform.lang.iml
index f854eaacf13a1c80b41b0ada0bd5bf1caf109bdb..2b012ae274d919a0320372f5aa783a64dcef376c 100644 (file)
--- a/platform/lang-api/intellij.platform.lang.iml
+++ b/platform/lang-api/intellij.platform.lang.iml
@@ -8,14 +8,14 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" exported="" />
-    <orderEntry type="module" module-name="lvcs-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" exported="" />
     <orderEntry type="library" exported="" name="NanoXML" level="project" />
-    <orderEntry type="module" module-name="indexing-api" exported="" />
-    <orderEntry type="module" module-name="projectModel-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
-    <orderEntry type="module" module-name="analysis-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index a74f184b2cd4281e666cb50e13967ed58e4200d7..5792e99d7b70e05f4744f45a8e9e9e8afe8b8314 100644 (file)
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -7,30 +7,30 @@
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
-    <orderEntry type="module" module-name="boot" />
+    <orderEntry type="module" module-name="intellij.platform.boot" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-api" exported="" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" name="Velocity" level="project" />
-    <orderEntry type="module" module-name="platform-impl" exported="" />
-    <orderEntry type="module" module-name="usageView" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.usageView" exported="" />
     <orderEntry type="library" name="xpp3-1.1.4-min" level="project" />
     <orderEntry type="library" exported="" name="cli-parser" level="project" />
-    <orderEntry type="module" module-name="indexing-api" />
-    <orderEntry type="module" module-name="indexing-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
     <orderEntry type="library" name="Snappy-Java" level="project" />
-    <orderEntry type="module" module-name="projectModel-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
     <orderEntry type="library" name="swingx" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="analysis-impl" exported="" />
-    <orderEntry type="module" module-name="structure-view-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.structureView.impl" exported="" />
     <orderEntry type="library" name="commons-logging" level="project" />
-    <orderEntry type="module" module-name="diff-impl" />
-    <orderEntry type="module" module-name="built-in-server-api" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer" />
     <orderEntry type="library" name="Groovy" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index 34556a95af19b4601187f1fd8a2a885f93e87a88..67972d024a3b68a474f95147e2de929c7566bee0 100644 (file)
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -5,31 +5,31 @@
     <content url="file://$MODULE_DIR$/testSources">
       <sourceFolder url="file://$MODULE_DIR$/testSources" isTestSource="true" />
     </content>
-    <orderEntry type="module" module-name="boot" />
+    <orderEntry type="module" module-name="intellij.platform.boot" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-api" exported="" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="Velocity" level="project" />
-    <orderEntry type="module" module-name="platform-impl" exported="" />
-    <orderEntry type="module" module-name="usageView" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.usageView" exported="" />
     <orderEntry type="library" name="xpp3-1.1.4-min" level="project" />
     <orderEntry type="library" exported="" name="cli-parser" level="project" />
-    <orderEntry type="module" module-name="indexing-api" />
-    <orderEntry type="module" module-name="indexing-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.indexing.impl" exported="" />
     <orderEntry type="library" name="Snappy-Java" level="project" />
-    <orderEntry type="module" module-name="projectModel-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" exported="" />
     <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
     <orderEntry type="library" name="swingx" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="analysis-impl" exported="" />
-    <orderEntry type="module" module-name="structure-view-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.structureView.impl" exported="" />
     <orderEntry type="library" name="commons-logging" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/lvcs-api/intellij.platform.lvcs.iml b/platform/lvcs-api/intellij.platform.lvcs.iml
index f39436adcd800720f0818a32dbbe620e3a535338..e01415c7f83d0792492a37d1dc5b2a4924a708e9 100644 (file)
--- a/platform/lvcs-api/intellij.platform.lvcs.iml
+++ b/platform/lvcs-api/intellij.platform.lvcs.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/lvcs-impl/intellij.platform.lvcs.impl.iml b/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
index b71d17b80cfb4f88c3b013dfc1487a9725e11293..349e9b5b5d82772233f4be74714d01aa5daec32c 100644 (file)
--- a/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
+++ b/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
@@ -8,12 +8,12 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="picocontainer" level="project" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="module" module-name="vcs-impl" />
-    <orderEntry type="module" module-name="lvcs-api" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="diff-api" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml
index d2feda7c561f18f5c85bc4a957d2b5e44c9d7e03..82e1f2657856b1e566ff84c96fdbd47aa58836e9 100644 (file)
--- a/platform/platform-api/intellij.platform.ide.iml
+++ b/platform/platform-api/intellij.platform.ide.iml
@@ -7,23 +7,23 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="extensions" exported="" />
-    <orderEntry type="module" module-name="core-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
     <orderEntry type="library" exported="" name="picocontainer" level="project" />
-    <orderEntry type="module" module-name="bootstrap" />
+    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
     <orderEntry type="library" exported="" name="jgoodies-forms" level="project" />
-    <orderEntry type="module" module-name="forms_rt" exported="" />
+    <orderEntry type="module" module-name="intellij.java.guiForms.rt" exported="" />
     <orderEntry type="library" name="commons-codec" level="project" />
-    <orderEntry type="module" module-name="platform-resources-en" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.resources.en" exported="" />
     <orderEntry type="library" name="automaton" level="project" />
     <orderEntry type="library" name="OroMatcher" level="project" />
-    <orderEntry type="module" module-name="icons" />
-    <orderEntry type="module" module-name="projectModel-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.icons" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
     <orderEntry type="library" name="Netty" level="project" />
     <orderEntry type="library" name="proxy-vole" level="project" />
-    <orderEntry type="module" module-name="analysis-api" exported="" />
-    <orderEntry type="module" module-name="editor-ui-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
     <orderEntry type="library" name="pty4j" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="http-client" level="project" />

diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index 619c8d238e37ae6ed020cd46ca434aafbabd2b7e..224dec8290258b56c1e3b56c55bf388353b77648 100644 (file)
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -8,48 +8,48 @@
     <orderEntry type="library" scope="PROVIDED" name="Mac" level="project" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
     <orderEntry type="library" name="picocontainer" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
-    <orderEntry type="module" module-name="boot" />
-    <orderEntry type="module" module-name="bootstrap" />
+    <orderEntry type="module" module-name="intellij.platform.boot" />
+    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
     <orderEntry type="library" exported="" name="commons-codec" level="project" />
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" name="CGLIB" level="project" />
-    <orderEntry type="module" module-name="lvcs-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" exported="" />
     <orderEntry type="library" name="JavaHelp" level="project" />
-    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" name="winp" level="project" />
     <orderEntry type="library" name="swingx" level="project" />
-    <orderEntry type="module" module-name="core-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
     <orderEntry type="library" exported="" name="miglayout-swing" level="project" />
-    <orderEntry type="module" module-name="indexing-api" />
-    <orderEntry type="module" module-name="indexing-impl" />
-    <orderEntry type="module" module-name="projectModel-impl" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="library" name="Snappy-Java" level="project" />
     <orderEntry type="library" exported="" name="Netty" level="project" />
     <orderEntry type="library" name="commons-imaging" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="analysis-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis.impl" exported="" />
     <orderEntry type="library" name="jayatana" level="project" />
-    <orderEntry type="module" module-name="editor-ui-ex" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" exported="" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" name="http-client" level="project" />
-    <orderEntry type="module" module-name="diff-api" />
-    <orderEntry type="module" module-name="built-in-server" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" scope="RUNTIME" />
     <orderEntry type="library" name="imgscalr" level="project" />
-    <orderEntry type="module" module-name="built-in-server-api" />
+    <orderEntry type="module" module-name="intellij.platform.builtInServer" />
     <orderEntry type="library" exported="" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Slf4j" level="project" />
-    <orderEntry type="module" module-name="configuration-store-impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" scope="RUNTIME" />
     <orderEntry type="library" name="imageio-tiff" level="project" />
     <orderEntry type="library" name="pty4j" level="project" />
-    <orderEntry type="module" module-name="credential-store" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.credentialStore" scope="RUNTIME" />
     <orderEntry type="library" exported="" name="StreamEx" level="project" />
     <orderEntry type="library" name="jediterm-pty" level="project" />
-    <orderEntry type="module" module-name="tasks-platform-impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.tasks.impl" scope="RUNTIME" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
   </component>

diff --git a/platform/platform-main/intellij.platform.main.iml b/platform/platform-main/intellij.platform.main.iml
index 8eb708376b7dc67d801074e2b7347e459810295e..d49bbf01a989f784c4b5213e5a254132021de691 100644 (file)
--- a/platform/platform-main/intellij.platform.main.iml
+++ b/platform/platform-main/intellij.platform.main.iml
@@ -7,8 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="bootstrap" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/platform-resources/intellij.platform.resources.iml b/platform/platform-resources/intellij.platform.resources.iml
index c5e527a1d0da4195f33c08f69b109a41c81fe744..3399a107820785846fd974253934fb554828877d 100644 (file)
--- a/platform/platform-resources/intellij.platform.resources.iml
+++ b/platform/platform-resources/intellij.platform.resources.iml
@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="lvcs-impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="json" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.json" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index 835e29d1032172ee1c6cada47dfcf492cbd75e04..5ef8214c7b4bf23eee611b7843ae6786339229c1 100644 (file)
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -7,31 +7,31 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
-    <orderEntry type="module" module-name="testFramework" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lvcs-impl" />
-    <orderEntry type="module" module-name="vcs-impl" />
-    <orderEntry type="module" module-name="platform-resources" scope="RUNTIME" />
-    <orderEntry type="module" module-name="dom-impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="relaxng" scope="RUNTIME" />
-    <orderEntry type="module" module-name="spellchecker" scope="RUNTIME" />
-    <orderEntry type="module" module-name="xdebugger-impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="xml-openapi" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.resources" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.relaxng" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.xml" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="library" name="Netty" level="project" />
     <orderEntry type="library" name="http-client" level="project" />
-    <orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="util-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="library" scope="TEST" name="KotlinTest" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="purejavacomm" level="project" />
-    <orderEntry type="module" module-name="configuration-store-impl" scope="TEST" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
-    <orderEntry type="module" module-name="bootstrap" />
+    <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/projectModel-api/intellij.platform.projectModel.iml b/platform/projectModel-api/intellij.platform.projectModel.iml
index ecbad134ebbecf9f8310e29ac1b02b3e081a70fc..c73be29caa75bac7aeea3923b3e46700dc9e0ee6 100644 (file)
--- a/platform/projectModel-api/intellij.platform.projectModel.iml
+++ b/platform/projectModel-api/intellij.platform.projectModel.iml
@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" exported="" />
-    <orderEntry type="module" module-name="jps-model-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" exported="" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="Xerces" level="project" />
   </component>

diff --git a/platform/projectModel-impl/intellij.platform.projectModel.impl.iml b/platform/projectModel-impl/intellij.platform.projectModel.impl.iml
index 30368b2eb8a05138e6531e740055943e68054ee6..385e7e5c922c8699e65e16272ba6888786496561 100644 (file)
--- a/platform/projectModel-impl/intellij.platform.projectModel.impl.iml
+++ b/platform/projectModel-impl/intellij.platform.projectModel.impl.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="projectModel-api" exported="" />
-    <orderEntry type="module" module-name="core-impl" />
-    <orderEntry type="module" module-name="jps-model-api" />
-    <orderEntry type="module" module-name="jps-model-impl" />
-    <orderEntry type="module" module-name="jps-model-serialization" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" exported="" />
     <orderEntry type="library" name="Snappy-Java" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>

diff --git a/platform/remote-servers/api/intellij.platform.remoteServers.iml b/platform/remote-servers/api/intellij.platform.remoteServers.iml
index 4f23c02e26b73b9c07a76fbf01f833d4d8c0da4e..1036fd7a7e346d3767c7f951fb6d8381619f98ae 100644 (file)
--- a/platform/remote-servers/api/intellij.platform.remoteServers.iml
+++ b/platform/remote-servers/api/intellij.platform.remoteServers.iml
@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="remote-servers-agent-rt" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.remoteServers.agent.rt" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml
index c27886c657853a0567615df3a0a24f81c5323d21..9cc02d63540d1d54c92ee145772be153f5a0a9b2 100644 (file)
--- a/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml
+++ b/platform/remote-servers/impl/intellij.platform.remoteServers.impl.iml
@@ -8,12 +8,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="remote-servers-api" />
-    <orderEntry type="module" module-name="core-impl" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="xdebugger-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.remoteServers" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml b/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
index 030dc05ab7f91058807e129f0328a4c156d40030..63c266ac8af376a570624bb862911726b22378e3 100644 (file)
--- a/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
+++ b/platform/script-debugger/backend/intellij.platform.scriptDebugger.backend.iml
@@ -7,10 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="protocol-reader-runtime" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.scriptDebugger.protocolReaderRuntime" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="Netty" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
index c70fd6495280fd0058c08f27af83aa404aab1234..328e54fa7b6f6f050e1f799a142f793ed338f9d8 100644 (file)
--- a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
+++ b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
@@ -8,12 +8,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="xdebugger-api" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="script-debugger-backend" />
-    <orderEntry type="module" module-name="xdebugger-impl" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.scriptDebugger.backend" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="library" name="Netty" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/script-debugger/protocol/protocol-model-generator/intellij.javascript.protocolModelGenerator.iml b/platform/script-debugger/protocol/protocol-model-generator/intellij.javascript.protocolModelGenerator.iml
index 10c84ff67214764c448692ae4fe23702451fe72d..8b9e75fb0c1afff3602ab99e53f2c5d30b8a1978 100644 (file)
--- a/platform/script-debugger/protocol/protocol-model-generator/intellij.javascript.protocolModelGenerator.iml
+++ b/platform/script-debugger/protocol/protocol-model-generator/intellij.javascript.protocolModelGenerator.iml
@@ -9,11 +9,11 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="schema-reader-generator" />
-    <orderEntry type="module" module-name="protocol-reader" />
+    <orderEntry type="module" module-name="intellij.javascript.schemaReaderGenerator" />
+    <orderEntry type="module" module-name="intellij.javascript.protocolReader" />
     <orderEntry type="library" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="util-rt" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.util.rt" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml b/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
index 9e00b8655e5ef4cbff5a2218f30ca8f5d0c78fdf..70e20ee98b25b5dddd395114c3a859fc765ddfd8 100644 (file)
--- a/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
+++ b/platform/script-debugger/protocol/protocol-reader-runtime/intellij.platform.scriptDebugger.protocolReaderRuntime.iml
@@ -8,8 +8,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="gson" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="Netty" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/script-debugger/protocol/protocol-reader/intellij.javascript.protocolReader.iml b/platform/script-debugger/protocol/protocol-reader/intellij.javascript.protocolReader.iml
index c8f00406a6fde4a343f930a459b958e9c6304e33..4bbaa5d50d1f90b6aa4496080f4b0cc904a723b0 100644 (file)
--- a/platform/script-debugger/protocol/protocol-reader/intellij.javascript.protocolReader.iml
+++ b/platform/script-debugger/protocol/protocol-reader/intellij.javascript.protocolReader.iml
@@ -9,8 +9,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="protocol-reader-runtime" exported="" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.scriptDebugger.protocolReaderRuntime" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/script-debugger/protocol/schema-reader-generator/intellij.javascript.schemaReaderGenerator.iml b/platform/script-debugger/protocol/schema-reader-generator/intellij.javascript.schemaReaderGenerator.iml
index a2a9f7558e93615ad23d0e8737cc2bc488eccbc7..de0edaa8ef1c037ccbbb0767a400226bff83e560 100644 (file)
--- a/platform/script-debugger/protocol/schema-reader-generator/intellij.javascript.schemaReaderGenerator.iml
+++ b/platform/script-debugger/protocol/schema-reader-generator/intellij.javascript.schemaReaderGenerator.iml
@@ -8,8 +8,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="protocol-reader" />
+    <orderEntry type="module" module-name="intellij.javascript.protocolReader" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/smRunner/intellij.platform.smRunner.iml b/platform/smRunner/intellij.platform.smRunner.iml
index d57738b3bf26caf24203a759bf13bea6d1d47312..45a2e5416b92f7f5a4941b5d53d0a9abd62fbd5b 100644 (file)
--- a/platform/smRunner/intellij.platform.smRunner.iml
+++ b/platform/smRunner/intellij.platform.smRunner.iml
@@ -8,14 +8,14 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="testRunner" exported="" />
-    <orderEntry type="module" module-name="xdebugger-api" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" exported="" name="tcServiceMessages" level="project" />
-    <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
     <orderEntry type="library" scope="TEST" name="Mocks" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/structuralsearch/intellij.platform.structuralSearch.iml b/platform/structuralsearch/intellij.platform.structuralSearch.iml
index 5bc64abd229c87d01d351de6dde0d67045bcb101..7a4f85294f9a4f7bec02e1b046cf581d0f3e9997 100644 (file)
--- a/platform/structuralsearch/intellij.platform.structuralSearch.iml
+++ b/platform/structuralsearch/intellij.platform.structuralSearch.iml
@@ -8,21 +8,20 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="xml" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="duplicates-analysis" />
-    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.duplicates.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
   </component>
   <component name="copyright">
     <Base>
       <setting name="state" value="1" />
     </Base>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml b/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml
index a05a995fe450e5e1316e6fc6807674370b6519fc..6128db311b39c3c75bc99f2ca6b561aa9827ae25 100644 (file)
--- a/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml
+++ b/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml
@@ -8,11 +8,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="structuralsearch" />
-    <orderEntry type="module" module-name="testFramework-java" />
-    <orderEntry type="module" module-name="xml" />
-    <orderEntry type="module" module-name="structuralsearch-java" />
-    <orderEntry type="module" module-name="java-i18n" />
+    <orderEntry type="module" module-name="intellij.platform.structuralSearch" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
+    <orderEntry type="module" module-name="intellij.java.structuralSearch" />
+    <orderEntry type="module" module-name="intellij.java.i18n" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/structure-view-impl/intellij.platform.structureView.impl.iml b/platform/structure-view-impl/intellij.platform.structureView.impl.iml
index 17e99a106d03405cd753c5b31ac552d2d65884f8..96f0a8600c82cd3c35b4050df9a3fcf1ea778a84 100644 (file)
--- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml
+++ b/platform/structure-view-impl/intellij.platform.structureView.impl.iml
@@ -7,16 +7,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="editor-ui-api" exported="" />
-    <orderEntry type="module" module-name="util" exported="" />
-    <orderEntry type="module" module-name="extensions" exported="" />
-    <orderEntry type="module" module-name="core-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.editor" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" exported="" />
     <orderEntry type="library" exported="" name="picocontainer" level="project" />
-    <orderEntry type="module" module-name="bootstrap" />
-    <orderEntry type="module" module-name="platform-resources-en" exported="" />
-    <orderEntry type="module" module-name="icons" />
+    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
+    <orderEntry type="module" module-name="intellij.platform.resources.en" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.icons" />
     <orderEntry type="library" name="automaton" level="project" />
-    <orderEntry type="module" module-name="projectModel-api" exported="" />
-    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/tasks-platform-api/intellij.platform.tasks.iml b/platform/tasks-platform-api/intellij.platform.tasks.iml
index c1af7ffc58b5cf6822599e11c21ef1920ece830d..977ebec0f76699ce11978c316f8195b02509e266 100644 (file)
--- a/platform/tasks-platform-api/intellij.platform.tasks.iml
+++ b/platform/tasks-platform-api/intellij.platform.tasks.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
index c2b65862017399efbcaf71ce5de8ac48fb31c85f..3fd4d405516239658db097f47f59c3dd9bd85cd8 100644 (file)
--- a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
+++ b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
@@ -7,16 +7,16 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="tasks-platform-api" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.tasks" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="xdebugger-impl" />
-    <orderEntry type="module" module-name="xdebugger-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="library" name="http-client-3.1" level="project" />
-    <orderEntry type="module" module-name="vcs-impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/testFramework/core/intellij.platform.testFramework.core.iml b/platform/testFramework/core/intellij.platform.testFramework.core.iml
index fbf5686072fb9e0f943fafdede77466a12c3b96a..c9309ca8cb3f736448303a7cee45df165fe1c91d 100644 (file)
--- a/platform/testFramework/core/intellij.platform.testFramework.core.iml
+++ b/platform/testFramework/core/intellij.platform.testFramework.core.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="JUnit4" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/testFramework/extensions/intellij.platform.testExtensions.iml b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
index d70b422abc1fd706949d4aa51b3f71e6ab99d567..754a20183d679fe0160af64bfee285931b98d4e4 100644 (file)
--- a/platform/testFramework/extensions/intellij.platform.testExtensions.iml
+++ b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
@@ -8,8 +8,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" exported="" scope="TEST" name="JDOM" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />

diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index 887ec7e051693fd0069cc08a7e87715749a6dbb9..53cc794947c9ae37619556ab81dac17cc9d3276b 100644 (file)
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -8,25 +8,25 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-api" exported="" />
-    <orderEntry type="module" module-name="lang-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" exported="" />
     <orderEntry type="library" exported="" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="platform-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
     <orderEntry type="library" exported="" name="Log4J" level="project" />
-    <orderEntry type="module" module-name="lvcs-impl" scope="RUNTIME" />
-    <orderEntry type="module" module-name="tests_bootstrap" />
-    <orderEntry type="module" module-name="resources-en" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs.impl" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.tools.testsBootstrap" />
+    <orderEntry type="module" module-name="intellij.java.resources.en" scope="RUNTIME" />
     <orderEntry type="library" exported="" scope="TEST" name="Mocks" level="project" />
-    <orderEntry type="module" module-name="java-runtime" exported="" />
+    <orderEntry type="module" module-name="intellij.java.rt" exported="" />
     <orderEntry type="library" exported="" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="platform-resources" exported="" scope="RUNTIME" />
-    <orderEntry type="module" module-name="dom-impl" exported="" scope="RUNTIME" />
-    <orderEntry type="module" module-name="relaxng" exported="" scope="RUNTIME" />
-    <orderEntry type="module" module-name="images" exported="" scope="RUNTIME" />
-    <orderEntry type="module" module-name="RegExpSupport" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.resources" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.relaxng" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.images" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.regexp" exported="" scope="RUNTIME" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="boot" />
-    <orderEntry type="module" module-name="jetCheck" exported="" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework.core" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.boot" />
+    <orderEntry type="module" module-name="intellij.tools.jetCheck" exported="" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework.core" exported="" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/testGuiFramework/intellij.platform.testGuiFramework.iml b/platform/testGuiFramework/intellij.platform.testGuiFramework.iml
index d4b9220a54bf505e3942108801d6f2f148767b57..314c58b94e1f4f36a2ce95448dc434d7ae4afe6d 100644 (file)
--- a/platform/testGuiFramework/intellij.platform.testGuiFramework.iml
+++ b/platform/testGuiFramework/intellij.platform.testGuiFramework.iml
@@ -9,22 +9,22 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
     <orderEntry type="library" exported="" name="fest" level="project" />
     <orderEntry type="library" exported="" name="fest-swing" level="project" />
     <orderEntry type="library" exported="" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="bootstrap" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="testRunner" />
-    <orderEntry type="module" module-name="xdebugger-impl" />
-    <orderEntry type="module" module-name="external-system-rt" />
-    <orderEntry type="module" module-name="external-system-impl" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" />
+    <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.rt" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
     <orderEntry type="library" name="jsr305" level="project" />
-    <orderEntry type="module" module-name="testFramework" />
-    <orderEntry type="module" module-name="jps-builders" />
-    <orderEntry type="module" module-name="diff-impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
     <orderEntry type="library" name="jediterm-pty" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/testRunner/intellij.platform.testRunner.iml b/platform/testRunner/intellij.platform.testRunner.iml
index 485ce110c0107c20cb2dc09ea3fd54fd44bbce41..36b3271295ecf35bb55a4f1be1ed9c6f12aa6964 100644 (file)
--- a/platform/testRunner/intellij.platform.testRunner.iml
+++ b/platform/testRunner/intellij.platform.testRunner.iml
@@ -7,10 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="xdebugger-api" />
-    <orderEntry type="module" module-name="diff-impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/usageView/intellij.platform.usageView.iml b/platform/usageView/intellij.platform.usageView.iml
index 2caf7c5d7334a717bea1935a2c1f3cf9a397ca12..40368b5e3c6acceda6a5502c603316f5440e22cf 100644 (file)
--- a/platform/usageView/intellij.platform.usageView.iml
+++ b/platform/usageView/intellij.platform.usageView.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/util-rt/intellij.platform.util.rt.iml b/platform/util-rt/intellij.platform.util.rt.iml
index 82b5990a46f5f1e5099059ac969533296d1e0d56..fffb338d98b2cacc883d67843cbc42086dd1efa4 100644 (file)
--- a/platform/util-rt/intellij.platform.util.rt.iml
+++ b/platform/util-rt/intellij.platform.util.rt.iml
@@ -10,6 +10,6 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/util/intellij.platform.util.iml b/platform/util/intellij.platform.util.iml
index 710b47e797df68b9be2512c4b0d5443cc46190db..ee8827e22446bd5e477bce0510ae3de31f536808 100644 (file)
--- a/platform/util/intellij.platform.util.iml
+++ b/platform/util/intellij.platform.util.iml
@@ -15,9 +15,9 @@
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="Log4J" level="project" />
     <orderEntry type="library" exported="" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="platform-resources-en" />
-    <orderEntry type="module" module-name="annotations" exported="" />
-    <orderEntry type="module" module-name="util-rt" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.resources.en" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.util.rt" exported="" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" exported="" name="Snappy-Java" level="project" />

diff --git a/platform/util/testSrc/intellij.platform.util.tests.iml b/platform/util/testSrc/intellij.platform.util.tests.iml
index 2aff4eae09b719da94760cb9795748ec6ef49430..fd39ff827cea1714a30b324147ccf9b740294791 100644 (file)
--- a/platform/util/testSrc/intellij.platform.util.tests.iml
+++ b/platform/util/testSrc/intellij.platform.util.tests.iml
@@ -8,19 +8,19 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="Groovy" level="project" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JDOM" level="project" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="picocontainer" level="project" />
     <orderEntry type="library" scope="TEST" name="jna" level="project" />
-    <orderEntry type="module" module-name="core-api" scope="TEST" />
-    <orderEntry type="module" module-name="projectModel-impl" scope="TEST" />
-    <orderEntry type="module" module-name="jetCheck" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.tools.jetCheck" scope="TEST" />
     <orderEntry type="library" name="commons-compress" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/vcs-api/intellij.platform.vcs.iml b/platform/vcs-api/intellij.platform.vcs.iml
index 6d66050a0e94cfe86143d28ee513d3ccc5fb23a2..bddc9670c4d5f56cddd995d2e4ec1d58fef56306 100644 (file)
--- a/platform/vcs-api/intellij.platform.vcs.iml
+++ b/platform/vcs-api/intellij.platform.vcs.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" exported="" />
-    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="library" name="microba" level="project" />
-    <orderEntry type="module" module-name="vcs-api-core" exported="" />
-    <orderEntry type="module" module-name="diff-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.core" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.diff" exported="" />
     <orderEntry type="library" name="StreamEx" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml b/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml
index 39228382f5b51762323a6354d6045e6a9de879ef..8f592ed517b98fb61260451d08498536cc0d2e0b 100644 (file)
--- a/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml
+++ b/platform/vcs-api/vcs-api-core/intellij.platform.vcs.core.iml
@@ -7,9 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="annotations" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="editor-ui-api" />
-    <orderEntry type="module" module-name="diff-api" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml
index 6f94a9c1670ad0cff42ca27ff968b8ef6aba7649..25355ed49fa4c417522a570b5cf6875e177a0d39 100644 (file)
--- a/platform/vcs-impl/intellij.platform.vcs.impl.iml
+++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml
@@ -8,19 +8,19 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="vcs-api" exported="" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="commons-codec" level="project" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="diff-impl" exported="" />
-    <orderEntry type="module" module-name="vcs-log-api" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
     <orderEntry type="library" name="swingx" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/vcs-log/api/intellij.platform.vcs.log.iml b/platform/vcs-log/api/intellij.platform.vcs.log.iml
index bd8af44a849281d04523e63de04614df35edf331..ab5224f1c58c3af5c79a90b69f61629cd231706f 100644 (file)
--- a/platform/vcs-log/api/intellij.platform.vcs.log.iml
+++ b/platform/vcs-log/api/intellij.platform.vcs.log.iml
@@ -7,11 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util-rt" />
-    <orderEntry type="module" module-name="vcs-log-graph-api" exported="" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="vcs-api-core" />
-    <orderEntry type="module" module-name="editor-ui-api" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.util.rt" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log.graph" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.core" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml b/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml
index 0fff2a030728468886f8b22c884d4adc35f13f93..78b7f83930c39eee305b3dcce663e39aa72cb633 100644 (file)
--- a/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml
+++ b/platform/vcs-log/graph-api/intellij.platform.vcs.log.graph.iml
@@ -7,8 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util-rt" />
-    <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="intellij.platform.util.rt" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml b/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml
index c15d2a85fa5a5e6fb3e1b9e900671f01570481f6..7edc8dca4eda7b97bb70307364c6b743e486f7f8 100644 (file)
--- a/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml
+++ b/platform/vcs-log/graph/intellij.platform.vcs.log.graph.impl.iml
@@ -8,9 +8,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="vcs-log-graph-api" exported="" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log.graph" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="Guava" level="project" />

diff --git a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
index 12264683128a9004d85e068f7ac7a4b6094f55b4..91d9e20a4e00c026e0263a739f77fda9c6470012 100644 (file)
--- a/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
+++ b/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
@@ -10,21 +10,21 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="vcs-log-api" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="module" module-name="vcs-log-graph" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="vcs-impl" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log.graph.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="vcs-log-graph-api" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.log.graph" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" scope="TEST" name="KotlinTest" level="project" />
-    <orderEntry type="module" module-name="vcs-tests" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/vcs-tests/intellij.platform.vcs.tests.iml b/platform/vcs-tests/intellij.platform.vcs.tests.iml
index be648a3f3f9e21dd216141f53a8bdf2c03ee5b41..e151a9571aef69ab4d7f464eac8fe72952fc7f37 100644 (file)
--- a/platform/vcs-tests/intellij.platform.vcs.tests.iml
+++ b/platform/vcs-tests/intellij.platform.vcs.tests.iml
@@ -9,13 +9,13 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="testFramework" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="module" module-name="vcs-impl" />
-    <orderEntry type="module" module-name="vcs-api-core" />
-    <orderEntry type="module" module-name="core-api" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.core" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="library" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="diff-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.diff.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/platform/xdebugger-api/intellij.platform.debugger.iml b/platform/xdebugger-api/intellij.platform.debugger.iml
index 5e37d936a9838dd5a2ec7e251466f624fe6076fe..21e6ec859f2cd7bd2c2320e0ebe541efa28e5493 100644 (file)
--- a/platform/xdebugger-api/intellij.platform.debugger.iml
+++ b/platform/xdebugger-api/intellij.platform.debugger.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="lang-api" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
index d70800b49b5eba4cfebb9597c2fc818d02062e74..1a47d189939abc163bb076821c88197b66abc230 100644 (file)
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -8,13 +8,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="xdebugger-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="platform-resources" />
-    <orderEntry type="module" module-name="dom-impl" scope="TEST" />
-    <orderEntry type="module" module-name="xml" scope="TEST" />
-    <orderEntry type="module" module-name="diff-api" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.debugger" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.resources" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml b/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml
index ecf022c8422da8df74fc8c9cbf2a659f796a6598..99cbdafdfd96255bea8e2654f8f348770f354e38 100644 (file)
--- a/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml
+++ b/plugins/ByteCodeViewer/intellij.java.byteCodeViewer.iml
@@ -8,15 +8,15 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="ASM" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="java-psi-api" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="compiler-impl" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
   </component>
 </module>
\ No newline at end of file

diff --git a/plugins/IntelliLang/IntelliLang-tests/intellij.platform.langInjection.tests.iml b/plugins/IntelliLang/IntelliLang-tests/intellij.platform.langInjection.tests.iml
index 16fd469e33474afda8566dac3f5c5cff0807215a..3321f0d11a7e98c24e180d763568d09c1813026f 100644 (file)
--- a/plugins/IntelliLang/IntelliLang-tests/intellij.platform.langInjection.tests.iml
+++ b/plugins/IntelliLang/IntelliLang-tests/intellij.platform.langInjection.tests.iml
@@ -7,10 +7,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="testFramework-java" />
-    <orderEntry type="module" module-name="IntelliLang" />
-    <orderEntry type="module" module-name="IntelliLang-xml" />
-    <orderEntry type="module" module-name="xml" />
-    <orderEntry type="module" module-name="IntelliLang-java" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection" />
+    <orderEntry type="module" module-name="intellij.xml.langInjection" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
+    <orderEntry type="module" module-name="intellij.java.langInjection" />
   </component>
 </module>
\ No newline at end of file

diff --git a/plugins/IntelliLang/intellij.java.langInjection.iml b/plugins/IntelliLang/intellij.java.langInjection.iml
index 66a00fa603dbee11626d7af39437c18f116d91dc..f82295eb14b37439e634849df7543f2ae62e2ffb 100644 (file)
--- a/plugins/IntelliLang/intellij.java.langInjection.iml
+++ b/plugins/IntelliLang/intellij.java.langInjection.iml
@@ -7,15 +7,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="compiler-impl" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
     <orderEntry type="library" name="ASM" level="project" />
-    <orderEntry type="module" module-name="RegExpSupport" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="IntelliLang" />
+    <orderEntry type="module" module-name="intellij.regexp" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/plugins/IntelliLang/intellij.platform.langInjection.iml b/plugins/IntelliLang/intellij.platform.langInjection.iml
index 2fb62ecdd7cc586051631abc79c371776c1cf65c..9f6ccea4082359741f8dd3cf42d8865e6addb5f4 100644 (file)
--- a/plugins/IntelliLang/intellij.platform.langInjection.iml
+++ b/plugins/IntelliLang/intellij.platform.langInjection.iml
@@ -7,12 +7,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="RegExpSupport" />
-    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.regexp" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="library" name="Jaxen" level="project" />
-    <orderEntry type="module" module-name="intellilang-jps-plugin" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.java.langInjection.jps" scope="RUNTIME" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/plugins/IntelliLang/intellij.xml.langInjection.iml b/plugins/IntelliLang/intellij.xml.langInjection.iml
index 1659417efc9d796bbb4a376c68d6fcbcc0f9e7ce..b098ffdb74df4639abafecac47a5974e98659a2b 100644 (file)
--- a/plugins/IntelliLang/intellij.xml.langInjection.iml
+++ b/plugins/IntelliLang/intellij.xml.langInjection.iml
@@ -7,15 +7,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="xml" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="library" name="ASM" level="project" />
-    <orderEntry type="module" module-name="RegExpSupport" />
-    <orderEntry type="module" module-name="xpath" />
-    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="intellij.regexp" />
+    <orderEntry type="module" module-name="intellij.xpath" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="library" name="Jaxen" level="project" />
-    <orderEntry type="module" module-name="IntelliLang" />
+    <orderEntry type="module" module-name="intellij.platform.langInjection" />
   </component>
   <component name="copyright">
     <Base>

diff --git a/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml b/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
index 58257c15034030be089d6b0683b44a5af531eb31..7ffff1595c3f35345a7aeedafa83739e139be9bc 100644 (file)
--- a/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
+++ b/plugins/IntelliLang/intellilang-jps-plugin/intellij.java.langInjection.jps.iml
@@ -7,10 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-builders" />
-    <orderEntry type="module" module-name="jps-model-api" />
-    <orderEntry type="module" module-name="instrumentation-util" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.java.compiler.instrumentationUtil" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/ShortcutPromoter/intellij.shortcutPromoter.iml b/plugins/ShortcutPromoter/intellij.shortcutPromoter.iml
index 83561d9e102591b0718c335ed97e1c18f313c19e..39e906a07a95044b86bc83a9e74c82f6a0bfa6c8 100644 (file)
--- a/plugins/ShortcutPromoter/intellij.shortcutPromoter.iml
+++ b/plugins/ShortcutPromoter/intellij.shortcutPromoter.iml
@@ -8,9 +8,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" />
-    <orderEntry type="module" module-name="editor-ui-api" />
-    <orderEntry type="module" module-name="platform-api" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/ant/intellij.ant.iml b/plugins/ant/intellij.ant.iml
index eb851191d4b32331e0b92d0724b38f7af04419c5..1d96b255c249ccf40d9914b6638cdd2ce626ef28 100644 (file)
--- a/plugins/ant/intellij.ant.iml
+++ b/plugins/ant/intellij.ant.iml
@@ -9,30 +9,29 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" exported="" name="Ant" level="project" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="execution-impl" />
-    <orderEntry type="module" module-name="xml" />
-    <orderEntry type="module" module-name="properties" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="dom-openapi" exported="" />
-    <orderEntry type="module" module-name="xml-openapi" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="ant-jps-plugin" />
-    <orderEntry type="module" module-name="dom-impl" />
-    <orderEntry type="module" module-name="properties-psi-api" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
+    <orderEntry type="module" module-name="intellij.properties" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.xml.dom" exported="" />
+    <orderEntry type="module" module-name="intellij.xml" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.ant.jps" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" />
+    <orderEntry type="module" module-name="intellij.properties.psi" />
   </component>
   <component name="copyright">
     <Base>
       <setting name="state" value="1" />
     </Base>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/ant/jps-plugin/intellij.ant.jps.iml b/plugins/ant/jps-plugin/intellij.ant.jps.iml
index 12aeb835539a78a5542ee4333256d0d85e092a14..c96c22198a66d3ef904267ca8faf40866d8565f7 100644 (file)
--- a/plugins/ant/jps-plugin/intellij.ant.jps.iml
+++ b/plugins/ant/jps-plugin/intellij.ant.jps.iml
@@ -8,12 +8,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-model-api" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="jps-builders" />
-    <orderEntry type="module" module-name="java-runtime" />
-    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.java.rt" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/commander/intellij.commander.iml b/plugins/commander/intellij.commander.iml
index 6a57b0915dc23a27523f1ae52c078e8b96897f1e..0e0c7592624f13f89c93b79b7c2eca185d5a1f36 100644 (file)
--- a/plugins/commander/intellij.commander.iml
+++ b/plugins/commander/intellij.commander.iml
@@ -7,14 +7,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="diff-impl" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
   </component>
   <component name="copyright">
     <Base>
       <setting name="state" value="1" />
     </Base>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/copyright/intellij.copyright.iml b/plugins/copyright/intellij.copyright.iml
index 580b24d74fa26562fca550b622148c3e071e33a3..8c739e000cf7745e74fbfcc79322e6113ba3d671 100644 (file)
--- a/plugins/copyright/intellij.copyright.iml
+++ b/plugins/copyright/intellij.copyright.iml
@@ -8,17 +8,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jsp-openapi" />
-    <orderEntry type="module" module-name="xml-openapi" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="intellij.jsp" />
+    <orderEntry type="module" module-name="intellij.xml" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="library" name="Velocity" level="project" />
-    <orderEntry type="module" module-name="xml" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="testExtensions" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="configuration-store-impl" scope="TEST" />
-    <orderEntry type="module" module-name="external-system-api" />
+    <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
   </component>
 </module>
\ No newline at end of file

diff --git a/plugins/coverage-common/intellij.platform.coverage.iml b/plugins/coverage-common/intellij.platform.coverage.iml
index 08567374ed2d3568062650380f9e62d058d89071..9aabc3aebfe7c09af42c754adb2a5874a023f870 100644 (file)
--- a/plugins/coverage-common/intellij.platform.coverage.iml
+++ b/plugins/coverage-common/intellij.platform.coverage.iml
@@ -7,17 +7,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="extensions" />
-    <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="module" module-name="intellij.platform.extensions" />
+    <orderEntry type="module" module-name="intellij.platform.annotations.java5" />
     <orderEntry type="library" exported="" name="ASM" level="project" />
     <orderEntry type="library" exported="" name="Coverage" level="project" />
     <orderEntry type="library" exported="" name="Trove4j" level="project" />
-    <orderEntry type="module" module-name="testRunner" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="lvcs-api" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lvcs" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
   </component>
 </module>
\ No newline at end of file

diff --git a/plugins/coverage/coverage_rt/intellij.java.coverage.rt.iml b/plugins/coverage/coverage_rt/intellij.java.coverage.rt.iml
index 15f3796e75345f36de2fc378202d6a9fca569f1a..657a814f9d2e1604934a83c6e4884894833d8c8c 100644 (file)
--- a/plugins/coverage/coverage_rt/intellij.java.coverage.rt.iml
+++ b/plugins/coverage/coverage_rt/intellij.java.coverage.rt.iml
@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="jdk" jdkName="IDEA jdk" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="testng_rt" />
-    <orderEntry type="module" module-name="junit_rt" />
+    <orderEntry type="module" module-name="intellij.testng.rt" />
+    <orderEntry type="module" module-name="intellij.junit.rt" />
     <orderEntry type="library" scope="PROVIDED" name="TestNG" level="project" />
     <orderEntry type="library" name="Coverage" level="project" />
   </component>

diff --git a/plugins/coverage/intellij.java.coverage.iml b/plugins/coverage/intellij.java.coverage.iml
index bcb5c79be6e9d2143b4fd3893697394d6aa98639..39c97b21569662b1eb56ed50e47083fdc108f5f2 100644 (file)
--- a/plugins/coverage/intellij.java.coverage.iml
+++ b/plugins/coverage/intellij.java.coverage.iml
@@ -8,11 +8,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="coverage-common" exported="" />
-    <orderEntry type="module" module-name="execution-openapi" exported="" />
-    <orderEntry type="module" module-name="openapi" exported="" />
-    <orderEntry type="module" module-name="execution-impl" />
-    <orderEntry type="module" module-name="testRunner" />
+    <orderEntry type="module" module-name="intellij.platform.coverage" exported="" />
+    <orderEntry type="module" module-name="intellij.java.execution" exported="" />
+    <orderEntry type="module" module-name="intellij.java" exported="" />
+    <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testRunner" />
     <orderEntry type="module-library" exported="">
       <library name="CoverageReport">
         <CLASSES>
@@ -24,15 +24,15 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="testng_rt" />
-    <orderEntry type="module" module-name="junit_rt" />
-    <orderEntry type="module" module-name="compiler-openapi" />
+    <orderEntry type="module" module-name="intellij.testng.rt" />
+    <orderEntry type="module" module-name="intellij.junit.rt" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
     <orderEntry type="library" name="JaCoCo" level="project" />
-    <orderEntry type="module" module-name="coverage_rt" />
-    <orderEntry type="module" module-name="java-psi-impl" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.coverage.rt" />
+    <orderEntry type="module" module-name="intellij.java.psi.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/plugins/cvs/cvs-core/intellij.vcs.cvs.core.iml b/plugins/cvs/cvs-core/intellij.vcs.cvs.core.iml
index 88526e93b543d110038aa428e59eb58e20ffc1be..b0ec957a0ddd65f0a1dda78ad6b1259f1bae61c9 100644 (file)
--- a/plugins/cvs/cvs-core/intellij.vcs.cvs.core.iml
+++ b/plugins/cvs/cvs-core/intellij.vcs.cvs.core.iml
@@ -7,9 +7,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="javacvs-src" />
-    <orderEntry type="module" module-name="vcs-api" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.vcs.cvs.javacvs" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module-library">
       <library name="trilead-ssh2-build213">
         <CLASSES>

diff --git a/plugins/cvs/cvs-plugin/intellij.vcs.cvs.iml b/plugins/cvs/cvs-plugin/intellij.vcs.cvs.iml
index 153fbd22d72949209de7d54163c3cef07a1842a0..0cc24b3b5da06adca047baf531a68f363d9f66b6 100644 (file)
--- a/plugins/cvs/cvs-plugin/intellij.vcs.cvs.iml
+++ b/plugins/cvs/cvs-plugin/intellij.vcs.cvs.iml
@@ -7,14 +7,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="cvs-core" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="module" module-name="javacvs-src" />
-    <orderEntry type="module" module-name="vcs-impl" />
-    <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="smartcvs-src" />
+    <orderEntry type="module" module-name="intellij.vcs.cvs.core" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="module" module-name="intellij.vcs.cvs.javacvs" />
+    <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.vcs.cvs.smartcvs" />
     <orderEntry type="library" name="microba" level="project" />
-    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/cvs/javacvs-src/intellij.vcs.cvs.javacvs.iml b/plugins/cvs/javacvs-src/intellij.vcs.cvs.javacvs.iml
index 344d3a6d9b9c8c5460be48a1c66ab251aee90d5d..c3bc6b914ca44436f6115ce9545a745e974abd04 100644 (file)
--- a/plugins/cvs/javacvs-src/intellij.vcs.cvs.javacvs.iml
+++ b/plugins/cvs/javacvs-src/intellij.vcs.cvs.javacvs.iml
@@ -7,12 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
   </component>
   <component name="copyright">
     <Base>
       <setting name="state" value="2" />
     </Base>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/cvs/smartcvs-src/intellij.vcs.cvs.smartcvs.iml b/plugins/cvs/smartcvs-src/intellij.vcs.cvs.smartcvs.iml
index 0c9eb7231064999e02ea3e0d5a9969b993547d4b..66eb73005e1f286cafcfe96df22385aff7b805ae 100644 (file)
--- a/plugins/cvs/smartcvs-src/intellij.vcs.cvs.smartcvs.iml
+++ b/plugins/cvs/smartcvs-src/intellij.vcs.cvs.smartcvs.iml
@@ -7,13 +7,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="javacvs-src" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.vcs.cvs.javacvs" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
   </component>
   <component name="copyright">
     <Base>
       <setting name="state" value="2" />
     </Base>
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml
index 1bd4b4e336377d7a12092e292bc76a0d44112d03..125abbbc12a19f3ae12f36ba8ec3c959c84716b3 100644 (file)
--- a/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml
+++ b/plugins/devkit/devkit-kotlin-tests/intellij.devkit.kotlin.tests.iml
@@ -8,10 +8,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="RUNTIME" name="KotlinPlugin" level="project" />
-    <orderEntry type="module" module-name="devkit" />
+    <orderEntry type="module" module-name="intellij.devkit" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework" scope="TEST" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/plugins/devkit/intellij.devkit.iml b/plugins/devkit/intellij.devkit.iml
index 764220ff14e2e2f8568139dbeb98a386f3eb2dc1..7a3e78215c63bbd695f4054e53237ff75bba4ec2 100644 (file)
--- a/plugins/devkit/intellij.devkit.iml
+++ b/plugins/devkit/intellij.devkit.iml
@@ -10,18 +10,18 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="openapi" />
-    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="JDOM" level="project" />
-    <orderEntry type="module" module-name="compiler-openapi" />
-    <orderEntry type="module" module-name="execution-openapi" />
-    <orderEntry type="module" module-name="dom-openapi" />
-    <orderEntry type="module" module-name="execution-impl" />
-    <orderEntry type="module" module-name="java-impl" />
-    <orderEntry type="module" module-name="compiler-impl" />
-    <orderEntry type="module" module-name="properties" />
-    <orderEntry type="module" module-name="xml" />
-    <orderEntry type="module" module-name="jps-builders" />
+    <orderEntry type="module" module-name="intellij.java.compiler" />
+    <orderEntry type="module" module-name="intellij.java.execution" />
+    <orderEntry type="module" module-name="intellij.xml.dom" />
+    <orderEntry type="module" module-name="intellij.java.execution.impl" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java.compiler.impl" />
+    <orderEntry type="module" module-name="intellij.properties" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="Xerces" level="project" />
     <orderEntry type="module-library">
@@ -33,20 +33,20 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="spellchecker" />
-    <orderEntry type="module" module-name="properties-psi-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="testFramework" />
-    <orderEntry type="module" module-name="dom-impl" />
-    <orderEntry type="module" module-name="devkit-jps-plugin" scope="RUNTIME" />
-    <orderEntry type="module" module-name="images" />
-    <orderEntry type="module" module-name="uast-common" />
-    <orderEntry type="module" module-name="gradle" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.spellchecker" />
+    <orderEntry type="module" module-name="intellij.properties.psi" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" />
+    <orderEntry type="module" module-name="intellij.xml.dom.impl" />
+    <orderEntry type="module" module-name="intellij.devkit.jps" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.images" />
+    <orderEntry type="module" module-name="intellij.platform.uast" />
+    <orderEntry type="module" module-name="intellij.gradle" />
+    <orderEntry type="module" module-name="intellij.java.ui" />
+    <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="module" module-name="dom-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.dom.tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="TestNG" level="project" />
-    <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.java.compiler.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file

diff --git a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml
index a80f7f38f339af4b9afaf2aaaba3e8f9c958d617..da87d69a2173251ab74f23d7693abc563d61c38e 100644 (file)
--- a/plugins/devkit/jps-plugin/intellij.devkit.jps.iml
+++ b/plugins/devkit/jps-plugin/intellij.devkit.jps.iml
@@ -8,11 +8,10 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="jps-model-api" />
-    <orderEntry type="module" module-name="jps-model-serialization" />
-    <orderEntry type="module" module-name="jps-builders" />
-    <orderEntry type="module" module-name="jps-model-impl" scope="TEST" />
-    <orderEntry type="module" module-name="jps-serialization-tests" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
+    <orderEntry type="module" module-name="intellij.platform.jps.build" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization.tests" scope="TEST" />
   </component>
-</module>
-
+</module>
\ No newline at end of file

diff --git a/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml b/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml
index a78a74e4f15f0282d36ca59b46aa2589a65269c2..909c17cf7ff754f4ba72522edcf6e67f17229918 100644 (file)
--- a/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml
+++ b/plugins/eclipse/common-eclipse-util/intellij.eclipse.common.iml
@@ -7,9