structural search: make part of platform

build/scripts/layouts.gant

@@ -82,7 +82,8 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "remote-servers-java-impl",
     "testFramework",
     "tests_bootstrap",
-    "ui-designer-core"
+    "ui-designer-core",
+    "structuralsearch-java"
   ].flatten()
   implementationModules.removeAll(jpsCommonModules) //todo[nik] remove jps modules from platformImplementationModules instead and update layouts of minor IDEs accordingly
 
@@ -534,15 +535,6 @@ public def layoutCommunityPlugins(String home) {
       }
     }
 
-    pluginDir("structuralsearch") {
-      dir("lib") {
-        jar("structuralsearch.jar") {
-          module("structuralsearch")
-          module("structuralsearch-java")
-        }
-      }
-    }
-
     pluginDir("java-decompiler") {
       dir("lib") {
         jar("java-decompiler.jar") {

build/scripts/utils.gant

@@ -302,7 +302,8 @@ binding.setVariable("platformImplementationModules", [
   "xml-structure-view-impl",
   "protocol-reader-runtime",
   "script-debugger-backend",
-  "script-debugger-ui"
+  "script-debugger-ui",
+  "structuralsearch"
 ])
 
 binding.setVariable("layoutMacApp", { String path, String ch, Map args ->

java/structuralsearch-java/src/META-INF/structuralsearch-java.xml

@@ -1,4 +1,4 @@
-<idea-plugin url="http://www.jetbrains.com/idea">
+<idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
     <structuralsearch.profile implementation="com.intellij.structuralsearch.JavaStructuralSearchProfile"/>
     <structuralsearch.matchPredicateProvider implementation="com.intellij.structuralsearch.impl.matcher.JavaMatchPredicateProvider"/>

platform/platform-impl/src/com/intellij/ide/customize/PluginGroups.java

@@ -17,6 +17,7 @@ package com.intellij.ide.customize;
 
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManager;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.ide.plugins.RepositoryHelper;
 import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.application.PathManager;
@@ -58,14 +59,14 @@ class PluginGroups {
   }
 
   private PluginGroups() {
-    myAllPlugins = PluginManager.loadDescriptors(null);
+    myAllPlugins = PluginManagerCore.loadDescriptors(null);
     try {
       myPluginsFromRepository.addAll(RepositoryHelper.loadPluginsFromRepository(null));
     }
     catch (Exception e) {
       //OK, it's offline
     }
-    PluginManager.loadDisabledPlugins(new File(PathManager.getConfigPath()).getPath(), myDisabledPluginIds);
+    PluginManagerCore.loadDisabledPlugins(new File(PathManager.getConfigPath()).getPath(), myDisabledPluginIds);
 
 
     myTree.put(CORE, Pair.create((String)null, Arrays.asList(
@@ -74,7 +75,6 @@ class PluginGroups {
       "org.intellij.intelliLang",
       "com.intellij.properties",
       "Refactor-X",//?
-      "Structural Search",
       "Type Migration",
       "ZKM"
     )));

platform/structuralsearch/build.xml

@@ -1,4 +1,4 @@
-<project name="StructuralSearchPlugin" default="jar_plugin" basedir=".">
+<project name="StructuralSearchPlugin" default="jar_plugin" basedir="">
   <property name="plugname" value="StructuralSearchPlugin"/>
   <property name="releasePlugname" value="SS"/>
   <property name="build.path" value="${project.path}/build_out"/>

platform/structuralsearch/source/META-INF/structuralsearch.xml

@@ -1,12 +1,4 @@
 <idea-plugin>
-  <name>Structural Search</name>
-  <description>Searching / replacing source code in terms of syntax (query / replace code by example :-).
-  </description>
-  <version>9.0</version>
-  <vendor>JetBrains</vendor>
-  <depends>com.intellij.modules.lang</depends>
-  <depends optional="true" config-file="java.xml">com.intellij.java-i18n</depends>
-
   <extensionPoints>
     <extensionPoint qualifiedName="com.intellij.structuralsearch.profile"
                     interface="com.intellij.structuralsearch.StructuralSearchProfile"/>