xml file for ultimate-only components and actions

diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index f7b7b8500c2c7364a6394fb484d04deb9f3fbd0b..1c251be823efcf8e64793bf978f546f39fe01c8d 100644 (file)
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -736,12 +736,6 @@ action.WhatsNewAction.text=What's _New in IntelliJ IDEA
 action.WhatsNewAction.description=Find out about the new features in this version of IntelliJ IDEA
 action.Help.KeymapReference.text=Default _Keymap Reference
 action.Help.KeymapReference.description=Open PDF file with the default keymap reference card.
-action.Register.text=_Register...
-action.Register.description=Enter registration data
-action.ObtainPermanentTicket.text=Obtain Permanent _License...
-action.ObtainPermanentTicket.description=Obtain a license from the license server, which is locked to this particular machine
-action.ReleasePermanentTicket.text=Return Permanent License
-action.ReleasePermanentTicket.description=Return the license to the pool of floating licenses on the license server
 action.CheckForUpdate.text=_Check for Update...
 action.CheckForUpdate.description=Check for available update
 action.About.text=_About

diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index beb738ac252fbb3c0e2dc45416065fd8092a4376..4c992a0bf58c262bec25ed579a53439396880852 100644 (file)
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -79,5 +79,8 @@
   </project-components>
 
   <xi:include href="xdebugger.xml" xpointer="xpointer(/root/*)"/>
+  <xi:include href="/META-INF/ultimate.xml" xpointer="xpointer(/idea-plugin/*)">
+    <xi:fallback/>
+  </xi:include>
 
 </idea-plugin>

diff --git a/platform/platform-resources/src/componentSets/Platform.xml b/platform/platform-resources/src/componentSets/Platform.xml
index 88ebdf0c1c75ecc4d24e1ea8e81c0eba98354c99..99728ed5eb4f800d08c1ac2daf3f5ef36b62ab84 100644 (file)
--- a/platform/platform-resources/src/componentSets/Platform.xml
+++ b/platform/platform-resources/src/componentSets/Platform.xml
@@ -70,11 +70,6 @@
       <implementation-class>com.intellij.application.options.PathMacrosImpl</implementation-class>
     </component>
 
-    <component>
-      <implementation-class>com.intellij.ide.Exe4jListener</implementation-class>
-      <headless-implementation-class/>
-    </component>
-
     <component>
       <implementation-class>com.intellij.ide.TipOfTheDayManager</implementation-class>
     </component>
@@ -108,11 +103,6 @@
     <component>
       <implementation-class>com.intellij.notification.impl.NotificationsManager</implementation-class>
     </component>
-
-    <component>
-      <implementation-class>com.intellij.ide.EvaluationSupport</implementation-class>
-      <headless-implementation-class/>
-    </component>
   </application-components>
 
   <project-components>

diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index cb917410ce6c35c9fa6662301746609b4e72cb2c..47155db01f4fdc45ccdaac080fe4289f346f9d99 100644 (file)
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -260,9 +260,6 @@
         <action id="Help.KeymapReference" class="com.intellij.ide.actions.RefCardAction"
                 icon="/general/defaultKeymap.png"/>
         <separator/>
-        <action id="Register" class="com.intellij.ide.actions.RegisterAction"/>
-        <action id="ObtainPermanentTicket" class="com.intellij.ide.actions.ObtainPermanentTicketAction"/>
-        <action id="ReleasePermanentTicket" class="com.intellij.ide.actions.ReleasePermanentTicketAction"/>
         <action id="CheckForUpdate" class="com.intellij.openapi.updateSettings.impl.CheckForUpdateAction"/>
         <action id="About" class="com.intellij.ide.actions.AboutAction"/>
       </group>