diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index 2f19163b71f1..799d7cb0a1cc 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -1,208 +1,208 @@
-<extensions>
-  <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
-  <appStarter implementation="com.intellij.openapi.diff.DiffApplication"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.actionSystem.JBAwtEventQueue"
-                      serviceImplementation="com.intellij.openapi.actionSystem.impl.JBAwtEventQueueImpl"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.vfs.tracker.VirtualFileTracker"
-                      serviceImplementation="com.intellij.openapi.vfs.tracker.VirtualFileTrackerImpl"/>
-
-  <applicationService serviceInterface="com.intellij.concurrency.JobScheduler"
-                      serviceImplementation="com.intellij.concurrency.JobSchedulerImpl"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.options.ShowSettingsUtil"
-                      serviceImplementation="com.intellij.ide.actions.ShowSettingsUtilImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.help.HelpManager"
-                      serviceImplementation="com.intellij.help.impl.HelpManagerImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.fileChooser.FileChooserFactory"
-                      serviceImplementation="com.intellij.openapi.fileChooser.impl.FileChooserFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.progress.ProgressManager"
-                      serviceImplementation="com.intellij.openapi.progress.impl.ProgressManagerImpl"/>
-
-  <undoProvider implementation="com.intellij.openapi.command.impl.FileUndoProvider"/>
-  <projectUndoProvider implementation="com.intellij.openapi.command.impl.FileUndoProvider"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.command.CommandProcessor"
-                      serviceImplementation="com.intellij.openapi.command.impl.CommandProcessorImpl"/>
-
-  <applicationService serviceInterface="com.intellij.ide.CommonActionsManager"
-                      serviceImplementation="com.intellij.ide.impl.CommonActionsManagerImpl"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.ide.CopyPasteManager"
-                      serviceImplementation="com.intellij.ide.CopyPasteManagerEx"/>
-  <applicationService serviceInterface="com.intellij.openapi.ui.popup.JBPopupFactory"
-                      serviceImplementation="com.intellij.ui.popup.PopupFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.diff.DiffManager"
-                      serviceImplementation="com.intellij.openapi.diff.impl.external.DiffManagerImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.fileEditor.ex.FileEditorProviderManager"
-                      serviceImplementation="com.intellij.openapi.fileEditor.impl.FileEditorProviderManagerImpl"/>
-  <applicationService serviceInterface="com.intellij.ide.ui.search.SearchableOptionsRegistrar"
-                      serviceImplementation="com.intellij.ide.ui.search.SearchableOptionsRegistrarImpl"/>
-
-  <applicationService serviceInterface="com.intellij.diagnostic.ErrorReportConfigurable"
-                      serviceImplementation="com.intellij.diagnostic.ErrorReportConfigurable"/>
-  <applicationService serviceInterface="com.intellij.util.net.HttpConfigurable"
-                      serviceImplementation="com.intellij.util.net.HttpConfigurable"/>
-  <applicationService serviceInterface="com.intellij.openapi.vfs.impl.http.RemoteFileManager"
-                      serviceImplementation="com.intellij.openapi.vfs.impl.http.RemoteFileManagerImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.vfs.newvfs.RefreshQueue"
-                      serviceImplementation="com.intellij.openapi.vfs.newvfs.RefreshQueueImpl"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.ui.DialogWrapperPeerFactory"
-                      serviceImplementation="com.intellij.openapi.ui.impl.DialogWrapperPeerFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.vcs.FileStatusFactory"
-                      serviceImplementation="com.intellij.openapi.vcs.impl.FileStatusFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.ui.content.ContentFactory"
-                      serviceImplementation="com.intellij.ui.content.ContentFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.ui.TreeUIHelper"
-                      serviceImplementation="com.intellij.ui.TreeUIHelperImpl"/>
-  <applicationService serviceInterface="com.intellij.ui.ExpandableItemsHandlerFactory"
-                      serviceImplementation="com.intellij.ui.ExpandTipHandlerFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.diff.DiffRequestFactory"
-                      serviceImplementation="com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.ui.SystemNotifications"
-                      serviceImplementation="com.intellij.ui.SystemNotificationsImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.keymap.KeymapGroupFactory"
-                      serviceImplementation="com.intellij.openapi.keymap.impl.KeymapGroupFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.editor.highlighter.EditorHighlighterFactory"
-                      serviceImplementation="com.intellij.openapi.editor.highlighter.EditorHighlighterFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.ide.dnd.DnDManager"
-                      serviceImplementation="com.intellij.ide.dnd.DnDManagerImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.vfs.encoding.EncodingManager"
-                      serviceImplementation="com.intellij.openapi.vfs.encoding.EncodingManagerImpl"/>
-  <applicationService serviceInterface="com.intellij.ui.errorView.ErrorViewFactory"
-                      serviceImplementation="com.intellij.ui.errorView.impl.ErrorViewFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.fileChooser.FileSystemTreeFactory"
-                      serviceImplementation="com.intellij.openapi.fileChooser.ex.FileSystemTreeFactoryImpl"/>
-  <applicationService serviceInterface="com.intellij.ide.plugins.PluginManagerUISettings"
-                      serviceImplementation="com.intellij.ide.plugins.PluginManagerUISettings"/>
-  <applicationService serviceInterface="com.intellij.codeInsight.hint.HintManager"
-                      serviceImplementation="com.intellij.codeInsight.hint.HintManagerImpl"/>
-  <applicationService serviceInterface="com.intellij.codeInsight.hint.TooltipController"
-                      serviceImplementation="com.intellij.codeInsight.hint.TooltipController"/>
-  <applicationService serviceInterface="com.intellij.openapi.editor.actionSystem.EditorActionManager"
-                      serviceImplementation="com.intellij.openapi.editor.impl.EditorActionManagerImpl"/>
-  <applicationService serviceInterface="com.intellij.openapi.updateSettings.impl.UpdateSettings"
-                      serviceImplementation="com.intellij.openapi.updateSettings.impl.UpdateSettings"/>
-  <applicationService serviceInterface="com.intellij.featureStatistics.FeatureUsageTracker"
-                      serviceImplementation="com.intellij.featureStatistics.FeatureUsageTrackerImpl"/>
-  <applicationService serviceInterface="com.intellij.featureStatistics.ProductivityFeaturesRegistry"
-                      serviceImplementation="com.intellij.featureStatistics.ProductivityFeaturesRegistryImpl"/>
-  <applicationService serviceInterface="com.intellij.util.InstanceofCheckerGenerator"
-                      serviceImplementation="com.intellij.util.InstanceofCheckerGeneratorImpl"/>
-  <applicationService serviceInterface="com.intellij.internal.psiView.PsiViewerSettings"
-                  serviceImplementation="com.intellij.internal.psiView.PsiViewerSettings"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.keymap.impl.DefaultKeymap"
-                      serviceImplementation="com.intellij.openapi.keymap.impl.DefaultKeymap"/>
-
-  <applicationService serviceInterface="com.intellij.ide.passwordSafe.impl.providers.masterKey.PasswordDatabase"
-                      serviceImplementation="com.intellij.ide.passwordSafe.impl.providers.masterKey.PasswordDatabase"/>
-  <applicationService serviceInterface="com.intellij.ide.passwordSafe.config.PasswordSafeSettings"
-                      serviceImplementation="com.intellij.ide.passwordSafe.config.PasswordSafeSettings"/>
-  <applicationService serviceInterface="com.intellij.ide.passwordSafe.PasswordSafe"
-                      serviceImplementation="com.intellij.ide.passwordSafe.impl.PasswordSafeImpl"/>
-  <applicationConfigurable instance="com.intellij.ide.passwordSafe.config.PasswordSafeConfigurable"/>
-
-  <applicationService serviceInterface="com.intellij.execution.process.ColoredOutputTypeRegistry"
-                      serviceImplementation="com.intellij.execution.process.ColoredOutputTypeRegistry"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.options.SchemesManagerFactory"
-                      serviceImplementation="com.intellij.openapi.options.SchemesManagerFactoryImpl"/>
-
-  <applicationService serviceInterface="com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager"
-                      serviceImplementation="com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager"/>
-  <applicationService serviceInterface="com.intellij.openapi.editor.colors.EditorColorsManager"                 
-                      serviceImplementation="com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl"/>
-  <exportable serviceInterface="com.intellij.openapi.editor.colors.EditorColorsManager"/>
-  <schemeOwner serviceInterface="com.intellij.openapi.editor.colors.EditorColorsManager"/>
-
-  <projectService serviceInterface="com.intellij.openapi.vfs.ReadonlyStatusHandler"
-                  serviceImplementation="com.intellij.openapi.vcs.readOnlyHandler.ReadonlyStatusHandlerImpl"/>
-  <projectService serviceInterface="com.intellij.openapi.startup.StartupManager"
-                  serviceImplementation="com.intellij.ide.startup.impl.StartupManagerImpl"/>
-  <projectService serviceInterface="com.intellij.openapi.ui.MasterDetailsStateService" serviceImplementation="com.intellij.openapi.ui.MasterDetailsStateService"/>
-  <projectService serviceInterface="com.intellij.ide.SelectInManager" serviceImplementation="com.intellij.ide.SelectInManager"/>
-
-  <projectService serviceInterface="com.intellij.ide.errorTreeView.impl.ErrorTreeViewConfiguration"
-                  serviceImplementation="com.intellij.ide.errorTreeView.impl.ErrorTreeViewConfiguration"/>
-
-  <projectService serviceInterface="com.intellij.ide.SelectInEditorManager"
-                  serviceImplementation="com.intellij.ide.impl.SelectInEditorManagerImpl"/>
-  <projectService serviceInterface="com.intellij.ui.RecentsManager"
-                  serviceImplementation="com.intellij.ui.RecentsManager"/>
-  <projectService serviceInterface="com.intellij.ui.content.MessageView"
-                  serviceImplementation="com.intellij.ui.content.impl.MessageViewImpl"/>
-
-  <projectService serviceInterface="com.intellij.ui.FileColorManager"
-                  serviceImplementation="com.intellij.ui.tabs.FileColorManagerImpl"/>
-
-  <projectService serviceInterface="com.intellij.ui.tabs.FileColorSharedConfigurationManager"
-                  serviceImplementation="com.intellij.ui.tabs.FileColorSharedConfigurationManager"/>
-
-  <projectService serviceInterface="com.intellij.openapi.project.DumbService" serviceImplementation="com.intellij.openapi.project.DumbServiceImpl"/>
-
-  <projectService serviceInterface="com.intellij.psi.util.CachedValuesManager" 
-                  serviceImplementation="com.intellij.util.CachedValuesManagerImpl"/>
-
-  <projectService serviceInterface="com.intellij.openapi.vcs.impl.projectlevelman.AllVcsesI" 
-                  serviceImplementation="com.intellij.openapi.vcs.impl.projectlevelman.AllVcses"/>
-
-  <projectService serviceInterface="com.intellij.openapi.vcs.changes.RemoteRevisionsCache"
-                  serviceImplementation="com.intellij.openapi.vcs.changes.RemoteRevisionsCache"/>
-
-  <projectService serviceInterface="com.intellij.execution.testframework.export.ExportTestResultsConfiguration"
-                      serviceImplementation="com.intellij.execution.testframework.export.ExportTestResultsConfiguration"/>
-
-
-  <!-- General -->
-  <applicationConfigurable instance="com.intellij.ide.GeneralSettingsConfigurable"/>
-
-  <!-- Appearance -->
-  <applicationConfigurable instance="com.intellij.ide.ui.AppearanceConfigurable" id="appearance"/>
-
-  <!-- Keymap -->
-  <applicationConfigurable instance="com.intellij.openapi.keymap.impl.ui.KeymapConfigurable"/>
-
-  <!-- Customizations -->
-  <applicationConfigurable instance="com.intellij.ide.ui.customization.CustomizationConfigurable"/>
-
-  <!-- Web Browser -->
-  <applicationConfigurable instance="com.intellij.ide.BrowserSettings"/>
-
-  <!-- Notifications -->
-  <applicationConfigurable instance="com.intellij.notification.impl.NotificationsConfigurable"/>
-
-  <!-- Plugins -->
-  <applicationConfigurable instance="com.intellij.ide.plugins.PluginManagerConfigurable"/>
-  <applicationConfigurable instance="com.intellij.util.net.HTTPProxySettingsPanel"/>
-  <applicationConfigurable instance="com.intellij.openapi.diff.impl.external.DiffOptionsForm"/>
-  <applicationConfigurable instance="com.intellij.ui.switcher.QuickAccessConfigurable"/>
-
-  <fileTypeFactory implementation="com.intellij.openapi.fileTypes.impl.PlatformFileTypeFactory"/>
-  <applicationService serviceInterface="com.intellij.openapi.options.colors.ColorSettingsPages"
-                        serviceImplementation="com.intellij.openapi.options.colors.pages.ColorSettingsPagesImpl"/>
-
-  <applicationConfigurable instance="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable"/>
-
-  <applicationService serviceInterface="com.intellij.psi.search.scope.packageSet.PackageSetFactory"
-                      serviceImplementation="com.intellij.psi.search.scope.packageSet.PackageSetFactoryImpl"/>
-  <scopeParserExtension implementation="com.intellij.psi.search.scope.packageSet.FilePackageSetParserExtension"/>
-  <applicationService serviceInterface="com.intellij.openapi.ui.popup.StackingPopupDispatcher" serviceImplementation="com.intellij.ui.popup.StackingPopupDispatcherImpl"/>
-
-  <fileEditorProvider implementation="com.intellij.openapi.fileEditor.impl.http.HttpFileEditorProvider"/>
-  <componentConfigurationMerger implementation="com.intellij.openapi.vcs.changes.shelf.ShelfManagerConfigurationMerger"/>
-  <editorActionHandler action="EditorEscape" implementationClass="com.intellij.codeInsight.hint.EscapeHandler" id="hide-hints"/>
-  <ComponentRoamingType component="ChangeListManager" type="DISABLED"/>
-  <ComponentRoamingType component="RestoreUpdateTree" type="DISABLED"/>
-  <ComponentRoamingType component="PropertiesComponent" type="DISABLED"/>
-
-  <progressFunComponentProvider implementation="com.intellij.featureStatistics.ProgressFunProvider"/>
-  <projectConfigurable instance="com.intellij.javaee.ExternalResourceConfigurable"/>
-
-  <bundledKeymapProvider implementation="com.intellij.openapi.keymap.impl.DefaultBundledKeymaps"/>
-  <!-- <checkinHandlerFactory implementation="com.intellij.openapi.vcs.CheckRemoteStatusCheckinHandlerFactory"/> -->
-
-  <statistics.usagesCollector implementation="com.intellij.featureStatistics.FeaturesUsageCollector"/>
-</extensions>
+<extensions>
+  <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
+  <appStarter implementation="com.intellij.openapi.diff.DiffApplication"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.actionSystem.JBAwtEventQueue"
+                      serviceImplementation="com.intellij.openapi.actionSystem.impl.JBAwtEventQueueImpl"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.vfs.tracker.VirtualFileTracker"
+                      serviceImplementation="com.intellij.openapi.vfs.tracker.VirtualFileTrackerImpl"/>
+
+  <applicationService serviceInterface="com.intellij.concurrency.JobScheduler"
+                      serviceImplementation="com.intellij.concurrency.JobSchedulerImpl"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.options.ShowSettingsUtil"
+                      serviceImplementation="com.intellij.ide.actions.ShowSettingsUtilImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.help.HelpManager"
+                      serviceImplementation="com.intellij.help.impl.HelpManagerImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.fileChooser.FileChooserFactory"
+                      serviceImplementation="com.intellij.openapi.fileChooser.impl.FileChooserFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.progress.ProgressManager"
+                      serviceImplementation="com.intellij.openapi.progress.impl.ProgressManagerImpl"/>
+
+  <undoProvider implementation="com.intellij.openapi.command.impl.FileUndoProvider"/>
+  <projectUndoProvider implementation="com.intellij.openapi.command.impl.FileUndoProvider"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.command.CommandProcessor"
+                      serviceImplementation="com.intellij.openapi.command.impl.CommandProcessorImpl"/>
+
+  <applicationService serviceInterface="com.intellij.ide.CommonActionsManager"
+                      serviceImplementation="com.intellij.ide.impl.CommonActionsManagerImpl"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.ide.CopyPasteManager"
+                      serviceImplementation="com.intellij.ide.CopyPasteManagerEx"/>
+  <applicationService serviceInterface="com.intellij.openapi.ui.popup.JBPopupFactory"
+                      serviceImplementation="com.intellij.ui.popup.PopupFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.diff.DiffManager"
+                      serviceImplementation="com.intellij.openapi.diff.impl.external.DiffManagerImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.fileEditor.ex.FileEditorProviderManager"
+                      serviceImplementation="com.intellij.openapi.fileEditor.impl.FileEditorProviderManagerImpl"/>
+  <applicationService serviceInterface="com.intellij.ide.ui.search.SearchableOptionsRegistrar"
+                      serviceImplementation="com.intellij.ide.ui.search.SearchableOptionsRegistrarImpl"/>
+
+  <applicationService serviceInterface="com.intellij.diagnostic.ErrorReportConfigurable"
+                      serviceImplementation="com.intellij.diagnostic.ErrorReportConfigurable"/>
+  <applicationService serviceInterface="com.intellij.util.net.HttpConfigurable"
+                      serviceImplementation="com.intellij.util.net.HttpConfigurable"/>
+  <applicationService serviceInterface="com.intellij.openapi.vfs.impl.http.RemoteFileManager"
+                      serviceImplementation="com.intellij.openapi.vfs.impl.http.RemoteFileManagerImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.vfs.newvfs.RefreshQueue"
+                      serviceImplementation="com.intellij.openapi.vfs.newvfs.RefreshQueueImpl"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.ui.DialogWrapperPeerFactory"
+                      serviceImplementation="com.intellij.openapi.ui.impl.DialogWrapperPeerFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.vcs.FileStatusFactory"
+                      serviceImplementation="com.intellij.openapi.vcs.impl.FileStatusFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.ui.content.ContentFactory"
+                      serviceImplementation="com.intellij.ui.content.ContentFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.ui.TreeUIHelper"
+                      serviceImplementation="com.intellij.ui.TreeUIHelperImpl"/>
+  <applicationService serviceInterface="com.intellij.ui.ExpandableItemsHandlerFactory"
+                      serviceImplementation="com.intellij.ui.ExpandTipHandlerFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.diff.DiffRequestFactory"
+                      serviceImplementation="com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.ui.SystemNotifications"
+                      serviceImplementation="com.intellij.ui.SystemNotificationsImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.keymap.KeymapGroupFactory"
+                      serviceImplementation="com.intellij.openapi.keymap.impl.KeymapGroupFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.editor.highlighter.EditorHighlighterFactory"
+                      serviceImplementation="com.intellij.openapi.editor.highlighter.EditorHighlighterFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.ide.dnd.DnDManager"
+                      serviceImplementation="com.intellij.ide.dnd.DnDManagerImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.vfs.encoding.EncodingManager"
+                      serviceImplementation="com.intellij.openapi.vfs.encoding.EncodingManagerImpl"/>
+  <applicationService serviceInterface="com.intellij.ui.errorView.ErrorViewFactory"
+                      serviceImplementation="com.intellij.ui.errorView.impl.ErrorViewFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.fileChooser.FileSystemTreeFactory"
+                      serviceImplementation="com.intellij.openapi.fileChooser.ex.FileSystemTreeFactoryImpl"/>
+  <applicationService serviceInterface="com.intellij.ide.plugins.PluginManagerUISettings"
+                      serviceImplementation="com.intellij.ide.plugins.PluginManagerUISettings"/>
+  <applicationService serviceInterface="com.intellij.codeInsight.hint.HintManager"
+                      serviceImplementation="com.intellij.codeInsight.hint.HintManagerImpl"/>
+  <applicationService serviceInterface="com.intellij.codeInsight.hint.TooltipController"
+                      serviceImplementation="com.intellij.codeInsight.hint.TooltipController"/>
+  <applicationService serviceInterface="com.intellij.openapi.editor.actionSystem.EditorActionManager"
+                      serviceImplementation="com.intellij.openapi.editor.impl.EditorActionManagerImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.updateSettings.impl.UpdateSettings"
+                      serviceImplementation="com.intellij.openapi.updateSettings.impl.UpdateSettings"/>
+  <applicationService serviceInterface="com.intellij.featureStatistics.FeatureUsageTracker"
+                      serviceImplementation="com.intellij.featureStatistics.FeatureUsageTrackerImpl"/>
+  <applicationService serviceInterface="com.intellij.featureStatistics.ProductivityFeaturesRegistry"
+                      serviceImplementation="com.intellij.featureStatistics.ProductivityFeaturesRegistryImpl"/>
+  <applicationService serviceInterface="com.intellij.util.InstanceofCheckerGenerator"
+                      serviceImplementation="com.intellij.util.InstanceofCheckerGeneratorImpl"/>
+  <applicationService serviceInterface="com.intellij.internal.psiView.PsiViewerSettings"
+                  serviceImplementation="com.intellij.internal.psiView.PsiViewerSettings"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.keymap.impl.DefaultKeymap"
+                      serviceImplementation="com.intellij.openapi.keymap.impl.DefaultKeymap"/>
+
+  <applicationService serviceInterface="com.intellij.ide.passwordSafe.impl.providers.masterKey.PasswordDatabase"
+                      serviceImplementation="com.intellij.ide.passwordSafe.impl.providers.masterKey.PasswordDatabase"/>
+  <applicationService serviceInterface="com.intellij.ide.passwordSafe.config.PasswordSafeSettings"
+                      serviceImplementation="com.intellij.ide.passwordSafe.config.PasswordSafeSettings"/>
+  <applicationService serviceInterface="com.intellij.ide.passwordSafe.PasswordSafe"
+                      serviceImplementation="com.intellij.ide.passwordSafe.impl.PasswordSafeImpl"/>
+  <applicationConfigurable instance="com.intellij.ide.passwordSafe.config.PasswordSafeConfigurable"/>
+
+  <applicationService serviceInterface="com.intellij.execution.process.ColoredOutputTypeRegistry"
+                      serviceImplementation="com.intellij.execution.process.ColoredOutputTypeRegistry"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.options.SchemesManagerFactory"
+                      serviceImplementation="com.intellij.openapi.options.SchemesManagerFactoryImpl"/>
+
+  <applicationService serviceInterface="com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager"
+                      serviceImplementation="com.intellij.openapi.editor.colors.ex.DefaultColorSchemesManager"/>
+  <applicationService serviceInterface="com.intellij.openapi.editor.colors.EditorColorsManager"                 
+                      serviceImplementation="com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl"/>
+  <exportable serviceInterface="com.intellij.openapi.editor.colors.EditorColorsManager"/>
+  <schemeOwner serviceInterface="com.intellij.openapi.editor.colors.EditorColorsManager"/>
+
+  <projectService serviceInterface="com.intellij.openapi.vfs.ReadonlyStatusHandler"
+                  serviceImplementation="com.intellij.openapi.vcs.readOnlyHandler.ReadonlyStatusHandlerImpl"/>
+  <projectService serviceInterface="com.intellij.openapi.startup.StartupManager"
+                  serviceImplementation="com.intellij.ide.startup.impl.StartupManagerImpl"/>
+  <projectService serviceInterface="com.intellij.openapi.ui.MasterDetailsStateService" serviceImplementation="com.intellij.openapi.ui.MasterDetailsStateService"/>
+  <projectService serviceInterface="com.intellij.ide.SelectInManager" serviceImplementation="com.intellij.ide.SelectInManager"/>
+
+  <projectService serviceInterface="com.intellij.ide.errorTreeView.impl.ErrorTreeViewConfiguration"
+                  serviceImplementation="com.intellij.ide.errorTreeView.impl.ErrorTreeViewConfiguration"/>
+
+  <projectService serviceInterface="com.intellij.ide.SelectInEditorManager"
+                  serviceImplementation="com.intellij.ide.impl.SelectInEditorManagerImpl"/>
+  <projectService serviceInterface="com.intellij.ui.RecentsManager"
+                  serviceImplementation="com.intellij.ui.RecentsManager"/>
+  <projectService serviceInterface="com.intellij.ui.content.MessageView"
+                  serviceImplementation="com.intellij.ui.content.impl.MessageViewImpl"/>
+
+  <projectService serviceInterface="com.intellij.ui.FileColorManager"
+                  serviceImplementation="com.intellij.ui.tabs.FileColorManagerImpl"/>
+
+  <projectService serviceInterface="com.intellij.ui.tabs.FileColorSharedConfigurationManager"
+                  serviceImplementation="com.intellij.ui.tabs.FileColorSharedConfigurationManager"/>
+
+  <projectService serviceInterface="com.intellij.openapi.project.DumbService" serviceImplementation="com.intellij.openapi.project.DumbServiceImpl"/>
+
+  <projectService serviceInterface="com.intellij.psi.util.CachedValuesManager" 
+                  serviceImplementation="com.intellij.util.CachedValuesManagerImpl"/>
+
+  <projectService serviceInterface="com.intellij.openapi.vcs.impl.projectlevelman.AllVcsesI" 
+                  serviceImplementation="com.intellij.openapi.vcs.impl.projectlevelman.AllVcses"/>
+
+  <projectService serviceInterface="com.intellij.openapi.vcs.changes.RemoteRevisionsCache"
+                  serviceImplementation="com.intellij.openapi.vcs.changes.RemoteRevisionsCache"/>
+
+  <projectService serviceInterface="com.intellij.execution.testframework.export.ExportTestResultsConfiguration"
+                      serviceImplementation="com.intellij.execution.testframework.export.ExportTestResultsConfiguration"/>
+
+
+  <!-- General -->
+  <applicationConfigurable instance="com.intellij.ide.GeneralSettingsConfigurable"/>
+
+  <!-- Appearance -->
+  <applicationConfigurable instance="com.intellij.ide.ui.AppearanceConfigurable" id="appearance"/>
+
+  <!-- Keymap -->
+  <applicationConfigurable instance="com.intellij.openapi.keymap.impl.ui.KeymapConfigurable"/>
+
+  <!-- Customizations -->
+  <applicationConfigurable instance="com.intellij.ide.ui.customization.CustomizationConfigurable"/>
+
+  <!-- Web Browser -->
+  <applicationConfigurable instance="com.intellij.ide.BrowserSettings"/>
+
+  <!-- Notifications -->
+  <applicationConfigurable instance="com.intellij.notification.impl.NotificationsConfigurable"/>
+
+  <!-- Plugins -->
+  <applicationConfigurable instance="com.intellij.ide.plugins.PluginManagerConfigurable"/>
+  <applicationConfigurable instance="com.intellij.util.net.HTTPProxySettingsPanel"/>
+  <applicationConfigurable instance="com.intellij.openapi.diff.impl.external.DiffOptionsForm"/>
+  <applicationConfigurable instance="com.intellij.ui.switcher.QuickAccessConfigurable"/>
+
+  <fileTypeFactory implementation="com.intellij.openapi.fileTypes.impl.PlatformFileTypeFactory"/>
+  <applicationService serviceInterface="com.intellij.openapi.options.colors.ColorSettingsPages"
+                        serviceImplementation="com.intellij.openapi.options.colors.pages.ColorSettingsPagesImpl"/>
+
+  <applicationConfigurable instance="com.intellij.openapi.updateSettings.impl.UpdateSettingsConfigurable"/>
+
+  <applicationService serviceInterface="com.intellij.psi.search.scope.packageSet.PackageSetFactory"
+                      serviceImplementation="com.intellij.psi.search.scope.packageSet.PackageSetFactoryImpl"/>
+  <scopeParserExtension implementation="com.intellij.psi.search.scope.packageSet.FilePackageSetParserExtension"/>
+  <applicationService serviceInterface="com.intellij.openapi.ui.popup.StackingPopupDispatcher" serviceImplementation="com.intellij.ui.popup.StackingPopupDispatcherImpl"/>
+
+  <fileEditorProvider implementation="com.intellij.openapi.fileEditor.impl.http.HttpFileEditorProvider"/>
+  <componentConfigurationMerger implementation="com.intellij.openapi.vcs.changes.shelf.ShelfManagerConfigurationMerger"/>
+  <editorActionHandler action="EditorEscape" implementationClass="com.intellij.codeInsight.hint.EscapeHandler" id="hide-hints"/>
+  <ComponentRoamingType component="ChangeListManager" type="DISABLED"/>
+  <ComponentRoamingType component="RestoreUpdateTree" type="DISABLED"/>
+  <ComponentRoamingType component="PropertiesComponent" type="DISABLED"/>
+
+  <progressFunComponentProvider implementation="com.intellij.featureStatistics.ProgressFunProvider"/>
+  <projectConfigurable instance="com.intellij.javaee.ExternalResourceConfigurable"/>
+
+  <bundledKeymapProvider implementation="com.intellij.openapi.keymap.impl.DefaultBundledKeymaps"/>
+  <!-- <checkinHandlerFactory implementation="com.intellij.openapi.vcs.CheckRemoteStatusCheckinHandlerFactory"/> -->
+
+  <statistics.usagesCollector implementation="com.intellij.featureStatistics.FeaturesUsageCollector"/>
+</extensions>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index a8a545b558e3..47f8e618d802 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -1,1190 +1,1190 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <id>com.intellij</id>
-  <name>IDEA CORE</name>
-
-  <module value="com.intellij.modules.platform"/>
-  <module value="com.intellij.modules.lang"/>
-  <module value="com.intellij.modules.vcs"/>
-  <module value="com.intellij.modules.xdebugger"/>
-  <module value="com.intellij.modules.xml"/>
-  <module value="com.intellij.modules.java"/>
-  <module value="com.intellij.modules.all"/>
-
-  <xi:include href="/componentSets/IdeaComponents.xml" xpointer="xpointer(/components/*)"/>
-  <xi:include href="/idea/IdeaActions.xml" xpointer="xpointer(/component/*)"/>
-
-  <extensionPoints>
-    <xi:include href="/META-INF/PlatformExtensionPoints.xml" xpointer="xpointer(/extensionPoints/*)"/>
-    <xi:include href="/META-INF/VcsExtensionPoints.xml" xpointer="xpointer(/extensionPoints/*)"/>
-    <xi:include href="/META-INF/LangExtensionPoints.xml" xpointer="xpointer(/extensionPoints/*)"/>
-
-    <extensionPoint name="codeInsight.changeVariableTypeQuickFixProvider"
-                    interface="com.intellij.codeInsight.quickfix.ChangeVariableTypeQuickFixProvider"/>
-    <extensionPoint name="conversion.rule" 
-                    interface="com.intellij.refactoring.typeMigration.rules.TypeConversionRule"/>
-
-    <extensionPoint name="overrideImplementsAnnotationsHandler"
-                    interface="com.intellij.codeInsight.generation.OverrideImplementsAnnotationsHandler"/>
-
-    <extensionPoint name="project.converterProvider"
-                    interface="com.intellij.conversion.ConverterProvider"/>
-
-    <extensionPoint name="junitPatcher"
-                    interface="com.intellij.execution.JUnitPatcher"/>
-
-    <extensionPoint name="i18nInspectionTool"
-                    interface="com.intellij.codeInspection.FileCheckingInspection"/>
-    <extensionPoint name="invalidPropertyKeyInspectionTool"
-                    interface="com.intellij.codeInspection.FileCheckingInspection"/>
-    <extensionPoint name="java15InspectionTool"
-                    interface="com.intellij.codeInspection.FileCheckingInspection"/>
-
-    <extensionPoint name="deadCode"
-                    interface="com.intellij.codeInspection.reference.EntryPoint"/>
-
-    <!-- PsiMember -->
-    <extensionPoint name="javaDocNotNecessary"
-                    interface="com.intellij.openapi.util.Condition"/>
-
-    <!-- PsiMember -->
-    <extensionPoint name="cantBeStatic"
-                    interface="com.intellij.openapi.util.Condition"/>
-
-    <!-- RefMethod -->
-    <extensionPoint name="canBeEmpty"
-                    interface="com.intellij.openapi.util.Condition"/>
-
-    <extensionPoint name="visibility"
-                    interface="com.intellij.codeInspection.visibility.VisibilityExtension"/>
-
-    <extensionPoint name="antBuildGen"
-                    interface="com.intellij.compiler.ant.ChunkBuildExtension"/>
-
-    <extensionPoint name="antCustomCompiler"
-                    interface="com.intellij.compiler.ant.ChunkCustomCompilerExtension"/>
-
-    <extensionPoint name="methodImplementor"
-                    interface="com.intellij.codeInsight.MethodImplementor"/>
-
-    <extensionPoint name="compiler.buildParticipantProvider"
-                    interface="com.intellij.openapi.compiler.make.BuildParticipantProvider"/>
-
-    <extensionPoint name="compiler.additionalCompileScopeProvider"
-                    interface="com.intellij.compiler.impl.AdditionalCompileScopeProvider"/>
-
-    <extensionPoint name="compiler.makeDependencyProcessor"
-                    interface="com.intellij.compiler.DependencyProcessor"/>
-
-    <extensionPoint name="debugger.codeFragmentFactory"
-                    interface="com.intellij.debugger.engine.evaluation.CodeFragmentFactory"/>
-
-    <extensionPoint name="debugger.breakpointFactory"
-                    interface="com.intellij.debugger.ui.breakpoints.BreakpointFactory"/>
-
-    <extensionPoint name="debugger.jvmDebugProvider"
-                    interface="com.intellij.debugger.engine.JVMDebugProvider"/>
-
-    <extensionPoint name="java.programPatcher"
-                    interface="com.intellij.execution.runners.JavaProgramPatcher"/>
-
-    <extensionPoint name="OrderRootTypeUI"
-                    beanClass="com.intellij.openapi.extensions.KeyedFactoryEPBean"/>
-
-    <extensionPoint name="library.creator" interface="com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryCreator"/>
-
-    <extensionPoint name="allOverridingMethodsSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="annotatedElementsSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="annotatedPackagesSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="classInheritorsSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="deepestSuperMethodsSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="directClassInheritorsSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="methodReferencesSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="overridingMethodsSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="superMethodsSearch" interface="com.intellij.util.QueryExecutor"/>
-    <extensionPoint name="allClassesSearch" interface="com.intellij.util.QueryExecutor"/>
-
-    <extensionPoint name="compiler.inspectionValidator"
-                    interface="com.intellij.openapi.compiler.util.InspectionValidator"
-                    area="IDEA_PROJECT"/>
-
-    <extensionPoint name="packaging.elementType" interface="com.intellij.packaging.elements.PackagingElementType"/>
-    <extensionPoint name="packaging.artifactPropertiesProvider" interface="com.intellij.packaging.artifacts.ArtifactPropertiesProvider"/>
-    <extensionPoint name="packaging.sourceItemProvider" interface="com.intellij.packaging.ui.PackagingSourceItemsProvider"/>
-    <extensionPoint name="packaging.artifactType" interface="com.intellij.packaging.artifacts.ArtifactType"/>
-
-    <extensionPoint name="persistenceModel.persistenceModelProvider"
-                    interface="com.intellij.persistenceModel.PersistenceModelProvider"/>
-
-    <extensionPoint name="classpathStorageProvider"
-                    interface="com.intellij.openapi.roots.impl.storage.ClasspathStorageProvider"/>
-
-    <extensionPoint name="javaExpressionSurrounder"
-                    interface="com.intellij.codeInsight.generation.surroundWith.JavaExpressionSurrounder"/>
-
-    <extensionPoint name="frameworkSupport" interface="com.intellij.ide.util.frameworkSupport.FrameworkSupportProvider"/>
-    <extensionPoint name="frameworkSupportCommunicator" interface="com.intellij.ide.util.newProjectWizard.impl.FrameworkSupportCommunicator"/>
-
-    <!--new project wizard-->
-    <extensionPoint name="wizardMode" interface="com.intellij.ide.util.newProjectWizard.modes.WizardMode"/>
-    <extensionPoint name="projectImportProvider" interface="com.intellij.projectImport.ProjectImportProvider"/>
-    <extensionPoint name="projectImportBuilder" interface="com.intellij.projectImport.ProjectImportBuilder"/>
-
-    <extensionPoint name="codeInsight.wordCompletionFilter" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-
-    <extensionPoint name="customPropertyScopeProvider" interface="com.intellij.psi.impl.search.CustomPropertyScopeProvider"/>
-
-    <extensionPoint name="testFramework" interface="com.intellij.testIntegration.TestFramework"/>
-
-    <extensionPoint name="unscrambleSupport" interface="com.intellij.unscramble.UnscrambleSupport"/>
-
-    <extensionPoint name="compiler" area="IDEA_PROJECT" interface="com.intellij.openapi.compiler.Compiler"/>
-    <extensionPoint name="compilerFactory" area="IDEA_PROJECT" interface="com.intellij.openapi.compiler.CompilerFactory"/>
-    <extensionPoint name="compilerSettingsFactory" area="IDEA_PROJECT" interface="com.intellij.compiler.CompilerSettingsFactory"/>
-    <extensionPoint name="clsStubBuilderFactory" interface="com.intellij.psi.impl.compiled.ClsStubBuilderFactory"/>
-    <extensionPoint name="javaMainMethodProvider" interface="com.intellij.codeInsight.runner.JavaMainMethodProvider"/>
-
-    <extensionPoint name="debuggerClassFilterProvider" interface="com.intellij.ui.classFilter.DebuggerClassFilterProvider"/>
-
-    <extensionPoint name="debuggerEditorTextProvider" beanClass="com.intellij.lang.LanguageExtensionPoint" />
-
-    <extensionPoint name="stackFrameFilter" interface="com.intellij.execution.filters.StackFrameFilter"/>
-
-    <extensionPoint name="paletteItemProvider" area="IDEA_PROJECT" interface="com.intellij.ide.palette.PaletteItemProvider"/>
-
-    <extensionPoint name="javadocTagInfo" area="IDEA_PROJECT" interface="com.intellij.psi.javadoc.JavadocTagInfo"/>
-
-    <extensionPoint name="refactoring.introduceParameterMethodUsagesProcessor" interface="com.intellij.refactoring.introduceParameter.IntroduceParameterMethodUsagesProcessor"/>
-
-    <extensionPoint name="annotationSupport" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="constantExpressionEvaluator" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-
-    <!--<extensionPoint name="expectedTypesProvider" interface="com.intellij.codeInsight.ExpectedTypesProviderExtension"/>-->
-
-    <extensionPoint name="java.elementFinder" area="IDEA_PROJECT" interface="com.intellij.psi.PsiElementFinder"/>
-    <extensionPoint name="java.shortNamesCache" area="IDEA_PROJECT" interface="com.intellij.psi.search.PsiShortNamesCache"/>
-
-    <extensionPoint name="attachSourcesProvider" interface="com.intellij.codeInsight.AttachSourcesProvider"/>
-
-    <extensionPoint name="libraryTable.attachHandler" interface="com.intellij.openapi.roots.ui.configuration.libraryEditor.LibraryTableAttachHandler"/>
-
-    <extensionPoint name="java.compiler" area="IDEA_PROJECT" interface="com.intellij.compiler.impl.javaCompiler.BackendCompiler"/>
-
-    <extensionPoint name="classNameInsertHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="allowedApiFilter" interface="com.intellij.psi.impl.AllowedApiFilterExtension"/>
-  </extensionPoints>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <xi:include href="/META-INF/PlatformExtensions.xml" xpointer="xpointer(/extensions/*)"/>
-    <xi:include href="/META-INF/VcsExtensions.xml" xpointer="xpointer(/extensions/*)"/>
-    <xi:include href="/META-INF/LangExtensions.xml" xpointer="xpointer(/extensions/*)"/>
-
-    <constantExpressionEvaluator language="JAVA" implementationClass="com.intellij.psi.impl.PsiExpressionEvaluator" />
-    <annotationSupport language="JAVA" implementationClass="com.intellij.psi.impl.source.tree.java.JavaAnnotationSupport" />
-
-    <codeInsight.unresolvedReferenceQuickFixProvider
-        implementation="com.intellij.codeInsight.daemon.impl.quickfix.DefaultQuickFixProvider"/>
-
-    <codeInsight.changeVariableTypeQuickFixProvider
-        implementation="com.intellij.codeInsight.daemon.impl.quickfix.VariableTypeQuickFixProvider"/>
-
-    <overrideImplementsAnnotationsHandler implementation="com.intellij.codeInsight.generation.OverrideImplementsAnnotationsHandlerImpl"/>
-    <applicationService serviceInterface="com.intellij.openapi.module.ModuleTypeManager"
-                        serviceImplementation="com.intellij.openapi.module.impl.JavaAwareModuleTypeManagerImpl"/>
-    <errorOptionsProvider instance="com.intellij.profile.codeInspection.ui.JavaErrorOptionsProvider"/>
-    <autoImportOptionsProvider instance="com.intellij.application.options.editor.JavaAutoImportOptions"/>
-    <codeFoldingOptionsProvider instance="com.intellij.application.options.editor.JavaCodeFoldingOptionsProvider"/>
-
-
-
-    <!--<expectedTypesProvider implementation="com.intellij.codeInsight.JavaExpectedTypesProvider"/>-->
-
-
-
-    <appStarter implementation="com.intellij.compiler.ant.GenerateAntMain"/>
-
-    <referencesSearch implementation="com.intellij.psi.impl.search.PsiAnnotationMethodReferencesSearcher"/>
-    <referencesSearch implementation="com.intellij.psi.impl.search.ConstructorReferencesSearcher"/>
-    <allClassesSearch implementation="com.intellij.psi.impl.search.AllClassesSearchExecutor"/>
-
-    <referencesSearch implementation="com.intellij.psi.impl.search.SimpleAccessorReferenceSearcher"/>
-
-    <superMethodsSearch implementation="com.intellij.psi.impl.search.MethodSuperSearcher"/>
-    <annotatedElementsSearch implementation="com.intellij.psi.impl.search.AnnotatedElementsSearcher"/>
-    <annotatedPackagesSearch implementation="com.intellij.psi.impl.search.AnnotatedPackagesSearcher"/>
-    <directClassInheritorsSearch implementation="com.intellij.psi.impl.search.JavaDirectInheritorsSearcher"/>
-    <overridingMethodsSearch implementation="com.intellij.psi.impl.search.JavaOverridingMethodsSearcher"/>
-    <allOverridingMethodsSearch implementation="com.intellij.psi.impl.search.JavaAllOverridingMethodsSearcher"/>
-    <methodReferencesSearch implementation="com.intellij.psi.impl.search.MethodUsagesSearcher"/>
-    <deepestSuperMethodsSearch implementation="com.intellij.psi.impl.search.MethodDeepestSuperSearcher"/>
-
-    <definitionsSearch implementation="com.intellij.codeInsight.navigation.MethodImplementationsSearch"/>
-    <definitionsSearch implementation="com.intellij.codeInsight.navigation.ClassImplementationsSearch"/>
-
-    <inspectionToolProvider implementation="com.intellij.codeInspection.ex.StandardInspectionToolsProvider"/>
-    <inspectionToolProvider implementation="com.intellij.codeInspection.internal.InternalInspectionToolsProvider"/>
-
-    <renameHandler implementation="com.intellij.ide.projectView.impl.RenameModuleHandler"/>
-
-    <fileTypeFactory implementation="com.intellij.openapi.fileTypes.impl.DefaultFileTypeFactory"/>
-
-    <lookup.actionProvider implementation="com.intellij.codeInsight.completion.ImportStaticLookupActionProvider" id="importStatic"/>
-    <lookup.actionProvider implementation="com.intellij.codeInsight.completion.ExcludeFromCompletionLookupActionProvider"
-                           id="excludeFromCompletion" order="last"/>
-
-    <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier" id="javaNameIdentifier"/>
-    <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" id="javaTrue" order="last"/>
-
-    <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.BasicToClassNameDelegator" id="basic2ClassName"
-                            order="first, before javaMemberName, after xml"/>
-    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaCompletionContributor" id="javaLegacy"
-                            order="last, before legacy, before default, before javaClassName"/>
-    <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaClassReferenceCompletionContributor"
-                            id="javaClassReference"/>
-
-    <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaMethodMergingContributor" id="methodMerger"
-                            order="before javaLegacy, before default"/>
-    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaMemberNameCompletionContributor" id="javaMemberName"
-                            order="before javaLegacy"/>
-    <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaClassNameCompletionContributor" id="javaClassName"
-                            order="last, before default"/>
-    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaGlobalMemberNameCompletionContributor"
-                            id="javaGlobalMemberName" order="last, after javaClassName"/>
-
-    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaDocCompletionContributor" id="javadoc"
-                            order="last, before javaLegacy"/>
-
-    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.NullSmartCompletionContributor" id="smartNull"
-                            order="last, before javaSmart"/>
-    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaSmartCompletionContributor" id="javaSmart"
-                            order="last, before default"/>
-    <classNameInsertHandler language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaClassNameInsertHandler"/> 
-
-    <packaging.sourceItemProvider implementation="com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ModulesAndLibrariesSourceItemsProvider"/>
-    <packaging.sourceItemProvider implementation="com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ArtifactsSourceItemsProvider"/>
-    <packaging.artifactType implementation="com.intellij.packaging.impl.artifacts.JarArtifactType" order="first"/>
-    <packaging.artifactType implementation="com.intellij.packaging.impl.artifacts.PlainArtifactType" order="last"/>
-    <compiler.additionalCompileScopeProvider implementation="com.intellij.packaging.impl.compiler.ArtifactAdditionalCompileScopeProvider"/>
-    <compiler implementation="com.intellij.packaging.impl.compiler.ArtifactsCompiler" id="artifactsCompiler"/>
-
-    <lookup.charFilter implementation="com.intellij.codeInsight.completion.JavaCharFilter" id="java"/>
-
-    <lang.elementManipulator forClass="com.intellij.psi.PsiLiteralExpression"
-                             implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.manipulators.StringLiteralManipulator"/>
-    <lang.elementManipulator forClass="com.intellij.psi.javadoc.PsiDocTag"
-                             implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.manipulators.PsiDocTagValueManipulator"/>
-
-    <applicationService serviceInterface="com.intellij.util.xml.converters.values.ClassValueConverter"
-                    serviceImplementation="com.intellij.util.xml.converters.ClassValueConverterImpl"/>
-
-    <applicationService serviceInterface="com.intellij.util.xml.converters.values.ClassArrayConverter"
-                    serviceImplementation="com.intellij.util.xml.converters.ClassArrayConverterImpl"/>
-
-    <applicationService serviceInterface="com.intellij.util.descriptors.ConfigFileFactory"
-                        serviceImplementation="com.intellij.util.descriptors.impl.ConfigFileFactoryImpl"/>
-    <applicationService serviceInterface="com.intellij.debugger.engine.DebuggerUtils"
-                        serviceImplementation="com.intellij.debugger.impl.DebuggerUtilsImpl"/>
-
-    <applicationService serviceInterface="com.intellij.openapi.roots.ui.configuration.DefaultModuleConfigurationEditorFactory"
-                        serviceImplementation="com.intellij.openapi.roots.ui.configuration.DefaultModuleConfigurationEditorFactoryImpl"/>
-    <applicationService serviceInterface="com.intellij.ide.util.projectWizard.ProjectWizardStepFactory"
-                        serviceImplementation="com.intellij.ide.util.projectWizard.ProjectWizardStepFactoryImpl"/>
-
-    <applicationService serviceInterface="com.intellij.peer.PeerFactory" serviceImplementation="com.intellij.peer.impl.PeerFactoryImpl"/>
-
-    <applicationService serviceInterface="com.intellij.codeInspection.reference.RefJavaUtil"
-                        serviceImplementation="com.intellij.codeInspection.reference.RefJavaUtilImpl"/>
-    <applicationService serviceInterface="com.intellij.psi.EmptySubstitutor"
-                        serviceImplementation="com.intellij.psi.impl.EmptySubstitutorImpl"/>
-
-    <applicationService serviceInterface="com.intellij.openapi.deployment.DeploymentUtil"
-                        serviceImplementation="com.intellij.openapi.deployment.DeploymentUtilImpl"/>
-    <applicationService serviceInterface="com.intellij.compiler.ant.BuildTargetsFactory"
-                        serviceImplementation="com.intellij.compiler.ant.BuildTargetsFactoryImpl"/>
-
-    <applicationService serviceInterface="com.intellij.codeInsight.intention.QuickFixFactory"
-                        serviceImplementation="com.intellij.codeInsight.intention.impl.config.QuickFixFactoryImpl"/>
-
-    <applicationService serviceInterface="com.intellij.openapi.roots.libraries.LibrariesHelper" serviceImplementation="com.intellij.openapi.roots.libraries.LibrariesHelperImpl"/>
-
-
-    <projectService serviceInterface="com.intellij.ide.util.TreeClassChooserFactory"
-                    serviceImplementation="com.intellij.ide.util.TreeClassChooserFactoryImpl"/>
-    <projectService serviceInterface="com.intellij.codeInsight.guess.GuessManager"
-                    serviceImplementation="com.intellij.codeInsight.guess.impl.GuessManagerImpl"/>
-    <projectService serviceInterface="com.intellij.psi.impl.source.resolve.JavaResolveCache"
-                    serviceImplementation="com.intellij.psi.impl.source.resolve.JavaResolveCache"/>
-
-    <projectService serviceInterface="com.intellij.facet.impl.ui.FacetEditorsStateManager"
-                    serviceImplementation="com.intellij.facet.impl.ui.FacetEditorsStateManagerImpl"/>
-
-    <projectService serviceInterface="com.intellij.openapi.module.ModulePointerManager"
-                    serviceImplementation="com.intellij.openapi.module.impl.ModulePointerManagerImpl"/>
-
-    <applicationService serviceInterface="com.intellij.facet.ui.FacetEditorsFactory"
-                        serviceImplementation="com.intellij.facet.impl.ui.FacetEditorsFactoryImpl"/>
-
-    <applicationService serviceInterface="com.intellij.psi.JavaDirectoryService"
-                        serviceImplementation="com.intellij.psi.impl.file.JavaDirectoryServiceImpl"/>
-
-    <applicationService serviceInterface="com.intellij.refactoring.JavaRefactoringActionHandlerFactory"
-                        serviceImplementation="com.intellij.refactoring.openapi.impl.JavaRefactoringActionHandlerFactoryImpl"/>
-    <changeSignatureDetector language="JAVA" implementationClass="com.intellij.refactoring.changeSignature.JavaChangeSignatureDetector"/>
-
-    <applicationService serviceInterface="com.intellij.refactoring.JavaRefactoringSettings"
-                        serviceImplementation="com.intellij.refactoring.JavaRefactoringSettings"/>
-
-    <applicationService serviceInterface="com.intellij.ide.util.ModuleRendererFactory"
-                        serviceImplementation="com.intellij.ide.util.DefaultModuleRendererFactory"/>
-
-    <applicationService serviceInterface="com.intellij.openapi.projectRoots.ProjectJdkTable"
-                        serviceImplementation="com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl"/>
-    <exportable serviceInterface="com.intellij.openapi.projectRoots.ProjectJdkTable"/>
-
-
-    <projectService serviceInterface="com.intellij.refactoring.RefactoringManager"
-                    serviceImplementation="com.intellij.refactoring.RefactoringManager"/>
-    <projectService serviceInterface="com.intellij.refactoring.listeners.JavaRefactoringListenerManager"
-                    serviceImplementation="com.intellij.refactoring.listeners.impl.JavaRefactoringListenerManagerImpl"/>
-    <projectService serviceInterface="com.intellij.refactoring.RefactoringFactory"
-                    serviceImplementation="com.intellij.refactoring.openapi.impl.JavaRefactoringFactoryImpl"/>
-
-    <applicationService serviceInterface="com.intellij.execution.runners.RunStrategy"
-                        serviceImplementation="com.intellij.execution.runners.RunStrategyImpl"/>
-    <applicationService serviceInterface="com.intellij.execution.runners.ProcessProxyFactory"
-                        serviceImplementation="com.intellij.execution.runners.ProcessProxyFactoryImpl"/>
-
-    <applicationService serviceInterface="com.intellij.debugger.settings.NodeRendererSettings"
-                        serviceImplementation="com.intellij.debugger.settings.NodeRendererSettings"/>
-    <applicationService serviceInterface="com.intellij.debugger.settings.ViewsGeneralSettings"
-                        serviceImplementation="com.intellij.debugger.settings.ViewsGeneralSettings"/>
-    <applicationService serviceInterface="com.intellij.debugger.settings.DebuggerSettings"
-                        serviceImplementation="com.intellij.debugger.settings.DebuggerSettings"/>
-    <applicationService serviceInterface="com.intellij.debugger.settings.ThreadsViewSettings"
-                        serviceImplementation="com.intellij.debugger.settings.ThreadsViewSettings"/>
-
-    <applicationService serviceInterface="com.intellij.codeInsight.folding.JavaCodeFoldingSettings"
-                        serviceImplementation="com.intellij.codeInsight.folding.impl.JavaCodeFoldingSettingsImpl"/>
-    <exportable serviceInterface="com.intellij.codeInsight.folding.JavaCodeFoldingSettings"/>
-
-    <applicationService serviceInterface="com.intellij.packaging.elements.PackagingElementFactory"
-                        serviceImplementation="com.intellij.packaging.impl.elements.PackagingElementFactoryImpl"/>
-
-    <projectService serviceInterface="com.intellij.packaging.artifacts.ArtifactPointerManager"
-                    serviceImplementation="com.intellij.packaging.impl.artifacts.ArtifactPointerManagerImpl"/>
-    <projectService serviceInterface="com.intellij.packaging.impl.artifacts.ArtifactBySourceFileFinder"
-                    serviceImplementation="com.intellij.packaging.impl.artifacts.ArtifactBySourceFileFinderImpl"/>
-    <projectService serviceInterface="com.intellij.packaging.impl.artifacts.ArtifactValidationUtil"
-                    serviceImplementation="com.intellij.packaging.impl.artifacts.ArtifactValidationUtilImpl"/>
-
-    <projectService serviceInterface="com.intellij.lang.injection.InjectedLanguageManager"
-                    serviceImplementation="com.intellij.psi.impl.source.tree.injected.InjectedLanguageManagerImpl"/>
-    <projectService serviceInterface="com.intellij.psi.impl.source.tree.injected.JavaConcatenationInjectorManager"
-                    serviceImplementation="com.intellij.psi.impl.source.tree.injected.JavaConcatenationInjectorManager"/>
-
-    <multiHostInjector implementation="com.intellij.psi.impl.source.tree.injected.JavaConcatenationInjectorManager$Concatenation2InjectorAdapter" order="last"/>
-
-    <applicationService serviceInterface="com.intellij.conversion.ConversionService"
-                        serviceImplementation="com.intellij.conversion.impl.ConversionServiceImpl"/>
-
-    <projectService serviceInterface="com.intellij.codeInsight.ExternalAnnotationsManager"
-                    serviceImplementation="com.intellij.codeInsight.ExternalAnnotationsManagerImpl"/>
-
-    <projectService serviceInterface="com.intellij.psi.SmartTypePointerManager"
-                    serviceImplementation="com.intellij.psi.impl.smartPointers.SmartTypePointerManagerImpl"/>
-    <projectService serviceInterface="com.intellij.psi.codeStyle.JavaCodeStyleManager"
-                    serviceImplementation="com.intellij.psi.impl.source.codeStyle.JavaCodeStyleManagerImpl"/>
-    <projectService serviceInterface="com.intellij.openapi.compiler.CompilerManager"
-                    serviceImplementation="com.intellij.compiler.CompilerManagerImpl"/>
-    <projectService serviceInterface="com.intellij.openapi.roots.CompilerProjectExtension"
-                    serviceImplementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl"/>
-    <projectService serviceInterface="com.intellij.openapi.roots.LanguageLevelProjectExtension"
-                    serviceImplementation="com.intellij.openapi.roots.impl.LanguageLevelProjectExtensionImpl"/>
-    <projectService serviceInterface="com.intellij.codeInsight.ExpectedTypesProvider"
-                    serviceImplementation="com.intellij.codeInsight.ExpectedTypesProvider"/>
-
-    <projectService serviceInterface="com.intellij.psi.controlFlow.ControlFlowFactory"
-                    serviceImplementation="com.intellij.psi.controlFlow.ControlFlowFactory"/>
-
-    <projectService serviceInterface="com.intellij.packaging.impl.compiler.ArtifactsWorkspaceSettings"
-                    serviceImplementation="com.intellij.packaging.impl.compiler.ArtifactsWorkspaceSettings"/>
-
-    <projectService serviceInterface="com.intellij.compiler.CompilerWorkspaceConfiguration"
-                    serviceImplementation="com.intellij.compiler.CompilerWorkspaceConfiguration"/>
-
-    <projectService serviceInterface="com.intellij.openapi.vcs.CodeSmellDetector"
-                    serviceImplementation="com.intellij.openapi.vcs.impl.CodeSmellDetectorImpl"/>
-    <projectService serviceInterface="com.intellij.openapi.vcs.changes.patch.PatchBaseDirectoryDetector"
-                    serviceImplementation="com.intellij.openapi.vcs.changes.patch.PsiPatchBaseDirectoryDetector"/>
-    <projectService serviceInterface="com.intellij.openapi.vcs.changes.ui.ChangesGroupingPolicyFactory"
-                    serviceImplementation="com.intellij.openapi.vcs.changes.ui.ChangesModuleGroupingPolicyFactory"/>
-    <projectService serviceInterface="com.intellij.openapi.vcs.impl.DefaultVcsRootPolicy"
-                    serviceImplementation="com.intellij.openapi.vcs.impl.ModuleDefaultVcsRootPolicy"/>
-    <projectService serviceInterface="com.intellij.openapi.vcs.impl.ExcludedFileIndex"
-                    serviceImplementation="com.intellij.openapi.vcs.impl.ProjectExcludedFileIndex"/>
-    <projectService serviceInterface="com.intellij.openapi.vcs.impl.VcsPathPresenter"
-                    serviceImplementation="com.intellij.openapi.vcs.impl.ModuleVcsPathPresenter"/>
-
-    <projectService serviceInterface="com.intellij.psi.CommonReferenceProviderTypes"
-                    serviceImplementation="com.intellij.psi.impl.CommonReferenceProviderTypesImpl"/>
-    <projectService serviceInterface="com.intellij.psi.impl.file.PsiDirectoryFactory"
-                    serviceImplementation="com.intellij.psi.impl.file.PsiJavaDirectoryFactory"/>
-
-    <projectService serviceInterface="com.intellij.openapi.roots.ui.configuration.ProjectSettingsService"
-                    serviceImplementation="com.intellij.openapi.roots.ui.configuration.IdeaProjectSettingsService"/>
-
-    <projectService serviceInterface="com.intellij.openapi.roots.PackageIndex"
-                    serviceImplementation="com.intellij.openapi.roots.impl.ProjectPackageIndexImpl"/>
-    <moduleService serviceInterface="com.intellij.openapi.roots.ModulePackageIndex"
-                   serviceImplementation="com.intellij.openapi.roots.impl.ModulePackageIndexImpl"/>
-
-    <projectService serviceInterface="com.intellij.usages.impl.rules.DirectoryGroupingRule"
-                    serviceImplementation="com.intellij.usages.impl.rules.PackageGroupingRule"/>
-
-    <projectService serviceInterface="com.intellij.slicer.SliceToolwindowSettings"
-                    serviceImplementation="com.intellij.slicer.SliceToolwindowSettings"/>
-    <projectService serviceInterface="com.intellij.slicer.SliceManager"
-                    serviceImplementation="com.intellij.slicer.SliceManager"/>
-
-    <projectService serviceInterface="com.intellij.codeInspection.ex.EntryPointsManagerImpl"
-                    serviceImplementation="com.intellij.codeInspection.ex.EntryPointsManagerImpl"/>
-
-    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration"
-                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration"/>
-    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.api.CompilerAPIConfiguration"
-                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.api.CompilerAPIConfiguration"/>
-    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompilerConfiguration"
-                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompilerConfiguration"/>
-    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompilerConfiguration"
-                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompilerConfiguration"/>
-    <projectService serviceInterface="com.intellij.compiler.impl.rmiCompiler.RmicConfiguration"
-                    serviceImplementation="com.intellij.compiler.impl.rmiCompiler.RmicConfiguration"/>
-    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.jikes.JikesConfiguration"
-                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.jikes.JikesConfiguration"/>
-
-    <applicationService serviceInterface="com.intellij.openapi.wm.impl.FrameTitleBuilder"
-                        serviceImplementation="com.intellij.openapi.wm.IdeaFrameTitleBuilder"/>
-
-    <applicationService serviceInterface="com.intellij.openapi.roots.ui.configuration.libraries.LibraryPresentationManager"
-                        serviceImplementation="com.intellij.openapi.roots.ui.configuration.libraries.impl.LibraryPresentationManagerImpl"/>
-    <projectService serviceInterface="com.intellij.openapi.roots.ui.configuration.dependencyAnalysis.AnalyzeDependenciesSettings"
-                    serviceImplementation="com.intellij.openapi.roots.ui.configuration.dependencyAnalysis.AnalyzeDependenciesSettings"/>
-
-    <highlightVisitor implementation="com.intellij.codeInsight.daemon.impl.analysis.HighlightVisitorImpl"/>
-
-    <compiler.buildParticipantProvider implementation="com.intellij.compiler.impl.jarr.JarBuildParticipantProvider"/>
-    <java.programPatcher implementation="com.intellij.execution.impl.JarProgramPatcher"/>
-    <lang.foldingBuilder language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.actions.SuppressWarningsFoldingBuilder" />
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.SplitIfAction</className>
-      <category>Control Flow</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.InvertIfConditionAction</className>
-      <category>Control Flow</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.daemon.impl.quickfix.RemoveRedundantElseAction</className>
-      <category>Control Flow</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.AddNotNullAnnotationFix</className>
-      <category>Control Flow</category>
-      <descriptionDirectoryName>AddAnnotationFix</descriptionDirectoryName>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.AddDeprecationAnnotationFix</className>
-      <category>Control Flow</category>
-      <descriptionDirectoryName>AddAnnotationFix</descriptionDirectoryName>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.AddNullableAnnotationFix</className>
-      <category>Control Flow</category>
-      <descriptionDirectoryName>AddAnnotationFix</descriptionDirectoryName>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.DeannotateIntentionAction</className>
-      <category>Control Flow</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.CreateFieldFromParameterAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.AssignFieldFromParameterAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.daemon.impl.quickfix.CreateLocalVarFromInstanceofAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.daemon.impl.quickfix.CreateCastExpressionFromInstanceofAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.CreateSubclassAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.ImplementAbstractMethodAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.CopyAbstractMethodImplementationAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.SplitDeclarationAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.MoveInitializerToConstructorAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.MoveFieldAssignmentToInitializerAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.daemon.impl.quickfix.AddRuntimeExceptionToThrowsAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.MakeTypeGenericAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.AddOverrideAnnotationAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.SimplifyBooleanExpressionAction</className>
-      <category>Boolean</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.ConcatenationToMessageFormatAction</className>
-      <category>I18N</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.ConvertToBasicLatinAction</className>
-      <category>I18N</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.AddOnDemandStaticImportAction</className>
-      <category>Imports</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.AddSingleMemberStaticImportAction</className>
-      <category>Imports</category>
-    </intentionAction>
-
-
-    <intentionAction>
-      <className>com.intellij.codeInspection.actions.UnimplementInterfaceAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInspection.actions.ReplaceImplementsWithStaticImportAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.ColorChooserIntentionAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.ConvertAbsolutePathToRelativeIntentionAction</className>
-      <category>Other</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.ConvertRelativePathToAbsoluteIntentionAction</className>
-      <category>Other</category>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.testIntegration.createTest.CreateTestAction</className>
-    </intentionAction>
-
-    <intentionAction>
-      <className>com.intellij.codeInspection.concurrencyAnnotations.JCiPOrderEntryFix</className>
-    </intentionAction>
-
-
-    <daemon.highlightInfoFilter implementation="com.intellij.debugger.engine.evaluation.DebuggerHighlightFilter"/>
-    <daemon.highlightInfoFilter implementation="com.intellij.codeInsight.daemon.impl.HighlightInfoFilterImpl"/>
-
-
-    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.LineBreakpointFactory"/>
-    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.ExceptionBreakpointFactory"/>
-    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.AnyExceptionBreakpointFactory"/>
-    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.FieldBreakpointFactory"/>
-    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.MethodBreakpointFactory"/>
-
-    <projectService serviceInterface="com.intellij.debugger.ui.DebuggerRecents"
-                    serviceImplementation="com.intellij.debugger.ui.DebuggerRecents"/>
-
-
-    <!-- Project Configurables -->
-    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable"/>
-    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.ModuleStructureConfigurable"/>
-    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.FacetStructureConfigurable"/>
-    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactsStructureConfigurable"/>
-    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectLibrariesConfigurable"/>
-    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.GlobalLibrariesConfigurable"/>
-    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.JdkListConfigurable"/>
-
-    <!-- Errors -->
-    <!-- Show full error options configurable only in full IDEA - platform supports only default IDE profile for now -->
-    <projectConfigurable provider="com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurableProvider"/>
-
-    <!-- Project Structure -->
-    <projectConfigurable instance="com.intellij.compiler.options.CompilerConfigurable" order="after project"/>
-    <!-- Compiler -->
-
-    <projectConfigurable instance="com.intellij.psi.templateLanguages.TemplateDataLanguageConfigurable"/>
-
-    <!-- Scopes -->
-    <!-- This is registered as a top-level configurable in IDEA, and as a service (accessible from certain dialogs) in platform. -->
-    <projectConfigurable implementation="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable"/>
-
-    <!-- Application Configurables -->
-
-    <!-- Path Variables -->
-    <!-- the implementation of this configurable is in platform-impl but it's not registered in platform because
-         it's only required in full IDEA -->
-    <applicationConfigurable instance="com.intellij.application.options.pathMacros.PathMacroConfigurable"/>
-
-    <applicationConfigurable instance="com.intellij.execution.console.ConsoleFoldingConfigurable"/>
-
-    <!-- Resources -->
-
-    <lang.parserDefinition language="JAVA" implementationClass="com.intellij.lang.java.JavaParserDefinition"/>
-
-    <lang.refactoringSupport language="JAVA" implementationClass="com.intellij.lang.java.JavaRefactoringSupportProvider"/>
-    <lang.refactoringSupport.classMembersRefactoringSupport language="JAVA" implementationClass="com.intellij.lang.java.JavaClassMembersRefactoringSupport"/>
-
-    <lang.formatter language="JAVA" implementationClass="com.intellij.lang.java.JavaFormattingModelBuilder"/>
-
-    <lang.documentationProvider language="JAVA" implementationClass="com.intellij.lang.java.JavaDocumentationProvider"/>
-    <documentationProvider implementation="com.intellij.lang.java.FileDocumentationProvider" order="last"/>
-
-    <lang.importOptimizer language="JAVA" implementationClass="com.intellij.lang.java.JavaImportOptimizer"/>
-
-    <lang.surroundDescriptor language="JAVA"
-                             implementationClass="com.intellij.codeInsight.generation.surroundWith.JavaExpressionSurroundDescriptor"/>
-    <lang.surroundDescriptor language="JAVA"
-                             implementationClass="com.intellij.codeInsight.generation.surroundWith.JavaStatementsSurroundDescriptor"/>
-
-    <lang.unwrapDescriptor language="JAVA" implementationClass="com.intellij.codeInsight.unwrap.JavaUnwrapDescriptor"/>
-
-    <lang.namesValidator language="JAVA" implementationClass="com.intellij.lang.refactoring.JavaNamesValidator"/>
-
-    <lang.findUsagesProvider language="JAVA" implementationClass="com.intellij.lang.java.JavaFindUsagesProvider"/>
-    <usageToPsiElementProvider implementation="com.intellij.lang.java.JavaUsageToPsiElementProvider" />
-
-    <lang.commenter language="JAVA" implementationClass="com.intellij.lang.java.JavaCommenter"/>
-
-    <lang.braceMatcher language="JAVA" implementationClass="com.intellij.codeInsight.highlighting.JavaBraceMatcher"/>
-
-    <lang.foldingBuilder language="JAVA" implementationClass="com.intellij.codeInsight.folding.impl.JavaFoldingBuilder"/>
-
-    <codeInsight.parameterInfo language="JAVA" implementationClass="com.intellij.codeInsight.hint.api.impls.MethodParameterInfoHandler"/>
-    <codeInsight.parameterInfo language="JAVA" implementationClass="com.intellij.codeInsight.hint.api.impls.ReferenceParameterInfoHandler"/>
-    <codeInsight.parameterInfo language="JAVA"
-                               implementationClass="com.intellij.codeInsight.hint.api.impls.AnnotationParameterInfoHandler"/>
-
-    <codeInsight.overrideMethod language="JAVA" implementationClass="com.intellij.codeInsight.generation.JavaOverrideMethodsHandler"/>
-    <codeInsight.implementMethod language="JAVA" implementationClass="com.intellij.codeInsight.generation.JavaImplementMethodsHandler"/>
-    <codeInsight.delegateMethods language="JAVA" implementationClass="com.intellij.codeInsight.generation.GenerateDelegateHandler"/>
-    <codeInsight.gotoSuper language="JAVA" implementationClass="com.intellij.codeInsight.navigation.JavaGotoSuperHandler"/>
-    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.JavaLineMarkerProvider"/>
-    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.IconLineMarkerProvider"/>
-
-    <codeInsight.wordCompletionFilter language="JAVA" implementationClass="com.intellij.lang.java.JavaWordCompletionFilter"/>
-
-    <statementUpDownMover implementation="com.intellij.codeInsight.editorActions.moveUpDown.StatementMover" id="statement"
-                          order="before declaration"/>
-    <statementUpDownMover implementation="com.intellij.codeInsight.editorActions.moveUpDown.DeclarationMover" id="declaration"
-                          order="before xml"/>
-
-    <fileType.fileViewProviderFactory filetype="CLASS" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
-
-    <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.AttachSourcesNotificationProvider"/>
-    <editorFileSwapper implementation="com.intellij.codeEditor.JavaEditorFileSwapper"/>
-
-    <lang.psiStructureViewFactory language="JAVA" implementationClass="com.intellij.lang.java.JavaStructureViewBuilderFactory"/>
-
-    <lang.ast.factory language="JAVA" implementationClass="com.intellij.psi.impl.source.tree.JavaASTFactory"/>
-
-    <lang.literalEscaper language="JAVA" implementationClass="com.intellij.lang.java.JavaLiteralEscaper"/>
-
-    <lang.smartEnterProcessor language="JAVA"
-                              implementationClass="com.intellij.codeInsight.editorActions.smartEnter.JavaSmartEnterProcessor"/>
-    <lang.smartEnterProcessor language="JSPX" implementationClass="com.intellij.codeInsight.completion.XmlSmartEnterProcessor"/>
-
-    <checkinHandlerFactory implementation="com.intellij.openapi.vcs.checkin.StandardCheckinHandlerFactory"/>
-    <checkinHandlerFactory implementation="com.intellij.openapi.vcs.checkin.CodeAnalysisCheckinHandlerFactory"/>
-
-    <configurationProducer implementation="com.intellij.execution.application.ApplicationConfigurationProducer"/>
-
-    <javaExpressionSurrounder implementation="com.intellij.debugger.codeinsight.JavaWithRuntimeCastSurrounder"/>
-
-    <checkoutListener implementation="com.intellij.openapi.vcs.checkout.ProjectCheckoutListener"/>
-    <checkoutCompletedListener implementation="com.intellij.openapi.vcs.checkout.NewProjectCheckoutListener"/>
-
-    <iconProvider implementation="com.intellij.psi.impl.JavaDirectoryIconProvider" id="javaDirectory"/>
-
-    <codeStyleSettingsProvider implementation="com.intellij.application.options.GenerationSettingsProvider"/>
-    <codeStyleSettingsProvider implementation="com.intellij.application.options.codeStyle.WrappingAndBracesSettingsProvider"/>
-    <codeStyleSettingsProvider implementation="com.intellij.application.options.codeStyle.BlankLinesSettingsProvider"/>
-    <codeStyleSettingsProvider implementation="com.intellij.application.options.codeStyle.SpacesSettingsProvider"/>
-    <codeStyleSettingsProvider implementation="com.intellij.application.options.ImportsSettingsProvider"/>
-    <codeStyleSettingsProvider implementation="com.intellij.application.options.JavadocSettingsProvider"/>
-
-    <langCodeStyleSettingsProvider implementation="com.intellij.ide.JavaLanguageCodeStyleSettingsProvider"/>
-
-    <!-- new project wizard -->
-    <wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.CreateFromScratchMode"/>
-    <wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.CreateFromSourcesMode"/>
-    <wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.ImportMode"/>
-    <wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.ImportImlMode"/>
-
-    <gotoFileContributor implementation="com.intellij.ide.util.gotoByName.ProjectBaseDirNavigationContributor"/>
-
-    <consoleFilterProvider implementation="com.intellij.execution.filters.DefaultConsoleFiltersProvider"/>
-    <console.folding implementation="com.intellij.execution.filters.AuxiliaryCallsFolding"/>
-
-    <stackFrameFilter implementation="com.intellij.execution.filters.ReflectionStackFrameFilter"/>
-    <stackFrameFilter implementation="com.intellij.execution.filters.RmiStackFrameFilter"/>
-
-    <debuggerEditorTextProvider language="JAVA" implementationClass="com.intellij.debugger.impl.JavaEditorTextProviderImpl"/>
-
-    <quoteHandler fileType="JAVA" className="com.intellij.codeInsight.editorActions.JavaQuoteHandler"/>
-    <typedHandler implementation="com.intellij.codeInsight.editorActions.JavaTypedHandler" id="java"/>
-
-    <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.LiteralJoinLinesHandler"/>
-    <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.DeclarationJoinLinesHandler"/>
-    <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.BlockJoinLinesHandler"/>
-
-    <filetype.decompiler filetype="CLASS" implementationClass="com.intellij.psi.impl.compiled.ClassFileDecompiler"/>
-    <filetype.stubBuilder filetype="CLASS" implementationClass="com.intellij.psi.impl.compiled.ClassFileStubBuilder"/>
-
-    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SamePsiMemberWeigher" id="samePsiMember"
-             order="before openedInEditor"/>
-    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.ExplicitlyImportedWeigher" id="explicitlyImported"
-             order="after openedInEditor"/>
-    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.JavaInheritanceWeigher" id="javaInheritance"
-             order="after explicitlyImported"/>
-    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SamePackageWeigher" id="samePackage"
-             order="after javaInheritance, before sameLogicalRoot"/>
-    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.KnownPackageWeigher" id="knownPackage"
-             order="after sameProject, before sdkOrLibrary"/>
-
-    <statistician key="proximity" implementationClass="com.intellij.codeInsight.completion.JavaProximityStatistician"/>
-    <statistician key="completion" implementationClass="com.intellij.codeInsight.completion.JavaCompletionStatistician"/>
-
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.StaticMembersWeigher" id="statics"
-             order="after negativeStats"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferDefaultTypeWeigher" id="defaultType"
-             order="before stats, after statics"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferLocalVariablesLiteralsAndAnnoMethodsWeigher" id="local"
-             order="after defaultType, before nameEnd"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.RecursionWeigher" id="recursion"
-             order="after local"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferExpectedTypeWeigher" id="expectedType"
-             order="after recursion"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.NameEndMatchingDegreeWeigher" id="nameEnd"
-             order="after expectedType, before stats"/>
-
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferAbstractWeigher" id="abstract"
-             order="after prefix"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferNonGenericWeigher" id="nonGeneric"
-             order="after abstract"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferAccessibleWeigher" id="accessible"
-             order="after nonGeneric"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferSimpleWeigher" id="simple"
-             order="after accessible"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferEnumConstantsWeigher" id="constants"
-             order="after simple, before proximity"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.SameWordsWeigher" id="sameWords"
-             order="after proximity"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferFieldsAndGettersWeigher" id="fieldsAndGetters"
-             order="after sameWords"/>
-    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferShorterWeigher" id="shorter"
-             order="after fieldsAndGetters"/>
-
-    <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.PreferLessParametersWeigher" id="lessParams"
-             order="after sLookupString, before sProximity"/>
-
-    <completion.skip implementation="com.intellij.codeInsight.completion.AbstractExpectedTypeSkipper" id="skipAbstract"/>
-
-
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.LiteralSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.DocCommentSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.ListSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.CodeBlockOrInitializerSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.FinallyBlockSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.MethodOrClassSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.FieldSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.ReferenceSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.DocTagSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.IfStatementSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.TypeCastSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.JavaTokenSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.StatementGroupSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.CaseStatementsSelectioner"/>
-    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.AntLikePropertySelectionHandler"/>
-
-    <selectInTarget implementation="com.intellij.ide.impl.ProjectSettingsSelectInTarget"/>
-
-    <syntaxHighlighter key="CLASS" implementationClass="com.intellij.ide.highlighter.JavaFileHighlighter"/>
-
-    <structureViewBuilder key="CLASS" factoryClass="com.intellij.ide.highlighter.JavaClsStructureViewBuilderProvider"/>
-
-    <OrderRootTypeUI key="JAVADOC"
-                     implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.JavadocOrderRootTypeUIFactory"/>
-    <OrderRootTypeUI key="ANNOTATIONS"
-                     implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.AnnotationsOrderRootTypeUIFactory"/>
-    <OrderRootTypeUI key="CLASSES"
-                     implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.ClassesOrderRootTypeUIFactory"/>
-    <OrderRootTypeUI key="SOURCES"
-                     implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.SourcesOrderRootTypeUIFactory"/>
-
-    <getDataRule key="analysisScope" implementationClass="com.intellij.analysis.AnalysisScopeRule"/>
-    <getDataRule key="context.ProjectFileDirectory" implementationClass="com.intellij.ide.impl.dataRules.ProjectFileDirectoryRule"/>
-
-    <keymapExtension implementation="com.intellij.debugger.actions.DebuggerKeymapExtension"/>
-
-    <keymapExtension implementation="com.intellij.tools.ToolKeymapExtension"/>
-
-    <vcsSelectionProvider implementation="com.intellij.vcsUtil.JavaVcsSelectionProvider"/>
-
-    <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.ImplicitVariableElementInfoFactory"/>
-    <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.ImportListElementInfoFactory"/>
-    <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.AnchorElementInfoFactory"/>
-
-    <elementSignatureProvider implementation="com.intellij.codeInsight.folding.impl.JavaElementSignatureProvider"/>
-
-    <preFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.FormatCommentsProcessor"/>
-    <postFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.BracePostFormatProcessor"/>
-    <postFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.ImportPostFormatProcessor"/>
-    <codeInspection.InspectionExtension implementation="com.intellij.codeInspection.ex.JavaInspectionExtensionsFactory"/>
-
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.ArrayVariableMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.VariableOfTypeMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.ComponentTypeOfMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.SuggestVariableNameMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.SuggestFirstVariableNameMacro"/>
-
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.SuggestIndexNameMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.GuessElementTypeMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.ExpectedTypeMacro"/>
-    
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.AnnotatedMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.MethodNameMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.MethodReturnTypeMacro"/>
-
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.ClassNameMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.QualifiedClassNameMacro"/>
-
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.CurrentPackageMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.RightSideTypeMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.CastToLeftSideTypeMacro"/>
-
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.IterableVariableMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.IterableComponentTypeMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.DescendantClassesEnumMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.SubtypesMacro"/>
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.TypeOfVariableMacro"/>
-
-    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.GroovyScriptMacro"/>
-
-    <copyPastePreProcessor implementation="com.intellij.codeInsight.editorActions.StringLiteralCopyPasteProcessor"/>
-    <copyPastePostProcessor implementation="com.intellij.codeInsight.editorActions.CopyPasteFoldingProcessor"/>
-    <copyPastePostProcessor implementation="com.intellij.codeInsight.editorActions.CopyPasteReferenceProcessor"/>
-
-
-    <applicationService serviceInterface="com.intellij.codeInspection.SuppressManager"
-                        serviceImplementation="com.intellij.codeInspection.SuppressManagerImpl"/>
-
-    <declarationRangeHandler key="com.intellij.psi.PsiMethod"
-                             implementationClass="com.intellij.codeInsight.hint.MethodDeclarationRangeHandler"/>
-    <declarationRangeHandler key="com.intellij.psi.PsiClass"
-                             implementationClass="com.intellij.codeInsight.hint.ClassDeclarationRangeHandler"/>
-    <declarationRangeHandler key="com.intellij.psi.PsiClassInitializer"
-                             implementationClass="com.intellij.codeInsight.hint.ClassInitializerDeclarationRangeHandler"/>
-
-    <backspaceHandlerDelegate implementation="com.intellij.codeInsight.editorActions.JavaBackspaceHandler"/>
-
-    <usageTargetProvider implementation="com.intellij.find.findUsages.ThrowsUsageTargetProvider"/>
-
-    <liveTemplateContext implementation="com.intellij.codeInsight.template.JavaCodeContextType"/>
-    <liveTemplateContext implementation="com.intellij.codeInsight.template.JavaCommentContextType"/>
-    <liveTemplateContext implementation="com.intellij.codeInsight.template.JavaStringContextType"/>
-    <liveTemplateContext implementation="com.intellij.codeInsight.template.SmartCompletionContextType"/>
-    <projectExtension implementation="com.intellij.openapi.roots.impl.LanguageLevelProjectExtensionImpl$MyProjectExtension"/>
-    <projectExtension implementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl$MyProjectExtension"/>
-    <roots.watchedRootsProvider implementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl$MyWatchedRootsProvider"/>
-
-    <moduleExtension implementation="com.intellij.openapi.roots.LanguageLevelModuleExtension"/>
-    <moduleExtension implementation="com.intellij.openapi.roots.impl.CompilerModuleExtensionImpl"/>
-
-    <orderRootType implementation="com.intellij.openapi.roots.AnnotationOrderRootType"/>
-    <orderRootType implementation="com.intellij.openapi.roots.JavadocOrderRootType"/>
-
-    <highlightUsagesHandlerFactory implementation="com.intellij.codeInsight.highlighting.HighlightExceptionsHandlerFactory"/>
-    <highlightUsagesHandlerFactory implementation="com.intellij.codeInsight.highlighting.HighlightSuppressedWarningsFactory"/>
-    <highlightUsagesHandlerFactory implementation="com.intellij.codeInsight.highlighting.HighlightExitPointsHandlerFactory"/>
-    <highlightUsagesHandlerFactory implementation="com.intellij.codeInsight.highlighting.HighlightOverridingMethodsHandlerFactory"/>
-
-    <directoryIndexExcludePolicy implementation="com.intellij.openapi.roots.impl.ExcludeCompilerOutputPolicy"/>
-
-    <patternDialectProvider implementation="com.intellij.packageDependencies.ui.PackagePatternProvider" id="package" order="before file" />
-    <scopeDescriptorProvider implementation="com.intellij.ide.util.scopeChooser.HierarchyScopeDescriptorProvider"/>
-
-    <patterns.patternClass className="com.intellij.patterns.PsiJavaPatterns" alias="java"/>
-
-    <customScopesProvider implementation="com.intellij.analysis.PackagesScopesProvider"/>
-
-    <highlightErrorFilter implementation="com.intellij.codeInsight.daemon.impl.analysis.JavadocErrorFilter"/>
-    <daemon.changeLocalityDetector implementation="com.intellij.codeInsight.daemon.impl.JavaChangeLocalityDetector"/>
-
-    <liveTemplateOptionalProcessor implementation="com.intellij.codeInsight.template.impl.ShortenFQNamesProcessor"/>
-    <projectService serviceInterface="com.intellij.ide.todo.nodes.TodoTreeHelper"
-                    serviceImplementation="com.intellij.ide.todo.nodes.TodoJavaTreeHelper"/>
-
-    <createFromTemplateHandler implementation="com.intellij.ide.fileTemplates.JavaCreateFromTemplateHandler"/>
-    <defaultTemplatePropertiesProvider implementation="com.intellij.ide.fileTemplates.TemplatePackagePropertyProvider"/>
-    <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiClassFavoriteNodeProvider"/>
-    <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiFieldFavoriteNodeProvider"/>
-    <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiMethodFavoriteNodeProvider"/>
-    <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiPackageFavoriteNodeProvider"/>
-
-    <stepsBeforeRunProvider implementation="com.intellij.compiler.options.CompileStepBeforeRun" id="compileBeforeRun"/>
-    <stepsBeforeRunProvider implementation="com.intellij.packaging.impl.run.BuildArtifactsBeforeRunTaskProvider" order="after compileBeforeRun"/>
-    <programRunner id="defaultRunRunner" implementation="com.intellij.execution.impl.DefaultJavaProgramRunner"/>
-    <programRunner id="defaultDebugRunner" implementation="com.intellij.debugger.impl.GenericDebuggerRunner" order="last"/>
-
-    <configurationType implementation="com.intellij.execution.applet.AppletConfigurationType"/>
-    <configurationProducer implementation="com.intellij.execution.applet.AppletConfigurationProducer"/>
-    <configurationType implementation="com.intellij.execution.application.ApplicationConfigurationType"/>
-    <configurationType implementation="com.intellij.execution.remote.RemoteConfigurationType"/>
-
-    <applicationService serviceInterface="com.intellij.packageDependencies.DependenciesVisitorFactory"
-                        serviceImplementation="com.intellij.packageDependencies.JavaDependenciesVisitorFactory"/>
-
-
-    <internalFileTemplate name="Class"/>
-    <internalFileTemplate name="Interface"/>
-    <internalFileTemplate name="Enum"/>
-    <internalFileTemplate name="AnnotationType" subject="@interface"/>
-
-    <saveFileAsTemplateHandler implementation="com.intellij.ide.fileTemplates.SaveJavaAsTemplateHandler"/>
-
-    <refactoring.copyHandler implementation="com.intellij.refactoring.copy.JavaCopyFilesOrDirectoriesHandler"/>
-    <refactoring.copyHandler implementation="com.intellij.refactoring.copy.CopyClassesHandler"/>
-
-    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveFilesOrDirectories.JavaMoveFilesOrDirectoriesHandler" id="moveJavaFileOrDir"/>
-    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesHandlerBase"/>
-    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveMembers.MoveMembersHandler"/>
-    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodHandlerDelegate"/>
-    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveInner.MoveInnerToUpperHandler"/>
-    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveInner.MoveInnerToUpperOrMembersHandler"/>
-    <refactoring.moveHandler implementation="com.intellij.refactoring.anonymousToInner.MoveAnonymousToInnerHandler"/>
-
-    <refactoring.moveClassHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaClassHandler"/>
-    <moveFileHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaFileHandler"/>
-    <refactoring.moveMemberHandler language="JAVA" implementationClass="com.intellij.refactoring.move.moveMembers.MoveJavaMemberHandler"/>
-
-    <refactoring.safeDeleteProcessor implementation="com.intellij.refactoring.safeDelete.JavaSafeDeleteProcessor" id="javaProcessor"/>
-
-    <refactoring.introduceParameterMethodUsagesProcessor implementation="com.intellij.refactoring.introduceParameter.JavaIntroduceParameterMethodUsagesProcessor"/>
-    <refactoring.changeSignatureUsageProcessor implementation="com.intellij.refactoring.changeSignature.JavaChangeSignatureUsageProcessor" id="javaProcessor"/>
-
-    <refactoring.helper implementation="com.intellij.refactoring.OptimizeImportsRefactoringHelper"/>
-
-    <projectService serviceInterface="com.intellij.ide.projectView.impl.nodes.ProjectViewDirectoryHelper"
-                    serviceImplementation="com.intellij.ide.projectView.impl.JavaProjectViewDirectoryHelper"/>
-
-    <elementDescriptionProvider implementation="com.intellij.refactoring.util.JavaRefactoringElementDescriptionProvider"/>
-    <elementDescriptionProvider implementation="com.intellij.refactoring.util.JavaNonCodeSearchElementDescriptionProvider"/>
-
-    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.JavaColorSettingsPage"/>
-
-    <scopeParserExtension implementation="com.intellij.psi.search.scope.packageSet.PatternPackageSetParserExtension"/>
-
-    <macro implementation="com.intellij.ide.macro.ClasspathEntryMacro"/>
-    <macro implementation="com.intellij.ide.macro.ClasspathMacro"/>
-    <macro implementation="com.intellij.ide.macro.FileClassMacro"/>
-    <macro implementation="com.intellij.ide.macro.FileFQPackage"/>
-    <macro implementation="com.intellij.ide.macro.FilePackageMacro"/>
-    <macro implementation="com.intellij.ide.macro.JavaDocPathMacro"/>
-    <macro implementation="com.intellij.ide.macro.OutputPathMacro"/>
-
-    <printOption implementation="com.intellij.codeEditor.printing.HyperlinksToClassesOption"/>
-    <applicationService serviceInterface="com.intellij.codeEditor.printing.FileSeparatorProvider"
-                        serviceImplementation="com.intellij.codeEditor.printing.MethodSeparatorProvider"/>
-
-    <indexPatternBuilder implementation="com.intellij.psi.impl.search.JavaIndexPatternBuilder"/>
-    <indexPatternBuilder implementation="com.intellij.psi.impl.search.JspIndexPatternBuilder"/>
-    <applicationService serviceInterface="com.intellij.codeInsight.TargetElementUtilBase"
-                        serviceImplementation="com.intellij.codeInsight.TargetElementUtil"/>
-    <gotoClassContributor implementation="com.intellij.ide.util.gotoByName.DefaultClassNavigationContributor"/>
-    <gotoSymbolContributor implementation="com.intellij.ide.util.gotoByName.DefaultSymbolNavigationContributor"/>
-    <hectorComponentProvider implementation="com.intellij.codeInsight.daemon.impl.ImportPopupHectorComponentProvider"/>
-    <scopeTreeExpander implementation="com.intellij.ide.scopeView.ClassesScopeTreeStructureExpander"/>
-    <lang.implementationTextSelectioner language="JAVA"
-                                        implementationClass="com.intellij.codeInsight.hint.JavaImplementationTextSelectioner"/>
-    <gotoDeclarationHandler implementation="com.intellij.codeInsight.navigation.actions.GotoBreakContinueHandler"/>
-    <navbar implementation="com.intellij.ide.navigationToolbar.JavaNavBarExtension"/>
-    <typeDeclarationProvider implementation="com.intellij.codeInsight.navigation.actions.JavaTypeDeclarationProvider"/>
-    <gotoTargetRendererProvider implementation="com.intellij.codeInsight.navigation.JavaGotoTargetRendererProvider"/>
-
-    <renameHandler implementation="com.intellij.refactoring.rename.DirectoryAsPackageRenameHandler"/>
-    <rename.inplace.resolveSnapshotProvider
-            language="JAVA"
-            implementationClass="com.intellij.refactoring.rename.inplace.JavaResolveSnapshotProvider"
-    />
-    <updateAddedFileProcessor implementation="com.intellij.psi.impl.file.JavaUpdateAddedFileProcessor"/>
-
-    <findUsagesHandlerFactory implementation="com.intellij.find.findUsages.JavaFindUsagesHandlerFactory" id="java"
-                              order="last, before default"/>
-    <referenceProviderType key="Class Reference Provider"
-                           implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceProvider"/>
-
-    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenamePsiPackageProcessor"/>
-    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenamePsiDirectoryProcessor"/>
-    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameJavaClassProcessor"/>
-    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameJavaMethodProcessor" id="javamethod"/>
-    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameJavaVariableProcessor"/>
-    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameAliasingPomTargetProcessor"/>
-
-    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.AutomaticVariableRenamerFactory"/>
-    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.AutomaticParametersRenamerFactory"/>
-    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.AutomaticInheritorRenamerFactory"/>
-    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.AutomaticTestRenamerFactory"/>
-    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.ConstructorParameterOnFieldRenameRenamerFactory"/>
-
-    <nameSuggestionProvider implementation="com.intellij.refactoring.rename.JavaNameSuggestionProvider" id="java"/>
-
-    <vetoRenameCondition implementation="com.intellij.refactoring.rename.JavaVetoRenameCondition"/>
-
-    <readWriteAccessDetector implementation="com.intellij.codeInsight.highlighting.JavaReadWriteAccessDetector" id="java"/>
-    <elementDescriptionProvider implementation="com.intellij.codeInsight.highlighting.JavaHighlightUsagesDescriptionProvider"/>
-
-    <elementDescriptionProvider implementation="com.intellij.usageView.JavaUsageViewDescriptionProvider"/>
-
-    <elementDescriptionProvider implementation="com.intellij.ide.util.JavaDeleteTypeDescriptionProvider"/>
-
-    <fileTypeIndentOptionsProvider implementation="com.intellij.application.options.JavaIndentOptionsProvider"/>
-
-    <referenceImporter implementation="com.intellij.codeInsight.daemon.impl.JavaReferenceImporter"/>
-
-    <elementLookupRenderer implementation="com.intellij.codeInsight.lookup.impl.JavaElementLookupRenderer"/>
-
-    <qualifiedNameProvider implementation="com.intellij.ide.actions.JavaQualifiedNameProvider"/>
-
-    <fileStructureGroupRuleProvider implementation="com.intellij.usages.impl.rules.NonJavaFileGroupRuleProvider"/>
-    <fileStructureGroupRuleProvider implementation="com.intellij.usages.impl.rules.JavaClassGroupRuleProvider"/>
-    <fileStructureGroupRuleProvider implementation="com.intellij.usages.impl.rules.JavaMethodGroupRuleProvider"/>
-    <usageTypeProvider implementation="com.intellij.usages.impl.rules.JavaUsageTypeProvider"/>
-    <importFilteringRule implementation="com.intellij.usages.impl.rules.ImportFilteringRule"/>
-    <usageFilteringRuleProvider implementation="com.intellij.usages.impl.ImportUsageFilteringRuleProvider"/>
-    <applicationService serviceInterface="com.intellij.usages.impl.ImportFilteringUsageViewSetting"
-                        serviceImplementation="com.intellij.usages.impl.ImportFilteringUsageViewSetting"/>
-
-    <treeStructureProvider implementation="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider"/>
-
-    <defaultLiveTemplatesProvider implementation="com.intellij.codeInsight.template.impl.JavaDefaultLiveTemplatesProvider"/>
-
-    <codeInsight.surroundWithRangeAdjuster implementation="com.intellij.codeInsight.generation.surroundWith.XmlSurroundWithRangeAdjuster"/>
-
-
-    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaAnnotationIndex"/>
-    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaAnonymousClassBaseRefOccurenceIndex"/>
-    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaFieldNameIndex"/>
-    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex"/>
-    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaMethodNameIndex"/>
-    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaShortClassNameIndex"/>
-    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaSuperClassNameOccurenceIndex"/>
-
-    <stubElementTypeHolder class="com.intellij.psi.impl.java.stubs.JavaStubElementTypes"/>
-
-
-    <dom.customAnnotationChecker implementation="com.intellij.util.xml.impl.ExtendsClassChecker"/>
-
-    <methodNavigationOffsetProvider implementation="com.intellij.codeInsight.navigation.JavaMethodNavigationOffsetProvider"/>
-
-    <filePasteProvider implementation="com.intellij.ide.JavaFilePasteProvider"/>
-
-    <testFinder implementation="com.intellij.testIntegration.JavaTestFinder"/>
-    <testCreator language="JAVA" implementationClass="com.intellij.testIntegration.JavaTestCreator"/>
-
-    <callHierarchyProvider language="JAVA" implementationClass="com.intellij.ide.hierarchy.call.JavaCallHierarchyProvider"/>
-    <methodHierarchyProvider language="JAVA" implementationClass="com.intellij.ide.hierarchy.method.JavaMethodHierarchyProvider"/>
-    <typeHierarchyProvider language="JAVA" implementationClass="com.intellij.ide.hierarchy.type.JavaTypeHierarchyProvider"/>
-
-    <optionsApplicabilityFilter implementation="com.intellij.application.options.JavaOptionsApplicabilityFilter"/>
-
-    <templateCompletionProcessor implementation="com.intellij.codeInsight.template.macro.JavaTemplateCompletionProcessor"/>
-
-    <!-- this depends on TemplateLanguageConfigurable which isn't registered in LangExtensions, so it should go here as well -->
-    <errorQuickFixProvider implementation="com.intellij.psi.templateLanguages.TemplateLanguageErrorQuickFixProvider"/>
-
-    <basicWordSelectionFilter implementation="com.intellij.codeInsight.editorActions.wordSelection.JavaBasicWordSelectionFilter"/>
-
-    <fileIconPatcher implementation="com.intellij.ide.JavaFileIconPatcher"/>
-
-    <idIndexer filetype="JAVA" implementationClass="com.intellij.psi.impl.cache.impl.idCache.JavaIdIndexer"/>
-    <todoIndexer filetype="JAVA" implementationClass="com.intellij.psi.impl.cache.impl.idCache.JavaTodoIndexer"/>
-
-    <refactoring.elementListenerProvider implementation="com.intellij.execution.impl.RunConfigurationRefactoringElementListenerProvider"/>
-
-    <bundledKeymapProvider implementation="com.intellij.openapi.keymap.JBuilderKeymapProvider"/>
-
-    <problemFileHighlightFilter implementation="com.intellij.codeInsight.problems.DefaultProblemFileHighlightFilter"/>
-
-    <problemHighlightFilter implementation="com.intellij.codeInsight.daemon.JavaProblemHighlightFilter"/>
-
-    <projectViewPane implementation="com.intellij.ide.projectView.impl.PackageViewPane"/>
-
-    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineParameterHandler"/>
-    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineToAnonymousClassHandler"/>
-    <inlineActionHandler implementation="com.intellij.refactoring.inlineSuperClass.InlineSuperClassRefactoringHandler"/>
-    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineMethodHandler"/>
-    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineLocalHandler"/>
-    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineConstantFieldHandler"/>
-
-    <previewHintProvider implementation="com.intellij.codeInsight.preview.JavaPreviewHintProvider"/>
-    <filePropertyPusher implementation="com.intellij.openapi.roots.impl.JavaLanguageLevelPusher"/>
-
-    <psiViewerExtension implementation="com.intellij.internal.psiView.PsiViewerMethodExtension"/>
-    <psiViewerExtension implementation="com.intellij.internal.psiView.PsiViewerCodeFragmentExtension"/>
-    <psiViewerExtension implementation="com.intellij.internal.psiView.PsiViewerExpressionExtension"/>
-
-    <applicationService serviceInterface="com.intellij.profile.codeInspection.InspectionProfileManager"
-                        serviceImplementation="com.intellij.profile.codeInspection.JavaAwareInspectionProfileManager"/>
-    <exportable serviceInterface="com.intellij.profile.codeInspection.InspectionProfileManager"/>
-    <schemeOwner serviceInterface="com.intellij.profile.codeInspection.InspectionProfileManager"/>
-
-    <resolveScopeEnlarger implementation="com.intellij.psi.NonClasspathResolveScopeEnlarger"/>
-
-    <xmlRpcHandler name="fileOpener" implementation="com.intellij.ide.OpenFileXmlRpcHandler"/>
-  </extensions>
-
-  <xi:include href="/META-INF/xdebugger.xml" xpointer="xpointer(/root/*)"/>
-  <extensions defaultExtensionNs="com.intellij">
-    <xdebugger.debuggerSupport implementation="com.intellij.debugger.ui.JavaDebuggerSupport"/>
-  </extensions>
-
-  <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/RegExpPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/ImagesPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
-</idea-plugin>
+<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <id>com.intellij</id>
+  <name>IDEA CORE</name>
+
+  <module value="com.intellij.modules.platform"/>
+  <module value="com.intellij.modules.lang"/>
+  <module value="com.intellij.modules.vcs"/>
+  <module value="com.intellij.modules.xdebugger"/>
+  <module value="com.intellij.modules.xml"/>
+  <module value="com.intellij.modules.java"/>
+  <module value="com.intellij.modules.all"/>
+
+  <xi:include href="/componentSets/IdeaComponents.xml" xpointer="xpointer(/components/*)"/>
+  <xi:include href="/idea/IdeaActions.xml" xpointer="xpointer(/component/*)"/>
+
+  <extensionPoints>
+    <xi:include href="/META-INF/PlatformExtensionPoints.xml" xpointer="xpointer(/extensionPoints/*)"/>
+    <xi:include href="/META-INF/VcsExtensionPoints.xml" xpointer="xpointer(/extensionPoints/*)"/>
+    <xi:include href="/META-INF/LangExtensionPoints.xml" xpointer="xpointer(/extensionPoints/*)"/>
+
+    <extensionPoint name="codeInsight.changeVariableTypeQuickFixProvider"
+                    interface="com.intellij.codeInsight.quickfix.ChangeVariableTypeQuickFixProvider"/>
+    <extensionPoint name="conversion.rule" 
+                    interface="com.intellij.refactoring.typeMigration.rules.TypeConversionRule"/>
+
+    <extensionPoint name="overrideImplementsAnnotationsHandler"
+                    interface="com.intellij.codeInsight.generation.OverrideImplementsAnnotationsHandler"/>
+
+    <extensionPoint name="project.converterProvider"
+                    interface="com.intellij.conversion.ConverterProvider"/>
+
+    <extensionPoint name="junitPatcher"
+                    interface="com.intellij.execution.JUnitPatcher"/>
+
+    <extensionPoint name="i18nInspectionTool"
+                    interface="com.intellij.codeInspection.FileCheckingInspection"/>
+    <extensionPoint name="invalidPropertyKeyInspectionTool"
+                    interface="com.intellij.codeInspection.FileCheckingInspection"/>
+    <extensionPoint name="java15InspectionTool"
+                    interface="com.intellij.codeInspection.FileCheckingInspection"/>
+
+    <extensionPoint name="deadCode"
+                    interface="com.intellij.codeInspection.reference.EntryPoint"/>
+
+    <!-- PsiMember -->
+    <extensionPoint name="javaDocNotNecessary"
+                    interface="com.intellij.openapi.util.Condition"/>
+
+    <!-- PsiMember -->
+    <extensionPoint name="cantBeStatic"
+                    interface="com.intellij.openapi.util.Condition"/>
+
+    <!-- RefMethod -->
+    <extensionPoint name="canBeEmpty"
+                    interface="com.intellij.openapi.util.Condition"/>
+
+    <extensionPoint name="visibility"
+                    interface="com.intellij.codeInspection.visibility.VisibilityExtension"/>
+
+    <extensionPoint name="antBuildGen"
+                    interface="com.intellij.compiler.ant.ChunkBuildExtension"/>
+
+    <extensionPoint name="antCustomCompiler"
+                    interface="com.intellij.compiler.ant.ChunkCustomCompilerExtension"/>
+
+    <extensionPoint name="methodImplementor"
+                    interface="com.intellij.codeInsight.MethodImplementor"/>
+
+    <extensionPoint name="compiler.buildParticipantProvider"
+                    interface="com.intellij.openapi.compiler.make.BuildParticipantProvider"/>
+
+    <extensionPoint name="compiler.additionalCompileScopeProvider"
+                    interface="com.intellij.compiler.impl.AdditionalCompileScopeProvider"/>
+
+    <extensionPoint name="compiler.makeDependencyProcessor"
+                    interface="com.intellij.compiler.DependencyProcessor"/>
+
+    <extensionPoint name="debugger.codeFragmentFactory"
+                    interface="com.intellij.debugger.engine.evaluation.CodeFragmentFactory"/>
+
+    <extensionPoint name="debugger.breakpointFactory"
+                    interface="com.intellij.debugger.ui.breakpoints.BreakpointFactory"/>
+
+    <extensionPoint name="debugger.jvmDebugProvider"
+                    interface="com.intellij.debugger.engine.JVMDebugProvider"/>
+
+    <extensionPoint name="java.programPatcher"
+                    interface="com.intellij.execution.runners.JavaProgramPatcher"/>
+
+    <extensionPoint name="OrderRootTypeUI"
+                    beanClass="com.intellij.openapi.extensions.KeyedFactoryEPBean"/>
+
+    <extensionPoint name="library.creator" interface="com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryCreator"/>
+
+    <extensionPoint name="allOverridingMethodsSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="annotatedElementsSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="annotatedPackagesSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="classInheritorsSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="deepestSuperMethodsSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="directClassInheritorsSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="methodReferencesSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="overridingMethodsSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="superMethodsSearch" interface="com.intellij.util.QueryExecutor"/>
+    <extensionPoint name="allClassesSearch" interface="com.intellij.util.QueryExecutor"/>
+
+    <extensionPoint name="compiler.inspectionValidator"
+                    interface="com.intellij.openapi.compiler.util.InspectionValidator"
+                    area="IDEA_PROJECT"/>
+
+    <extensionPoint name="packaging.elementType" interface="com.intellij.packaging.elements.PackagingElementType"/>
+    <extensionPoint name="packaging.artifactPropertiesProvider" interface="com.intellij.packaging.artifacts.ArtifactPropertiesProvider"/>
+    <extensionPoint name="packaging.sourceItemProvider" interface="com.intellij.packaging.ui.PackagingSourceItemsProvider"/>
+    <extensionPoint name="packaging.artifactType" interface="com.intellij.packaging.artifacts.ArtifactType"/>
+
+    <extensionPoint name="persistenceModel.persistenceModelProvider"
+                    interface="com.intellij.persistenceModel.PersistenceModelProvider"/>
+
+    <extensionPoint name="classpathStorageProvider"
+                    interface="com.intellij.openapi.roots.impl.storage.ClasspathStorageProvider"/>
+
+    <extensionPoint name="javaExpressionSurrounder"
+                    interface="com.intellij.codeInsight.generation.surroundWith.JavaExpressionSurrounder"/>
+
+    <extensionPoint name="frameworkSupport" interface="com.intellij.ide.util.frameworkSupport.FrameworkSupportProvider"/>
+    <extensionPoint name="frameworkSupportCommunicator" interface="com.intellij.ide.util.newProjectWizard.impl.FrameworkSupportCommunicator"/>
+
+    <!--new project wizard-->
+    <extensionPoint name="wizardMode" interface="com.intellij.ide.util.newProjectWizard.modes.WizardMode"/>
+    <extensionPoint name="projectImportProvider" interface="com.intellij.projectImport.ProjectImportProvider"/>
+    <extensionPoint name="projectImportBuilder" interface="com.intellij.projectImport.ProjectImportBuilder"/>
+
+    <extensionPoint name="codeInsight.wordCompletionFilter" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+
+    <extensionPoint name="customPropertyScopeProvider" interface="com.intellij.psi.impl.search.CustomPropertyScopeProvider"/>
+
+    <extensionPoint name="testFramework" interface="com.intellij.testIntegration.TestFramework"/>
+
+    <extensionPoint name="unscrambleSupport" interface="com.intellij.unscramble.UnscrambleSupport"/>
+
+    <extensionPoint name="compiler" area="IDEA_PROJECT" interface="com.intellij.openapi.compiler.Compiler"/>
+    <extensionPoint name="compilerFactory" area="IDEA_PROJECT" interface="com.intellij.openapi.compiler.CompilerFactory"/>
+    <extensionPoint name="compilerSettingsFactory" area="IDEA_PROJECT" interface="com.intellij.compiler.CompilerSettingsFactory"/>
+    <extensionPoint name="clsStubBuilderFactory" interface="com.intellij.psi.impl.compiled.ClsStubBuilderFactory"/>
+    <extensionPoint name="javaMainMethodProvider" interface="com.intellij.codeInsight.runner.JavaMainMethodProvider"/>
+
+    <extensionPoint name="debuggerClassFilterProvider" interface="com.intellij.ui.classFilter.DebuggerClassFilterProvider"/>
+
+    <extensionPoint name="debuggerEditorTextProvider" beanClass="com.intellij.lang.LanguageExtensionPoint" />
+
+    <extensionPoint name="stackFrameFilter" interface="com.intellij.execution.filters.StackFrameFilter"/>
+
+    <extensionPoint name="paletteItemProvider" area="IDEA_PROJECT" interface="com.intellij.ide.palette.PaletteItemProvider"/>
+
+    <extensionPoint name="javadocTagInfo" area="IDEA_PROJECT" interface="com.intellij.psi.javadoc.JavadocTagInfo"/>
+
+    <extensionPoint name="refactoring.introduceParameterMethodUsagesProcessor" interface="com.intellij.refactoring.introduceParameter.IntroduceParameterMethodUsagesProcessor"/>
+
+    <extensionPoint name="annotationSupport" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="constantExpressionEvaluator" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+
+    <!--<extensionPoint name="expectedTypesProvider" interface="com.intellij.codeInsight.ExpectedTypesProviderExtension"/>-->
+
+    <extensionPoint name="java.elementFinder" area="IDEA_PROJECT" interface="com.intellij.psi.PsiElementFinder"/>
+    <extensionPoint name="java.shortNamesCache" area="IDEA_PROJECT" interface="com.intellij.psi.search.PsiShortNamesCache"/>
+
+    <extensionPoint name="attachSourcesProvider" interface="com.intellij.codeInsight.AttachSourcesProvider"/>
+
+    <extensionPoint name="libraryTable.attachHandler" interface="com.intellij.openapi.roots.ui.configuration.libraryEditor.LibraryTableAttachHandler"/>
+
+    <extensionPoint name="java.compiler" area="IDEA_PROJECT" interface="com.intellij.compiler.impl.javaCompiler.BackendCompiler"/>
+
+    <extensionPoint name="classNameInsertHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="allowedApiFilter" interface="com.intellij.psi.impl.AllowedApiFilterExtension"/>
+  </extensionPoints>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <xi:include href="/META-INF/PlatformExtensions.xml" xpointer="xpointer(/extensions/*)"/>
+    <xi:include href="/META-INF/VcsExtensions.xml" xpointer="xpointer(/extensions/*)"/>
+    <xi:include href="/META-INF/LangExtensions.xml" xpointer="xpointer(/extensions/*)"/>
+
+    <constantExpressionEvaluator language="JAVA" implementationClass="com.intellij.psi.impl.PsiExpressionEvaluator" />
+    <annotationSupport language="JAVA" implementationClass="com.intellij.psi.impl.source.tree.java.JavaAnnotationSupport" />
+
+    <codeInsight.unresolvedReferenceQuickFixProvider
+        implementation="com.intellij.codeInsight.daemon.impl.quickfix.DefaultQuickFixProvider"/>
+
+    <codeInsight.changeVariableTypeQuickFixProvider
+        implementation="com.intellij.codeInsight.daemon.impl.quickfix.VariableTypeQuickFixProvider"/>
+
+    <overrideImplementsAnnotationsHandler implementation="com.intellij.codeInsight.generation.OverrideImplementsAnnotationsHandlerImpl"/>
+    <applicationService serviceInterface="com.intellij.openapi.module.ModuleTypeManager"
+                        serviceImplementation="com.intellij.openapi.module.impl.JavaAwareModuleTypeManagerImpl"/>
+    <errorOptionsProvider instance="com.intellij.profile.codeInspection.ui.JavaErrorOptionsProvider"/>
+    <autoImportOptionsProvider instance="com.intellij.application.options.editor.JavaAutoImportOptions"/>
+    <codeFoldingOptionsProvider instance="com.intellij.application.options.editor.JavaCodeFoldingOptionsProvider"/>
+
+
+
+    <!--<expectedTypesProvider implementation="com.intellij.codeInsight.JavaExpectedTypesProvider"/>-->
+
+
+
+    <appStarter implementation="com.intellij.compiler.ant.GenerateAntMain"/>
+
+    <referencesSearch implementation="com.intellij.psi.impl.search.PsiAnnotationMethodReferencesSearcher"/>
+    <referencesSearch implementation="com.intellij.psi.impl.search.ConstructorReferencesSearcher"/>
+    <allClassesSearch implementation="com.intellij.psi.impl.search.AllClassesSearchExecutor"/>
+
+    <referencesSearch implementation="com.intellij.psi.impl.search.SimpleAccessorReferenceSearcher"/>
+
+    <superMethodsSearch implementation="com.intellij.psi.impl.search.MethodSuperSearcher"/>
+    <annotatedElementsSearch implementation="com.intellij.psi.impl.search.AnnotatedElementsSearcher"/>
+    <annotatedPackagesSearch implementation="com.intellij.psi.impl.search.AnnotatedPackagesSearcher"/>
+    <directClassInheritorsSearch implementation="com.intellij.psi.impl.search.JavaDirectInheritorsSearcher"/>
+    <overridingMethodsSearch implementation="com.intellij.psi.impl.search.JavaOverridingMethodsSearcher"/>
+    <allOverridingMethodsSearch implementation="com.intellij.psi.impl.search.JavaAllOverridingMethodsSearcher"/>
+    <methodReferencesSearch implementation="com.intellij.psi.impl.search.MethodUsagesSearcher"/>
+    <deepestSuperMethodsSearch implementation="com.intellij.psi.impl.search.MethodDeepestSuperSearcher"/>
+
+    <definitionsSearch implementation="com.intellij.codeInsight.navigation.MethodImplementationsSearch"/>
+    <definitionsSearch implementation="com.intellij.codeInsight.navigation.ClassImplementationsSearch"/>
+
+    <inspectionToolProvider implementation="com.intellij.codeInspection.ex.StandardInspectionToolsProvider"/>
+    <inspectionToolProvider implementation="com.intellij.codeInspection.internal.InternalInspectionToolsProvider"/>
+
+    <renameHandler implementation="com.intellij.ide.projectView.impl.RenameModuleHandler"/>
+
+    <fileTypeFactory implementation="com.intellij.openapi.fileTypes.impl.DefaultFileTypeFactory"/>
+
+    <lookup.actionProvider implementation="com.intellij.codeInsight.completion.ImportStaticLookupActionProvider" id="importStatic"/>
+    <lookup.actionProvider implementation="com.intellij.codeInsight.completion.ExcludeFromCompletionLookupActionProvider"
+                           id="excludeFromCompletion" order="last"/>
+
+    <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier" id="javaNameIdentifier"/>
+    <completion.confidence language="JAVA" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" id="javaTrue" order="last"/>
+
+    <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.BasicToClassNameDelegator" id="basic2ClassName"
+                            order="first, before javaMemberName, after xml"/>
+    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaCompletionContributor" id="javaLegacy"
+                            order="last, before legacy, before default, before javaClassName"/>
+    <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaClassReferenceCompletionContributor"
+                            id="javaClassReference"/>
+
+    <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaMethodMergingContributor" id="methodMerger"
+                            order="before javaLegacy, before default"/>
+    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaMemberNameCompletionContributor" id="javaMemberName"
+                            order="before javaLegacy"/>
+    <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.JavaClassNameCompletionContributor" id="javaClassName"
+                            order="last, before default"/>
+    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaGlobalMemberNameCompletionContributor"
+                            id="javaGlobalMemberName" order="last, after javaClassName"/>
+
+    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaDocCompletionContributor" id="javadoc"
+                            order="last, before javaLegacy"/>
+
+    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.NullSmartCompletionContributor" id="smartNull"
+                            order="last, before javaSmart"/>
+    <completion.contributor language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaSmartCompletionContributor" id="javaSmart"
+                            order="last, before default"/>
+    <classNameInsertHandler language="JAVA" implementationClass="com.intellij.codeInsight.completion.JavaClassNameInsertHandler"/> 
+
+    <packaging.sourceItemProvider implementation="com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ModulesAndLibrariesSourceItemsProvider"/>
+    <packaging.sourceItemProvider implementation="com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ArtifactsSourceItemsProvider"/>
+    <packaging.artifactType implementation="com.intellij.packaging.impl.artifacts.JarArtifactType" order="first"/>
+    <packaging.artifactType implementation="com.intellij.packaging.impl.artifacts.PlainArtifactType" order="last"/>
+    <compiler.additionalCompileScopeProvider implementation="com.intellij.packaging.impl.compiler.ArtifactAdditionalCompileScopeProvider"/>
+    <compiler implementation="com.intellij.packaging.impl.compiler.ArtifactsCompiler" id="artifactsCompiler"/>
+
+    <lookup.charFilter implementation="com.intellij.codeInsight.completion.JavaCharFilter" id="java"/>
+
+    <lang.elementManipulator forClass="com.intellij.psi.PsiLiteralExpression"
+                             implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.manipulators.StringLiteralManipulator"/>
+    <lang.elementManipulator forClass="com.intellij.psi.javadoc.PsiDocTag"
+                             implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.manipulators.PsiDocTagValueManipulator"/>
+
+    <applicationService serviceInterface="com.intellij.util.xml.converters.values.ClassValueConverter"
+                    serviceImplementation="com.intellij.util.xml.converters.ClassValueConverterImpl"/>
+
+    <applicationService serviceInterface="com.intellij.util.xml.converters.values.ClassArrayConverter"
+                    serviceImplementation="com.intellij.util.xml.converters.ClassArrayConverterImpl"/>
+
+    <applicationService serviceInterface="com.intellij.util.descriptors.ConfigFileFactory"
+                        serviceImplementation="com.intellij.util.descriptors.impl.ConfigFileFactoryImpl"/>
+    <applicationService serviceInterface="com.intellij.debugger.engine.DebuggerUtils"
+                        serviceImplementation="com.intellij.debugger.impl.DebuggerUtilsImpl"/>
+
+    <applicationService serviceInterface="com.intellij.openapi.roots.ui.configuration.DefaultModuleConfigurationEditorFactory"
+                        serviceImplementation="com.intellij.openapi.roots.ui.configuration.DefaultModuleConfigurationEditorFactoryImpl"/>
+    <applicationService serviceInterface="com.intellij.ide.util.projectWizard.ProjectWizardStepFactory"
+                        serviceImplementation="com.intellij.ide.util.projectWizard.ProjectWizardStepFactoryImpl"/>
+
+    <applicationService serviceInterface="com.intellij.peer.PeerFactory" serviceImplementation="com.intellij.peer.impl.PeerFactoryImpl"/>
+
+    <applicationService serviceInterface="com.intellij.codeInspection.reference.RefJavaUtil"
+                        serviceImplementation="com.intellij.codeInspection.reference.RefJavaUtilImpl"/>
+    <applicationService serviceInterface="com.intellij.psi.EmptySubstitutor"
+                        serviceImplementation="com.intellij.psi.impl.EmptySubstitutorImpl"/>
+
+    <applicationService serviceInterface="com.intellij.openapi.deployment.DeploymentUtil"
+                        serviceImplementation="com.intellij.openapi.deployment.DeploymentUtilImpl"/>
+    <applicationService serviceInterface="com.intellij.compiler.ant.BuildTargetsFactory"
+                        serviceImplementation="com.intellij.compiler.ant.BuildTargetsFactoryImpl"/>
+
+    <applicationService serviceInterface="com.intellij.codeInsight.intention.QuickFixFactory"
+                        serviceImplementation="com.intellij.codeInsight.intention.impl.config.QuickFixFactoryImpl"/>
+
+    <applicationService serviceInterface="com.intellij.openapi.roots.libraries.LibrariesHelper" serviceImplementation="com.intellij.openapi.roots.libraries.LibrariesHelperImpl"/>
+
+
+    <projectService serviceInterface="com.intellij.ide.util.TreeClassChooserFactory"
+                    serviceImplementation="com.intellij.ide.util.TreeClassChooserFactoryImpl"/>
+    <projectService serviceInterface="com.intellij.codeInsight.guess.GuessManager"
+                    serviceImplementation="com.intellij.codeInsight.guess.impl.GuessManagerImpl"/>
+    <projectService serviceInterface="com.intellij.psi.impl.source.resolve.JavaResolveCache"
+                    serviceImplementation="com.intellij.psi.impl.source.resolve.JavaResolveCache"/>
+
+    <projectService serviceInterface="com.intellij.facet.impl.ui.FacetEditorsStateManager"
+                    serviceImplementation="com.intellij.facet.impl.ui.FacetEditorsStateManagerImpl"/>
+
+    <projectService serviceInterface="com.intellij.openapi.module.ModulePointerManager"
+                    serviceImplementation="com.intellij.openapi.module.impl.ModulePointerManagerImpl"/>
+
+    <applicationService serviceInterface="com.intellij.facet.ui.FacetEditorsFactory"
+                        serviceImplementation="com.intellij.facet.impl.ui.FacetEditorsFactoryImpl"/>
+
+    <applicationService serviceInterface="com.intellij.psi.JavaDirectoryService"
+                        serviceImplementation="com.intellij.psi.impl.file.JavaDirectoryServiceImpl"/>
+
+    <applicationService serviceInterface="com.intellij.refactoring.JavaRefactoringActionHandlerFactory"
+                        serviceImplementation="com.intellij.refactoring.openapi.impl.JavaRefactoringActionHandlerFactoryImpl"/>
+    <changeSignatureDetector language="JAVA" implementationClass="com.intellij.refactoring.changeSignature.JavaChangeSignatureDetector"/>
+
+    <applicationService serviceInterface="com.intellij.refactoring.JavaRefactoringSettings"
+                        serviceImplementation="com.intellij.refactoring.JavaRefactoringSettings"/>
+
+    <applicationService serviceInterface="com.intellij.ide.util.ModuleRendererFactory"
+                        serviceImplementation="com.intellij.ide.util.DefaultModuleRendererFactory"/>
+
+    <applicationService serviceInterface="com.intellij.openapi.projectRoots.ProjectJdkTable"
+                        serviceImplementation="com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl"/>
+    <exportable serviceInterface="com.intellij.openapi.projectRoots.ProjectJdkTable"/>
+
+
+    <projectService serviceInterface="com.intellij.refactoring.RefactoringManager"
+                    serviceImplementation="com.intellij.refactoring.RefactoringManager"/>
+    <projectService serviceInterface="com.intellij.refactoring.listeners.JavaRefactoringListenerManager"
+                    serviceImplementation="com.intellij.refactoring.listeners.impl.JavaRefactoringListenerManagerImpl"/>
+    <projectService serviceInterface="com.intellij.refactoring.RefactoringFactory"
+                    serviceImplementation="com.intellij.refactoring.openapi.impl.JavaRefactoringFactoryImpl"/>
+
+    <applicationService serviceInterface="com.intellij.execution.runners.RunStrategy"
+                        serviceImplementation="com.intellij.execution.runners.RunStrategyImpl"/>
+    <applicationService serviceInterface="com.intellij.execution.runners.ProcessProxyFactory"
+                        serviceImplementation="com.intellij.execution.runners.ProcessProxyFactoryImpl"/>
+
+    <applicationService serviceInterface="com.intellij.debugger.settings.NodeRendererSettings"
+                        serviceImplementation="com.intellij.debugger.settings.NodeRendererSettings"/>
+    <applicationService serviceInterface="com.intellij.debugger.settings.ViewsGeneralSettings"
+                        serviceImplementation="com.intellij.debugger.settings.ViewsGeneralSettings"/>
+    <applicationService serviceInterface="com.intellij.debugger.settings.DebuggerSettings"
+                        serviceImplementation="com.intellij.debugger.settings.DebuggerSettings"/>
+    <applicationService serviceInterface="com.intellij.debugger.settings.ThreadsViewSettings"
+                        serviceImplementation="com.intellij.debugger.settings.ThreadsViewSettings"/>
+
+    <applicationService serviceInterface="com.intellij.codeInsight.folding.JavaCodeFoldingSettings"
+                        serviceImplementation="com.intellij.codeInsight.folding.impl.JavaCodeFoldingSettingsImpl"/>
+    <exportable serviceInterface="com.intellij.codeInsight.folding.JavaCodeFoldingSettings"/>
+
+    <applicationService serviceInterface="com.intellij.packaging.elements.PackagingElementFactory"
+                        serviceImplementation="com.intellij.packaging.impl.elements.PackagingElementFactoryImpl"/>
+
+    <projectService serviceInterface="com.intellij.packaging.artifacts.ArtifactPointerManager"
+                    serviceImplementation="com.intellij.packaging.impl.artifacts.ArtifactPointerManagerImpl"/>
+    <projectService serviceInterface="com.intellij.packaging.impl.artifacts.ArtifactBySourceFileFinder"
+                    serviceImplementation="com.intellij.packaging.impl.artifacts.ArtifactBySourceFileFinderImpl"/>
+    <projectService serviceInterface="com.intellij.packaging.impl.artifacts.ArtifactValidationUtil"
+                    serviceImplementation="com.intellij.packaging.impl.artifacts.ArtifactValidationUtilImpl"/>
+
+    <projectService serviceInterface="com.intellij.lang.injection.InjectedLanguageManager"
+                    serviceImplementation="com.intellij.psi.impl.source.tree.injected.InjectedLanguageManagerImpl"/>
+    <projectService serviceInterface="com.intellij.psi.impl.source.tree.injected.JavaConcatenationInjectorManager"
+                    serviceImplementation="com.intellij.psi.impl.source.tree.injected.JavaConcatenationInjectorManager"/>
+
+    <multiHostInjector implementation="com.intellij.psi.impl.source.tree.injected.JavaConcatenationInjectorManager$Concatenation2InjectorAdapter" order="last"/>
+
+    <applicationService serviceInterface="com.intellij.conversion.ConversionService"
+                        serviceImplementation="com.intellij.conversion.impl.ConversionServiceImpl"/>
+
+    <projectService serviceInterface="com.intellij.codeInsight.ExternalAnnotationsManager"
+                    serviceImplementation="com.intellij.codeInsight.ExternalAnnotationsManagerImpl"/>
+
+    <projectService serviceInterface="com.intellij.psi.SmartTypePointerManager"
+                    serviceImplementation="com.intellij.psi.impl.smartPointers.SmartTypePointerManagerImpl"/>
+    <projectService serviceInterface="com.intellij.psi.codeStyle.JavaCodeStyleManager"
+                    serviceImplementation="com.intellij.psi.impl.source.codeStyle.JavaCodeStyleManagerImpl"/>
+    <projectService serviceInterface="com.intellij.openapi.compiler.CompilerManager"
+                    serviceImplementation="com.intellij.compiler.CompilerManagerImpl"/>
+    <projectService serviceInterface="com.intellij.openapi.roots.CompilerProjectExtension"
+                    serviceImplementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl"/>
+    <projectService serviceInterface="com.intellij.openapi.roots.LanguageLevelProjectExtension"
+                    serviceImplementation="com.intellij.openapi.roots.impl.LanguageLevelProjectExtensionImpl"/>
+    <projectService serviceInterface="com.intellij.codeInsight.ExpectedTypesProvider"
+                    serviceImplementation="com.intellij.codeInsight.ExpectedTypesProvider"/>
+
+    <projectService serviceInterface="com.intellij.psi.controlFlow.ControlFlowFactory"
+                    serviceImplementation="com.intellij.psi.controlFlow.ControlFlowFactory"/>
+
+    <projectService serviceInterface="com.intellij.packaging.impl.compiler.ArtifactsWorkspaceSettings"
+                    serviceImplementation="com.intellij.packaging.impl.compiler.ArtifactsWorkspaceSettings"/>
+
+    <projectService serviceInterface="com.intellij.compiler.CompilerWorkspaceConfiguration"
+                    serviceImplementation="com.intellij.compiler.CompilerWorkspaceConfiguration"/>
+
+    <projectService serviceInterface="com.intellij.openapi.vcs.CodeSmellDetector"
+                    serviceImplementation="com.intellij.openapi.vcs.impl.CodeSmellDetectorImpl"/>
+    <projectService serviceInterface="com.intellij.openapi.vcs.changes.patch.PatchBaseDirectoryDetector"
+                    serviceImplementation="com.intellij.openapi.vcs.changes.patch.PsiPatchBaseDirectoryDetector"/>
+    <projectService serviceInterface="com.intellij.openapi.vcs.changes.ui.ChangesGroupingPolicyFactory"
+                    serviceImplementation="com.intellij.openapi.vcs.changes.ui.ChangesModuleGroupingPolicyFactory"/>
+    <projectService serviceInterface="com.intellij.openapi.vcs.impl.DefaultVcsRootPolicy"
+                    serviceImplementation="com.intellij.openapi.vcs.impl.ModuleDefaultVcsRootPolicy"/>
+    <projectService serviceInterface="com.intellij.openapi.vcs.impl.ExcludedFileIndex"
+                    serviceImplementation="com.intellij.openapi.vcs.impl.ProjectExcludedFileIndex"/>
+    <projectService serviceInterface="com.intellij.openapi.vcs.impl.VcsPathPresenter"
+                    serviceImplementation="com.intellij.openapi.vcs.impl.ModuleVcsPathPresenter"/>
+
+    <projectService serviceInterface="com.intellij.psi.CommonReferenceProviderTypes"
+                    serviceImplementation="com.intellij.psi.impl.CommonReferenceProviderTypesImpl"/>
+    <projectService serviceInterface="com.intellij.psi.impl.file.PsiDirectoryFactory"
+                    serviceImplementation="com.intellij.psi.impl.file.PsiJavaDirectoryFactory"/>
+
+    <projectService serviceInterface="com.intellij.openapi.roots.ui.configuration.ProjectSettingsService"
+                    serviceImplementation="com.intellij.openapi.roots.ui.configuration.IdeaProjectSettingsService"/>
+
+    <projectService serviceInterface="com.intellij.openapi.roots.PackageIndex"
+                    serviceImplementation="com.intellij.openapi.roots.impl.ProjectPackageIndexImpl"/>
+    <moduleService serviceInterface="com.intellij.openapi.roots.ModulePackageIndex"
+                   serviceImplementation="com.intellij.openapi.roots.impl.ModulePackageIndexImpl"/>
+
+    <projectService serviceInterface="com.intellij.usages.impl.rules.DirectoryGroupingRule"
+                    serviceImplementation="com.intellij.usages.impl.rules.PackageGroupingRule"/>
+
+    <projectService serviceInterface="com.intellij.slicer.SliceToolwindowSettings"
+                    serviceImplementation="com.intellij.slicer.SliceToolwindowSettings"/>
+    <projectService serviceInterface="com.intellij.slicer.SliceManager"
+                    serviceImplementation="com.intellij.slicer.SliceManager"/>
+
+    <projectService serviceInterface="com.intellij.codeInspection.ex.EntryPointsManagerImpl"
+                    serviceImplementation="com.intellij.codeInspection.ex.EntryPointsManagerImpl"/>
+
+    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration"
+                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration"/>
+    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.api.CompilerAPIConfiguration"
+                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.api.CompilerAPIConfiguration"/>
+    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompilerConfiguration"
+                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompilerConfiguration"/>
+    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompilerConfiguration"
+                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompilerConfiguration"/>
+    <projectService serviceInterface="com.intellij.compiler.impl.rmiCompiler.RmicConfiguration"
+                    serviceImplementation="com.intellij.compiler.impl.rmiCompiler.RmicConfiguration"/>
+    <projectService serviceInterface="com.intellij.compiler.impl.javaCompiler.jikes.JikesConfiguration"
+                    serviceImplementation="com.intellij.compiler.impl.javaCompiler.jikes.JikesConfiguration"/>
+
+    <applicationService serviceInterface="com.intellij.openapi.wm.impl.FrameTitleBuilder"
+                        serviceImplementation="com.intellij.openapi.wm.IdeaFrameTitleBuilder"/>
+
+    <applicationService serviceInterface="com.intellij.openapi.roots.ui.configuration.libraries.LibraryPresentationManager"
+                        serviceImplementation="com.intellij.openapi.roots.ui.configuration.libraries.impl.LibraryPresentationManagerImpl"/>
+    <projectService serviceInterface="com.intellij.openapi.roots.ui.configuration.dependencyAnalysis.AnalyzeDependenciesSettings"
+                    serviceImplementation="com.intellij.openapi.roots.ui.configuration.dependencyAnalysis.AnalyzeDependenciesSettings"/>
+
+    <highlightVisitor implementation="com.intellij.codeInsight.daemon.impl.analysis.HighlightVisitorImpl"/>
+
+    <compiler.buildParticipantProvider implementation="com.intellij.compiler.impl.jarr.JarBuildParticipantProvider"/>
+    <java.programPatcher implementation="com.intellij.execution.impl.JarProgramPatcher"/>
+    <lang.foldingBuilder language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.actions.SuppressWarningsFoldingBuilder" />
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.SplitIfAction</className>
+      <category>Control Flow</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.InvertIfConditionAction</className>
+      <category>Control Flow</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.daemon.impl.quickfix.RemoveRedundantElseAction</className>
+      <category>Control Flow</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.AddNotNullAnnotationFix</className>
+      <category>Control Flow</category>
+      <descriptionDirectoryName>AddAnnotationFix</descriptionDirectoryName>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.AddDeprecationAnnotationFix</className>
+      <category>Control Flow</category>
+      <descriptionDirectoryName>AddAnnotationFix</descriptionDirectoryName>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.AddNullableAnnotationFix</className>
+      <category>Control Flow</category>
+      <descriptionDirectoryName>AddAnnotationFix</descriptionDirectoryName>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.DeannotateIntentionAction</className>
+      <category>Control Flow</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.CreateFieldFromParameterAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.AssignFieldFromParameterAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.daemon.impl.quickfix.CreateLocalVarFromInstanceofAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.daemon.impl.quickfix.CreateCastExpressionFromInstanceofAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.CreateSubclassAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.ImplementAbstractMethodAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.CopyAbstractMethodImplementationAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.SplitDeclarationAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.MoveInitializerToConstructorAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.MoveFieldAssignmentToInitializerAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.daemon.impl.quickfix.AddRuntimeExceptionToThrowsAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.MakeTypeGenericAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.AddOverrideAnnotationAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.SimplifyBooleanExpressionAction</className>
+      <category>Boolean</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.ConcatenationToMessageFormatAction</className>
+      <category>I18N</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.ConvertToBasicLatinAction</className>
+      <category>I18N</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.AddOnDemandStaticImportAction</className>
+      <category>Imports</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.AddSingleMemberStaticImportAction</className>
+      <category>Imports</category>
+    </intentionAction>
+
+
+    <intentionAction>
+      <className>com.intellij.codeInspection.actions.UnimplementInterfaceAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInspection.actions.ReplaceImplementsWithStaticImportAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.ColorChooserIntentionAction</className>
+      <category>Declaration</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.ConvertAbsolutePathToRelativeIntentionAction</className>
+      <category>Other</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.ConvertRelativePathToAbsoluteIntentionAction</className>
+      <category>Other</category>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.testIntegration.createTest.CreateTestAction</className>
+    </intentionAction>
+
+    <intentionAction>
+      <className>com.intellij.codeInspection.concurrencyAnnotations.JCiPOrderEntryFix</className>
+    </intentionAction>
+
+
+    <daemon.highlightInfoFilter implementation="com.intellij.debugger.engine.evaluation.DebuggerHighlightFilter"/>
+    <daemon.highlightInfoFilter implementation="com.intellij.codeInsight.daemon.impl.HighlightInfoFilterImpl"/>
+
+
+    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.LineBreakpointFactory"/>
+    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.ExceptionBreakpointFactory"/>
+    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.AnyExceptionBreakpointFactory"/>
+    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.FieldBreakpointFactory"/>
+    <debugger.breakpointFactory implementation="com.intellij.debugger.ui.breakpoints.MethodBreakpointFactory"/>
+
+    <projectService serviceInterface="com.intellij.debugger.ui.DebuggerRecents"
+                    serviceImplementation="com.intellij.debugger.ui.DebuggerRecents"/>
+
+
+    <!-- Project Configurables -->
+    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable"/>
+    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.ModuleStructureConfigurable"/>
+    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.FacetStructureConfigurable"/>
+    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactsStructureConfigurable"/>
+    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectLibrariesConfigurable"/>
+    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.GlobalLibrariesConfigurable"/>
+    <projectService serviceImplementation="com.intellij.openapi.roots.ui.configuration.projectRoot.JdkListConfigurable"/>
+
+    <!-- Errors -->
+    <!-- Show full error options configurable only in full IDEA - platform supports only default IDE profile for now -->
+    <projectConfigurable provider="com.intellij.profile.codeInspection.ui.ProjectInspectionToolsConfigurableProvider"/>
+
+    <!-- Project Structure -->
+    <projectConfigurable instance="com.intellij.compiler.options.CompilerConfigurable" order="after project"/>
+    <!-- Compiler -->
+
+    <projectConfigurable instance="com.intellij.psi.templateLanguages.TemplateDataLanguageConfigurable"/>
+
+    <!-- Scopes -->
+    <!-- This is registered as a top-level configurable in IDEA, and as a service (accessible from certain dialogs) in platform. -->
+    <projectConfigurable implementation="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable"/>
+
+    <!-- Application Configurables -->
+
+    <!-- Path Variables -->
+    <!-- the implementation of this configurable is in platform-impl but it's not registered in platform because
+         it's only required in full IDEA -->
+    <applicationConfigurable instance="com.intellij.application.options.pathMacros.PathMacroConfigurable"/>
+
+    <applicationConfigurable instance="com.intellij.execution.console.ConsoleFoldingConfigurable"/>
+
+    <!-- Resources -->
+
+    <lang.parserDefinition language="JAVA" implementationClass="com.intellij.lang.java.JavaParserDefinition"/>
+
+    <lang.refactoringSupport language="JAVA" implementationClass="com.intellij.lang.java.JavaRefactoringSupportProvider"/>
+    <lang.refactoringSupport.classMembersRefactoringSupport language="JAVA" implementationClass="com.intellij.lang.java.JavaClassMembersRefactoringSupport"/>
+
+    <lang.formatter language="JAVA" implementationClass="com.intellij.lang.java.JavaFormattingModelBuilder"/>
+
+    <lang.documentationProvider language="JAVA" implementationClass="com.intellij.lang.java.JavaDocumentationProvider"/>
+    <documentationProvider implementation="com.intellij.lang.java.FileDocumentationProvider" order="last"/>
+
+    <lang.importOptimizer language="JAVA" implementationClass="com.intellij.lang.java.JavaImportOptimizer"/>
+
+    <lang.surroundDescriptor language="JAVA"
+                             implementationClass="com.intellij.codeInsight.generation.surroundWith.JavaExpressionSurroundDescriptor"/>
+    <lang.surroundDescriptor language="JAVA"
+                             implementationClass="com.intellij.codeInsight.generation.surroundWith.JavaStatementsSurroundDescriptor"/>
+
+    <lang.unwrapDescriptor language="JAVA" implementationClass="com.intellij.codeInsight.unwrap.JavaUnwrapDescriptor"/>
+
+    <lang.namesValidator language="JAVA" implementationClass="com.intellij.lang.refactoring.JavaNamesValidator"/>
+
+    <lang.findUsagesProvider language="JAVA" implementationClass="com.intellij.lang.java.JavaFindUsagesProvider"/>
+    <usageToPsiElementProvider implementation="com.intellij.lang.java.JavaUsageToPsiElementProvider" />
+
+    <lang.commenter language="JAVA" implementationClass="com.intellij.lang.java.JavaCommenter"/>
+
+    <lang.braceMatcher language="JAVA" implementationClass="com.intellij.codeInsight.highlighting.JavaBraceMatcher"/>
+
+    <lang.foldingBuilder language="JAVA" implementationClass="com.intellij.codeInsight.folding.impl.JavaFoldingBuilder"/>
+
+    <codeInsight.parameterInfo language="JAVA" implementationClass="com.intellij.codeInsight.hint.api.impls.MethodParameterInfoHandler"/>
+    <codeInsight.parameterInfo language="JAVA" implementationClass="com.intellij.codeInsight.hint.api.impls.ReferenceParameterInfoHandler"/>
+    <codeInsight.parameterInfo language="JAVA"
+                               implementationClass="com.intellij.codeInsight.hint.api.impls.AnnotationParameterInfoHandler"/>
+
+    <codeInsight.overrideMethod language="JAVA" implementationClass="com.intellij.codeInsight.generation.JavaOverrideMethodsHandler"/>
+    <codeInsight.implementMethod language="JAVA" implementationClass="com.intellij.codeInsight.generation.JavaImplementMethodsHandler"/>
+    <codeInsight.delegateMethods language="JAVA" implementationClass="com.intellij.codeInsight.generation.GenerateDelegateHandler"/>
+    <codeInsight.gotoSuper language="JAVA" implementationClass="com.intellij.codeInsight.navigation.JavaGotoSuperHandler"/>
+    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.JavaLineMarkerProvider"/>
+    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.IconLineMarkerProvider"/>
+
+    <codeInsight.wordCompletionFilter language="JAVA" implementationClass="com.intellij.lang.java.JavaWordCompletionFilter"/>
+
+    <statementUpDownMover implementation="com.intellij.codeInsight.editorActions.moveUpDown.StatementMover" id="statement"
+                          order="before declaration"/>
+    <statementUpDownMover implementation="com.intellij.codeInsight.editorActions.moveUpDown.DeclarationMover" id="declaration"
+                          order="before xml"/>
+
+    <fileType.fileViewProviderFactory filetype="CLASS" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
+
+    <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.AttachSourcesNotificationProvider"/>
+    <editorFileSwapper implementation="com.intellij.codeEditor.JavaEditorFileSwapper"/>
+
+    <lang.psiStructureViewFactory language="JAVA" implementationClass="com.intellij.lang.java.JavaStructureViewBuilderFactory"/>
+
+    <lang.ast.factory language="JAVA" implementationClass="com.intellij.psi.impl.source.tree.JavaASTFactory"/>
+
+    <lang.literalEscaper language="JAVA" implementationClass="com.intellij.lang.java.JavaLiteralEscaper"/>
+
+    <lang.smartEnterProcessor language="JAVA"
+                              implementationClass="com.intellij.codeInsight.editorActions.smartEnter.JavaSmartEnterProcessor"/>
+    <lang.smartEnterProcessor language="JSPX" implementationClass="com.intellij.codeInsight.completion.XmlSmartEnterProcessor"/>
+
+    <checkinHandlerFactory implementation="com.intellij.openapi.vcs.checkin.StandardCheckinHandlerFactory"/>
+    <checkinHandlerFactory implementation="com.intellij.openapi.vcs.checkin.CodeAnalysisCheckinHandlerFactory"/>
+
+    <configurationProducer implementation="com.intellij.execution.application.ApplicationConfigurationProducer"/>
+
+    <javaExpressionSurrounder implementation="com.intellij.debugger.codeinsight.JavaWithRuntimeCastSurrounder"/>
+
+    <checkoutListener implementation="com.intellij.openapi.vcs.checkout.ProjectCheckoutListener"/>
+    <checkoutCompletedListener implementation="com.intellij.openapi.vcs.checkout.NewProjectCheckoutListener"/>
+
+    <iconProvider implementation="com.intellij.psi.impl.JavaDirectoryIconProvider" id="javaDirectory"/>
+
+    <codeStyleSettingsProvider implementation="com.intellij.application.options.GenerationSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="com.intellij.application.options.codeStyle.WrappingAndBracesSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="com.intellij.application.options.codeStyle.BlankLinesSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="com.intellij.application.options.codeStyle.SpacesSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="com.intellij.application.options.ImportsSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="com.intellij.application.options.JavadocSettingsProvider"/>
+
+    <langCodeStyleSettingsProvider implementation="com.intellij.ide.JavaLanguageCodeStyleSettingsProvider"/>
+
+    <!-- new project wizard -->
+    <wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.CreateFromScratchMode"/>
+    <wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.CreateFromSourcesMode"/>
+    <wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.ImportMode"/>
+    <wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.ImportImlMode"/>
+
+    <gotoFileContributor implementation="com.intellij.ide.util.gotoByName.ProjectBaseDirNavigationContributor"/>
+
+    <consoleFilterProvider implementation="com.intellij.execution.filters.DefaultConsoleFiltersProvider"/>
+    <console.folding implementation="com.intellij.execution.filters.AuxiliaryCallsFolding"/>
+
+    <stackFrameFilter implementation="com.intellij.execution.filters.ReflectionStackFrameFilter"/>
+    <stackFrameFilter implementation="com.intellij.execution.filters.RmiStackFrameFilter"/>
+
+    <debuggerEditorTextProvider language="JAVA" implementationClass="com.intellij.debugger.impl.JavaEditorTextProviderImpl"/>
+
+    <quoteHandler fileType="JAVA" className="com.intellij.codeInsight.editorActions.JavaQuoteHandler"/>
+    <typedHandler implementation="com.intellij.codeInsight.editorActions.JavaTypedHandler" id="java"/>
+
+    <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.LiteralJoinLinesHandler"/>
+    <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.DeclarationJoinLinesHandler"/>
+    <joinLinesHandler implementation="com.intellij.codeInsight.editorActions.BlockJoinLinesHandler"/>
+
+    <filetype.decompiler filetype="CLASS" implementationClass="com.intellij.psi.impl.compiled.ClassFileDecompiler"/>
+    <filetype.stubBuilder filetype="CLASS" implementationClass="com.intellij.psi.impl.compiled.ClassFileStubBuilder"/>
+
+    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SamePsiMemberWeigher" id="samePsiMember"
+             order="before openedInEditor"/>
+    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.ExplicitlyImportedWeigher" id="explicitlyImported"
+             order="after openedInEditor"/>
+    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.JavaInheritanceWeigher" id="javaInheritance"
+             order="after explicitlyImported"/>
+    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.SamePackageWeigher" id="samePackage"
+             order="after javaInheritance, before sameLogicalRoot"/>
+    <weigher key="proximity" implementationClass="com.intellij.psi.util.proximity.KnownPackageWeigher" id="knownPackage"
+             order="after sameProject, before sdkOrLibrary"/>
+
+    <statistician key="proximity" implementationClass="com.intellij.codeInsight.completion.JavaProximityStatistician"/>
+    <statistician key="completion" implementationClass="com.intellij.codeInsight.completion.JavaCompletionStatistician"/>
+
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.StaticMembersWeigher" id="statics"
+             order="after negativeStats"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferDefaultTypeWeigher" id="defaultType"
+             order="before stats, after statics"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferLocalVariablesLiteralsAndAnnoMethodsWeigher" id="local"
+             order="after defaultType, before nameEnd"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.RecursionWeigher" id="recursion"
+             order="after local"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferExpectedTypeWeigher" id="expectedType"
+             order="after recursion"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.NameEndMatchingDegreeWeigher" id="nameEnd"
+             order="after expectedType, before stats"/>
+
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferAbstractWeigher" id="abstract"
+             order="after prefix"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferNonGenericWeigher" id="nonGeneric"
+             order="after abstract"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferAccessibleWeigher" id="accessible"
+             order="after nonGeneric"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferSimpleWeigher" id="simple"
+             order="after accessible"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferEnumConstantsWeigher" id="constants"
+             order="after simple, before proximity"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.SameWordsWeigher" id="sameWords"
+             order="after proximity"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferFieldsAndGettersWeigher" id="fieldsAndGetters"
+             order="after sameWords"/>
+    <weigher key="completion" implementationClass="com.intellij.codeInsight.completion.PreferShorterWeigher" id="shorter"
+             order="after fieldsAndGetters"/>
+
+    <weigher key="completionSorting" implementationClass="com.intellij.codeInsight.completion.PreferLessParametersWeigher" id="lessParams"
+             order="after sLookupString, before sProximity"/>
+
+    <completion.skip implementation="com.intellij.codeInsight.completion.AbstractExpectedTypeSkipper" id="skipAbstract"/>
+
+
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.LiteralSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.DocCommentSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.ListSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.CodeBlockOrInitializerSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.FinallyBlockSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.MethodOrClassSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.FieldSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.ReferenceSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.DocTagSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.IfStatementSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.TypeCastSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.JavaTokenSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.StatementGroupSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.CaseStatementsSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.AntLikePropertySelectionHandler"/>
+
+    <selectInTarget implementation="com.intellij.ide.impl.ProjectSettingsSelectInTarget"/>
+
+    <syntaxHighlighter key="CLASS" implementationClass="com.intellij.ide.highlighter.JavaFileHighlighter"/>
+
+    <structureViewBuilder key="CLASS" factoryClass="com.intellij.ide.highlighter.JavaClsStructureViewBuilderProvider"/>
+
+    <OrderRootTypeUI key="JAVADOC"
+                     implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.JavadocOrderRootTypeUIFactory"/>
+    <OrderRootTypeUI key="ANNOTATIONS"
+                     implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.AnnotationsOrderRootTypeUIFactory"/>
+    <OrderRootTypeUI key="CLASSES"
+                     implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.ClassesOrderRootTypeUIFactory"/>
+    <OrderRootTypeUI key="SOURCES"
+                     implementationClass="com.intellij.openapi.roots.ui.configuration.libraryEditor.SourcesOrderRootTypeUIFactory"/>
+
+    <getDataRule key="analysisScope" implementationClass="com.intellij.analysis.AnalysisScopeRule"/>
+    <getDataRule key="context.ProjectFileDirectory" implementationClass="com.intellij.ide.impl.dataRules.ProjectFileDirectoryRule"/>
+
+    <keymapExtension implementation="com.intellij.debugger.actions.DebuggerKeymapExtension"/>
+
+    <keymapExtension implementation="com.intellij.tools.ToolKeymapExtension"/>
+
+    <vcsSelectionProvider implementation="com.intellij.vcsUtil.JavaVcsSelectionProvider"/>
+
+    <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.ImplicitVariableElementInfoFactory"/>
+    <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.ImportListElementInfoFactory"/>
+    <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.AnchorElementInfoFactory"/>
+
+    <elementSignatureProvider implementation="com.intellij.codeInsight.folding.impl.JavaElementSignatureProvider"/>
+
+    <preFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.FormatCommentsProcessor"/>
+    <postFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.BracePostFormatProcessor"/>
+    <postFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.ImportPostFormatProcessor"/>
+    <codeInspection.InspectionExtension implementation="com.intellij.codeInspection.ex.JavaInspectionExtensionsFactory"/>
+
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.ArrayVariableMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.VariableOfTypeMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.ComponentTypeOfMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.SuggestVariableNameMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.SuggestFirstVariableNameMacro"/>
+
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.SuggestIndexNameMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.GuessElementTypeMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.ExpectedTypeMacro"/>
+    
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.AnnotatedMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.MethodNameMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.MethodReturnTypeMacro"/>
+
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.ClassNameMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.QualifiedClassNameMacro"/>
+
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.CurrentPackageMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.RightSideTypeMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.CastToLeftSideTypeMacro"/>
+
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.IterableVariableMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.IterableComponentTypeMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.DescendantClassesEnumMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.SubtypesMacro"/>
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.TypeOfVariableMacro"/>
+
+    <liveTemplateMacro implementation="com.intellij.codeInsight.template.macro.GroovyScriptMacro"/>
+
+    <copyPastePreProcessor implementation="com.intellij.codeInsight.editorActions.StringLiteralCopyPasteProcessor"/>
+    <copyPastePostProcessor implementation="com.intellij.codeInsight.editorActions.CopyPasteFoldingProcessor"/>
+    <copyPastePostProcessor implementation="com.intellij.codeInsight.editorActions.CopyPasteReferenceProcessor"/>
+
+
+    <applicationService serviceInterface="com.intellij.codeInspection.SuppressManager"
+                        serviceImplementation="com.intellij.codeInspection.SuppressManagerImpl"/>
+
+    <declarationRangeHandler key="com.intellij.psi.PsiMethod"
+                             implementationClass="com.intellij.codeInsight.hint.MethodDeclarationRangeHandler"/>
+    <declarationRangeHandler key="com.intellij.psi.PsiClass"
+                             implementationClass="com.intellij.codeInsight.hint.ClassDeclarationRangeHandler"/>
+    <declarationRangeHandler key="com.intellij.psi.PsiClassInitializer"
+                             implementationClass="com.intellij.codeInsight.hint.ClassInitializerDeclarationRangeHandler"/>
+
+    <backspaceHandlerDelegate implementation="com.intellij.codeInsight.editorActions.JavaBackspaceHandler"/>
+
+    <usageTargetProvider implementation="com.intellij.find.findUsages.ThrowsUsageTargetProvider"/>
+
+    <liveTemplateContext implementation="com.intellij.codeInsight.template.JavaCodeContextType"/>
+    <liveTemplateContext implementation="com.intellij.codeInsight.template.JavaCommentContextType"/>
+    <liveTemplateContext implementation="com.intellij.codeInsight.template.JavaStringContextType"/>
+    <liveTemplateContext implementation="com.intellij.codeInsight.template.SmartCompletionContextType"/>
+    <projectExtension implementation="com.intellij.openapi.roots.impl.LanguageLevelProjectExtensionImpl$MyProjectExtension"/>
+    <projectExtension implementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl$MyProjectExtension"/>
+    <roots.watchedRootsProvider implementation="com.intellij.openapi.roots.impl.CompilerProjectExtensionImpl$MyWatchedRootsProvider"/>
+
+    <moduleExtension implementation="com.intellij.openapi.roots.LanguageLevelModuleExtension"/>
+    <moduleExtension implementation="com.intellij.openapi.roots.impl.CompilerModuleExtensionImpl"/>
+
+    <orderRootType implementation="com.intellij.openapi.roots.AnnotationOrderRootType"/>
+    <orderRootType implementation="com.intellij.openapi.roots.JavadocOrderRootType"/>
+
+    <highlightUsagesHandlerFactory implementation="com.intellij.codeInsight.highlighting.HighlightExceptionsHandlerFactory"/>
+    <highlightUsagesHandlerFactory implementation="com.intellij.codeInsight.highlighting.HighlightSuppressedWarningsFactory"/>
+    <highlightUsagesHandlerFactory implementation="com.intellij.codeInsight.highlighting.HighlightExitPointsHandlerFactory"/>
+    <highlightUsagesHandlerFactory implementation="com.intellij.codeInsight.highlighting.HighlightOverridingMethodsHandlerFactory"/>
+
+    <directoryIndexExcludePolicy implementation="com.intellij.openapi.roots.impl.ExcludeCompilerOutputPolicy"/>
+
+    <patternDialectProvider implementation="com.intellij.packageDependencies.ui.PackagePatternProvider" id="package" order="before file" />
+    <scopeDescriptorProvider implementation="com.intellij.ide.util.scopeChooser.HierarchyScopeDescriptorProvider"/>
+
+    <patterns.patternClass className="com.intellij.patterns.PsiJavaPatterns" alias="java"/>
+
+    <customScopesProvider implementation="com.intellij.analysis.PackagesScopesProvider"/>
+
+    <highlightErrorFilter implementation="com.intellij.codeInsight.daemon.impl.analysis.JavadocErrorFilter"/>
+    <daemon.changeLocalityDetector implementation="com.intellij.codeInsight.daemon.impl.JavaChangeLocalityDetector"/>
+
+    <liveTemplateOptionalProcessor implementation="com.intellij.codeInsight.template.impl.ShortenFQNamesProcessor"/>
+    <projectService serviceInterface="com.intellij.ide.todo.nodes.TodoTreeHelper"
+                    serviceImplementation="com.intellij.ide.todo.nodes.TodoJavaTreeHelper"/>
+
+    <createFromTemplateHandler implementation="com.intellij.ide.fileTemplates.JavaCreateFromTemplateHandler"/>
+    <defaultTemplatePropertiesProvider implementation="com.intellij.ide.fileTemplates.TemplatePackagePropertyProvider"/>
+    <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiClassFavoriteNodeProvider"/>
+    <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiFieldFavoriteNodeProvider"/>
+    <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiMethodFavoriteNodeProvider"/>
+    <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiPackageFavoriteNodeProvider"/>
+
+    <stepsBeforeRunProvider implementation="com.intellij.compiler.options.CompileStepBeforeRun" id="compileBeforeRun"/>
+    <stepsBeforeRunProvider implementation="com.intellij.packaging.impl.run.BuildArtifactsBeforeRunTaskProvider" order="after compileBeforeRun"/>
+    <programRunner id="defaultRunRunner" implementation="com.intellij.execution.impl.DefaultJavaProgramRunner"/>
+    <programRunner id="defaultDebugRunner" implementation="com.intellij.debugger.impl.GenericDebuggerRunner" order="last"/>
+
+    <configurationType implementation="com.intellij.execution.applet.AppletConfigurationType"/>
+    <configurationProducer implementation="com.intellij.execution.applet.AppletConfigurationProducer"/>
+    <configurationType implementation="com.intellij.execution.application.ApplicationConfigurationType"/>
+    <configurationType implementation="com.intellij.execution.remote.RemoteConfigurationType"/>
+
+    <applicationService serviceInterface="com.intellij.packageDependencies.DependenciesVisitorFactory"
+                        serviceImplementation="com.intellij.packageDependencies.JavaDependenciesVisitorFactory"/>
+
+
+    <internalFileTemplate name="Class"/>
+    <internalFileTemplate name="Interface"/>
+    <internalFileTemplate name="Enum"/>
+    <internalFileTemplate name="AnnotationType" subject="@interface"/>
+
+    <saveFileAsTemplateHandler implementation="com.intellij.ide.fileTemplates.SaveJavaAsTemplateHandler"/>
+
+    <refactoring.copyHandler implementation="com.intellij.refactoring.copy.JavaCopyFilesOrDirectoriesHandler"/>
+    <refactoring.copyHandler implementation="com.intellij.refactoring.copy.CopyClassesHandler"/>
+
+    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveFilesOrDirectories.JavaMoveFilesOrDirectoriesHandler" id="moveJavaFileOrDir"/>
+    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesHandlerBase"/>
+    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveMembers.MoveMembersHandler"/>
+    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodHandlerDelegate"/>
+    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveInner.MoveInnerToUpperHandler"/>
+    <refactoring.moveHandler implementation="com.intellij.refactoring.move.moveInner.MoveInnerToUpperOrMembersHandler"/>
+    <refactoring.moveHandler implementation="com.intellij.refactoring.anonymousToInner.MoveAnonymousToInnerHandler"/>
+
+    <refactoring.moveClassHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaClassHandler"/>
+    <moveFileHandler implementation="com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaFileHandler"/>
+    <refactoring.moveMemberHandler language="JAVA" implementationClass="com.intellij.refactoring.move.moveMembers.MoveJavaMemberHandler"/>
+
+    <refactoring.safeDeleteProcessor implementation="com.intellij.refactoring.safeDelete.JavaSafeDeleteProcessor" id="javaProcessor"/>
+
+    <refactoring.introduceParameterMethodUsagesProcessor implementation="com.intellij.refactoring.introduceParameter.JavaIntroduceParameterMethodUsagesProcessor"/>
+    <refactoring.changeSignatureUsageProcessor implementation="com.intellij.refactoring.changeSignature.JavaChangeSignatureUsageProcessor" id="javaProcessor"/>
+
+    <refactoring.helper implementation="com.intellij.refactoring.OptimizeImportsRefactoringHelper"/>
+
+    <projectService serviceInterface="com.intellij.ide.projectView.impl.nodes.ProjectViewDirectoryHelper"
+                    serviceImplementation="com.intellij.ide.projectView.impl.JavaProjectViewDirectoryHelper"/>
+
+    <elementDescriptionProvider implementation="com.intellij.refactoring.util.JavaRefactoringElementDescriptionProvider"/>
+    <elementDescriptionProvider implementation="com.intellij.refactoring.util.JavaNonCodeSearchElementDescriptionProvider"/>
+
+    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.JavaColorSettingsPage"/>
+
+    <scopeParserExtension implementation="com.intellij.psi.search.scope.packageSet.PatternPackageSetParserExtension"/>
+
+    <macro implementation="com.intellij.ide.macro.ClasspathEntryMacro"/>
+    <macro implementation="com.intellij.ide.macro.ClasspathMacro"/>
+    <macro implementation="com.intellij.ide.macro.FileClassMacro"/>
+    <macro implementation="com.intellij.ide.macro.FileFQPackage"/>
+    <macro implementation="com.intellij.ide.macro.FilePackageMacro"/>
+    <macro implementation="com.intellij.ide.macro.JavaDocPathMacro"/>
+    <macro implementation="com.intellij.ide.macro.OutputPathMacro"/>
+
+    <printOption implementation="com.intellij.codeEditor.printing.HyperlinksToClassesOption"/>
+    <applicationService serviceInterface="com.intellij.codeEditor.printing.FileSeparatorProvider"
+                        serviceImplementation="com.intellij.codeEditor.printing.MethodSeparatorProvider"/>
+
+    <indexPatternBuilder implementation="com.intellij.psi.impl.search.JavaIndexPatternBuilder"/>
+    <indexPatternBuilder implementation="com.intellij.psi.impl.search.JspIndexPatternBuilder"/>
+    <applicationService serviceInterface="com.intellij.codeInsight.TargetElementUtilBase"
+                        serviceImplementation="com.intellij.codeInsight.TargetElementUtil"/>
+    <gotoClassContributor implementation="com.intellij.ide.util.gotoByName.DefaultClassNavigationContributor"/>
+    <gotoSymbolContributor implementation="com.intellij.ide.util.gotoByName.DefaultSymbolNavigationContributor"/>
+    <hectorComponentProvider implementation="com.intellij.codeInsight.daemon.impl.ImportPopupHectorComponentProvider"/>
+    <scopeTreeExpander implementation="com.intellij.ide.scopeView.ClassesScopeTreeStructureExpander"/>
+    <lang.implementationTextSelectioner language="JAVA"
+                                        implementationClass="com.intellij.codeInsight.hint.JavaImplementationTextSelectioner"/>
+    <gotoDeclarationHandler implementation="com.intellij.codeInsight.navigation.actions.GotoBreakContinueHandler"/>
+    <navbar implementation="com.intellij.ide.navigationToolbar.JavaNavBarExtension"/>
+    <typeDeclarationProvider implementation="com.intellij.codeInsight.navigation.actions.JavaTypeDeclarationProvider"/>
+    <gotoTargetRendererProvider implementation="com.intellij.codeInsight.navigation.JavaGotoTargetRendererProvider"/>
+
+    <renameHandler implementation="com.intellij.refactoring.rename.DirectoryAsPackageRenameHandler"/>
+    <rename.inplace.resolveSnapshotProvider
+            language="JAVA"
+            implementationClass="com.intellij.refactoring.rename.inplace.JavaResolveSnapshotProvider"
+    />
+    <updateAddedFileProcessor implementation="com.intellij.psi.impl.file.JavaUpdateAddedFileProcessor"/>
+
+    <findUsagesHandlerFactory implementation="com.intellij.find.findUsages.JavaFindUsagesHandlerFactory" id="java"
+                              order="last, before default"/>
+    <referenceProviderType key="Class Reference Provider"
+                           implementationClass="com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceProvider"/>
+
+    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenamePsiPackageProcessor"/>
+    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenamePsiDirectoryProcessor"/>
+    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameJavaClassProcessor"/>
+    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameJavaMethodProcessor" id="javamethod"/>
+    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameJavaVariableProcessor"/>
+    <renamePsiElementProcessor implementation="com.intellij.refactoring.rename.RenameAliasingPomTargetProcessor"/>
+
+    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.AutomaticVariableRenamerFactory"/>
+    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.AutomaticParametersRenamerFactory"/>
+    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.AutomaticInheritorRenamerFactory"/>
+    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.AutomaticTestRenamerFactory"/>
+    <automaticRenamerFactory implementation="com.intellij.refactoring.rename.naming.ConstructorParameterOnFieldRenameRenamerFactory"/>
+
+    <nameSuggestionProvider implementation="com.intellij.refactoring.rename.JavaNameSuggestionProvider" id="java"/>
+
+    <vetoRenameCondition implementation="com.intellij.refactoring.rename.JavaVetoRenameCondition"/>
+
+    <readWriteAccessDetector implementation="com.intellij.codeInsight.highlighting.JavaReadWriteAccessDetector" id="java"/>
+    <elementDescriptionProvider implementation="com.intellij.codeInsight.highlighting.JavaHighlightUsagesDescriptionProvider"/>
+
+    <elementDescriptionProvider implementation="com.intellij.usageView.JavaUsageViewDescriptionProvider"/>
+
+    <elementDescriptionProvider implementation="com.intellij.ide.util.JavaDeleteTypeDescriptionProvider"/>
+
+    <fileTypeIndentOptionsProvider implementation="com.intellij.application.options.JavaIndentOptionsProvider"/>
+
+    <referenceImporter implementation="com.intellij.codeInsight.daemon.impl.JavaReferenceImporter"/>
+
+    <elementLookupRenderer implementation="com.intellij.codeInsight.lookup.impl.JavaElementLookupRenderer"/>
+
+    <qualifiedNameProvider implementation="com.intellij.ide.actions.JavaQualifiedNameProvider"/>
+
+    <fileStructureGroupRuleProvider implementation="com.intellij.usages.impl.rules.NonJavaFileGroupRuleProvider"/>
+    <fileStructureGroupRuleProvider implementation="com.intellij.usages.impl.rules.JavaClassGroupRuleProvider"/>
+    <fileStructureGroupRuleProvider implementation="com.intellij.usages.impl.rules.JavaMethodGroupRuleProvider"/>
+    <usageTypeProvider implementation="com.intellij.usages.impl.rules.JavaUsageTypeProvider"/>
+    <importFilteringRule implementation="com.intellij.usages.impl.rules.ImportFilteringRule"/>
+    <usageFilteringRuleProvider implementation="com.intellij.usages.impl.ImportUsageFilteringRuleProvider"/>
+    <applicationService serviceInterface="com.intellij.usages.impl.ImportFilteringUsageViewSetting"
+                        serviceImplementation="com.intellij.usages.impl.ImportFilteringUsageViewSetting"/>
+
+    <treeStructureProvider implementation="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider"/>
+
+    <defaultLiveTemplatesProvider implementation="com.intellij.codeInsight.template.impl.JavaDefaultLiveTemplatesProvider"/>
+
+    <codeInsight.surroundWithRangeAdjuster implementation="com.intellij.codeInsight.generation.surroundWith.XmlSurroundWithRangeAdjuster"/>
+
+
+    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaAnnotationIndex"/>
+    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaAnonymousClassBaseRefOccurenceIndex"/>
+    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaFieldNameIndex"/>
+    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex"/>
+    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaMethodNameIndex"/>
+    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaShortClassNameIndex"/>
+    <stubIndex implementation="com.intellij.psi.impl.java.stubs.index.JavaSuperClassNameOccurenceIndex"/>
+
+    <stubElementTypeHolder class="com.intellij.psi.impl.java.stubs.JavaStubElementTypes"/>
+
+
+    <dom.customAnnotationChecker implementation="com.intellij.util.xml.impl.ExtendsClassChecker"/>
+
+    <methodNavigationOffsetProvider implementation="com.intellij.codeInsight.navigation.JavaMethodNavigationOffsetProvider"/>
+
+    <filePasteProvider implementation="com.intellij.ide.JavaFilePasteProvider"/>
+
+    <testFinder implementation="com.intellij.testIntegration.JavaTestFinder"/>
+    <testCreator language="JAVA" implementationClass="com.intellij.testIntegration.JavaTestCreator"/>
+
+    <callHierarchyProvider language="JAVA" implementationClass="com.intellij.ide.hierarchy.call.JavaCallHierarchyProvider"/>
+    <methodHierarchyProvider language="JAVA" implementationClass="com.intellij.ide.hierarchy.method.JavaMethodHierarchyProvider"/>
+    <typeHierarchyProvider language="JAVA" implementationClass="com.intellij.ide.hierarchy.type.JavaTypeHierarchyProvider"/>
+
+    <optionsApplicabilityFilter implementation="com.intellij.application.options.JavaOptionsApplicabilityFilter"/>
+
+    <templateCompletionProcessor implementation="com.intellij.codeInsight.template.macro.JavaTemplateCompletionProcessor"/>
+
+    <!-- this depends on TemplateLanguageConfigurable which isn't registered in LangExtensions, so it should go here as well -->
+    <errorQuickFixProvider implementation="com.intellij.psi.templateLanguages.TemplateLanguageErrorQuickFixProvider"/>
+
+    <basicWordSelectionFilter implementation="com.intellij.codeInsight.editorActions.wordSelection.JavaBasicWordSelectionFilter"/>
+
+    <fileIconPatcher implementation="com.intellij.ide.JavaFileIconPatcher"/>
+
+    <idIndexer filetype="JAVA" implementationClass="com.intellij.psi.impl.cache.impl.idCache.JavaIdIndexer"/>
+    <todoIndexer filetype="JAVA" implementationClass="com.intellij.psi.impl.cache.impl.idCache.JavaTodoIndexer"/>
+
+    <refactoring.elementListenerProvider implementation="com.intellij.execution.impl.RunConfigurationRefactoringElementListenerProvider"/>
+
+    <bundledKeymapProvider implementation="com.intellij.openapi.keymap.JBuilderKeymapProvider"/>
+
+    <problemFileHighlightFilter implementation="com.intellij.codeInsight.problems.DefaultProblemFileHighlightFilter"/>
+
+    <problemHighlightFilter implementation="com.intellij.codeInsight.daemon.JavaProblemHighlightFilter"/>
+
+    <projectViewPane implementation="com.intellij.ide.projectView.impl.PackageViewPane"/>
+
+    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineParameterHandler"/>
+    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineToAnonymousClassHandler"/>
+    <inlineActionHandler implementation="com.intellij.refactoring.inlineSuperClass.InlineSuperClassRefactoringHandler"/>
+    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineMethodHandler"/>
+    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineLocalHandler"/>
+    <inlineActionHandler implementation="com.intellij.refactoring.inline.InlineConstantFieldHandler"/>
+
+    <previewHintProvider implementation="com.intellij.codeInsight.preview.JavaPreviewHintProvider"/>
+    <filePropertyPusher implementation="com.intellij.openapi.roots.impl.JavaLanguageLevelPusher"/>
+
+    <psiViewerExtension implementation="com.intellij.internal.psiView.PsiViewerMethodExtension"/>
+    <psiViewerExtension implementation="com.intellij.internal.psiView.PsiViewerCodeFragmentExtension"/>
+    <psiViewerExtension implementation="com.intellij.internal.psiView.PsiViewerExpressionExtension"/>
+
+    <applicationService serviceInterface="com.intellij.profile.codeInspection.InspectionProfileManager"
+                        serviceImplementation="com.intellij.profile.codeInspection.JavaAwareInspectionProfileManager"/>
+    <exportable serviceInterface="com.intellij.profile.codeInspection.InspectionProfileManager"/>
+    <schemeOwner serviceInterface="com.intellij.profile.codeInspection.InspectionProfileManager"/>
+
+    <resolveScopeEnlarger implementation="com.intellij.psi.NonClasspathResolveScopeEnlarger"/>
+
+    <xmlRpcHandler name="fileOpener" implementation="com.intellij.ide.OpenFileXmlRpcHandler"/>
+  </extensions>
+
+  <xi:include href="/META-INF/xdebugger.xml" xpointer="xpointer(/root/*)"/>
+  <extensions defaultExtensionNs="com.intellij">
+    <xdebugger.debuggerSupport implementation="com.intellij.debugger.ui.JavaDebuggerSupport"/>
+  </extensions>
+
+  <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/RegExpPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/ImagesPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+</idea-plugin>