From a95dedb76c981662b36da9f2efc3fb8fa4745b86 Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Wed, 1 Oct 2014 20:08:18 +0400
Subject: [PATCH] Simplified xml structure for pycharm/python plugin
 community/professional. Added clarification comments.

---
 python/pluginSrc/META-INF/python-plugin-core.xml |  3 ++-
 python/src/META-INF/PyCharmCorePlugin.xml        |  9 ++++++++-
 python/src/META-INF/pycharm-community.xml        | 11 -----------
 python/src/META-INF/pycharm-core.xml             |  4 +++-
 python/src/META-INF/python-core.xml              |  3 ++-
 5 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 python/src/META-INF/pycharm-community.xml

diff --git a/python/pluginSrc/META-INF/python-plugin-core.xml b/python/pluginSrc/META-INF/python-plugin-core.xml
index d797dc8138d2..453d3bdc3334 100644
--- a/python/pluginSrc/META-INF/python-plugin-core.xml
+++ b/python/pluginSrc/META-INF/python-plugin-core.xml
@@ -1,5 +1,6 @@
 <idea-plugin version="2">
-  <!-- Components and extensions declared in this file work in the Python plugin, both Community and full versions. -->
+  <!-- Components and extensions declared in this file work ONLY in the Python plugin,
+       both Community and Professional versions. -->
 
   <extensions defaultExtensionNs="com.intellij">
     <moduleType id="PYTHON_MODULE" implementationClass="com.jetbrains.python.module.PythonModuleType"/>
diff --git a/python/src/META-INF/PyCharmCorePlugin.xml b/python/src/META-INF/PyCharmCorePlugin.xml
index 99a39a1d0cc7..c6202d8022ed 100644
--- a/python/src/META-INF/PyCharmCorePlugin.xml
+++ b/python/src/META-INF/PyCharmCorePlugin.xml
@@ -1,4 +1,11 @@
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="/META-INF/pycharm-community.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
+  <application-components>
+    <component>
+      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
+      <implementation-class>com.jetbrains.python.console.PythonToolWindowConsoleRunnerFactory</implementation-class>
+    </component>
+  </application-components>
 </idea-plugin>
diff --git a/python/src/META-INF/pycharm-community.xml b/python/src/META-INF/pycharm-community.xml
deleted file mode 100644
index 68518574169d..000000000000
--- a/python/src/META-INF/pycharm-community.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin. -->
-  <xi:include href="/META-INF/pycharm-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <application-components>
-    <component>
-      <interface-class>com.jetbrains.python.console.PythonConsoleRunnerFactory</interface-class>
-      <implementation-class>com.jetbrains.python.console.PythonToolWindowConsoleRunnerFactory</implementation-class>
-    </component>
-  </application-components>
-</idea-plugin>
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml
index ef26ab80462f..9ebe97183f09 100644
--- a/python/src/META-INF/pycharm-core.xml
+++ b/python/src/META-INF/pycharm-core.xml
@@ -1,5 +1,7 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" version="2">
-  <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin. -->
+  <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
+       Both Community and Professional editions. -->
+
   <xi:include href="/META-INF/IdeTipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/PlatformLangPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
index 5091d43386a1..d93ae78fd1e8 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -1,5 +1,6 @@
 <idea-plugin version="2">
-  <!-- Components and extensions declared in this file work both in PyCharm and Python plugin. -->
+  <!-- Components and extensions declared in this file work both in PyCharm and Python plugin.
+       Both Community and Professional editions. -->
 
   <resource-bundle>com.jetbrains.python.PyBundle</resource-bundle>