From a852c05b9b8fde88daf2f52c103084d5eeb1f337 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 8 Dec 2015 18:23:12 +0300
Subject: [PATCH] part of external-system-api module which is used in
 gradle-tooling process classpath extracted to a separate module
 (external-system-rt)

---
 .idea/modules.xml                                    |  1 +
 build/conf/classVersions.txt                         |  2 ++
 build/scripts/layouts.gant                           |  2 ++
 platform/external-system-api/external-system-api.iml |  3 ++-
 platform/external-system-rt/external-system-rt.iml   | 12 ++++++++++++
 .../model/ExternalSystemException.java               |  0
 .../model/project/ExternalSystemSourceType.java      |  0
 .../model/project/IExternalSystemSourceType.java     |  0
 .../project/BaseGradleProjectResolverExtension.java  |  2 +-
 .../gradle-tooling-extension-api.iml                 |  2 +-
 .../gradle-tooling-extension-impl.iml                |  2 +-
 11 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 platform/external-system-rt/external-system-rt.iml
 rename platform/{external-system-api => external-system-rt}/src/com/intellij/openapi/externalSystem/model/ExternalSystemException.java (100%)
 rename platform/{external-system-api => external-system-rt}/src/com/intellij/openapi/externalSystem/model/project/ExternalSystemSourceType.java (100%)
 rename platform/{external-system-api => external-system-rt}/src/com/intellij/openapi/externalSystem/model/project/IExternalSystemSourceType.java (100%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 77fc541298b1..d7412724d55b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -88,6 +88,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/extensions/extensions.iml" filepath="$PROJECT_DIR$/platform/extensions/extensions.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/external-system-api/external-system-api.iml" filepath="$PROJECT_DIR$/platform/external-system-api/external-system-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" filepath="$PROJECT_DIR$/platform/external-system-impl/external-system-impl.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/platform/external-system-rt/external-system-rt.iml" filepath="$PROJECT_DIR$/platform/external-system-rt/external-system-rt.iml" group="platform"/>
       <module fileurl="file://$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" filepath="$PROJECT_DIR$/java/compiler/forms-compiler/forms-compiler.iml" group="java/compiler" />
       <module fileurl="file://$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" filepath="$PROJECT_DIR$/platform/forms_rt/forms_rt.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/git4idea.iml" filepath="$PROJECT_DIR$/plugins/git4idea/git4idea.iml" group="plugins/VCS" />
diff --git a/build/conf/classVersions.txt b/build/conf/classVersions.txt
index b42573e0be0a..639a4e8503c7 100644
--- a/build/conf/classVersions.txt
+++ b/build/conf/classVersions.txt
@@ -44,6 +44,8 @@
 1.8 => redist/annotations-java8.jar
 1.3 => plugins/junit/lib/junit-rt.jar
 
+1.6 => lib/external-system-rt.jar
+
 1.6 => plugins/gradle/lib/gradle-tooling-extension-api.jar
 1.6 => plugins/gradle/lib/gradle-tooling-extension-impl.jar
 
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index da1fbd1fd875..22b39bcc16de 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -181,6 +181,8 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
 
       jar("extensions.jar") { module("extensions")}
 
+      jar("external-system-rt.jar") { module("external-system-rt")}
+
       jar([name: "idea.jar", duplicate: "preserve"]) {
         implementationModules.each { module it}
       }
diff --git a/platform/external-system-api/external-system-api.iml b/platform/external-system-api/external-system-api.iml
index 560cd417f4ad..e04ae61c2ae1 100644
--- a/platform/external-system-api/external-system-api.iml
+++ b/platform/external-system-api/external-system-api.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -14,5 +14,6 @@
     <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="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/external-system-rt/external-system-rt.iml b/platform/external-system-rt/external-system-rt.iml
new file mode 100644
index 000000000000..a58c68919b9f
--- /dev/null
+++ b/platform/external-system-rt/external-system-rt.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="annotations" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSystemException.java b/platform/external-system-rt/src/com/intellij/openapi/externalSystem/model/ExternalSystemException.java
similarity index 100%
rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSystemException.java
rename to platform/external-system-rt/src/com/intellij/openapi/externalSystem/model/ExternalSystemException.java
diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ExternalSystemSourceType.java b/platform/external-system-rt/src/com/intellij/openapi/externalSystem/model/project/ExternalSystemSourceType.java
similarity index 100%
rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ExternalSystemSourceType.java
rename to platform/external-system-rt/src/com/intellij/openapi/externalSystem/model/project/ExternalSystemSourceType.java
diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/IExternalSystemSourceType.java b/platform/external-system-rt/src/com/intellij/openapi/externalSystem/model/project/IExternalSystemSourceType.java
similarity index 100%
rename from platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/IExternalSystemSourceType.java
rename to platform/external-system-rt/src/com/intellij/openapi/externalSystem/model/project/IExternalSystemSourceType.java
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
index eb71ef36f31c..54b3feec7d86 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
@@ -495,7 +495,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
   @Override
   public Set<Class> getToolingExtensionsClasses() {
     return ContainerUtil.<Class>set(
-      // externalSystem api jar
+      // external-system-rt.jar
       ExternalSystemSourceType.class,
       // gradle-tooling-extension-api jar
       ProjectImportAction.class,
diff --git a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
index d895123cae94..23012e7dd3ed 100644
--- a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
+++ b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="external-system-api" />
+    <orderEntry type="module" module-name="external-system-rt" />
     <orderEntry type="module" module-name="annotations" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
diff --git a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
index 48ad9ab658b3..c8fb1acce762 100644
--- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
+++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
@@ -10,7 +10,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="annotations" />
-    <orderEntry type="module" module-name="external-system-api" />
+    <orderEntry type="module" module-name="external-system-rt" />
     <orderEntry type="module" module-name="gradle-tooling-extension-api" />
     <orderEntry type="module" module-name="gradle" scope="TEST" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />