diff options
Diffstat (limited to 'platform/platform-resources/src/META-INF')
6 files changed, 11 insertions, 5 deletions
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml index dcdc0e2d983c..2e2e0c80bb17 100644 --- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml @@ -385,7 +385,8 @@ interface="com.intellij.execution.configurations.ConfigurationType"/> <extensionPoint name="runConfigurationsSettings" - interface="com.intellij.execution.configurations.RunConfigurationsSettings"/> + interface="com.intellij.execution.configurations.RunConfigurationsSettings" + area="IDEA_PROJECT"/> <extensionPoint name="programRunner" interface="com.intellij.execution.runners.ProgramRunner"/> diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml index baea70a67c7a..00bd38430d68 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml @@ -10,7 +10,7 @@ interface="com.intellij.openapi.startup.StartupActivity"/> <extensionPoint name="defaultProjectTypeProvider" - interface="com.intellij.openapi.project.DefaultProjectTypeProvider"/> + beanClass="com.intellij.openapi.project.DefaultProjectTypeEP"/> <extensionPoint name="errorHandler" interface="com.intellij.openapi.diagnostic.ErrorReportSubmitter"/> diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 51028d93edac..29dcf0645cef 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -151,6 +151,9 @@ <applicationService serviceImplementation="com.intellij.internal.statistic.UsageTrigger"/> + <applicationService serviceInterface="com.intellij.openapi.application.PathMacros" + serviceImplementation="com.intellij.application.options.PathMacrosImpl"/> + <projectService serviceInterface="com.intellij.openapi.vfs.ReadonlyStatusHandler" serviceImplementation="com.intellij.openapi.vcs.readOnlyHandler.ReadonlyStatusHandlerImpl"/> <projectService serviceInterface="com.intellij.openapi.startup.StartupManager" diff --git a/platform/platform-resources/src/META-INF/VcsExtensions.xml b/platform/platform-resources/src/META-INF/VcsExtensions.xml index 2322381c3b89..37fddfafbead 100644 --- a/platform/platform-resources/src/META-INF/VcsExtensions.xml +++ b/platform/platform-resources/src/META-INF/VcsExtensions.xml @@ -25,7 +25,8 @@ <selectInTarget implementation="com.intellij.openapi.vcs.changes.SelectInChangesViewTarget"/> - <projectConfigurable groupId="project" groupWeight="110" dynamic="true" key="version.control.main.configurable.name" bundle="messages.VcsBundle" instance="com.intellij.openapi.vcs.configurable.VcsManagerConfigurable" id="vcs"/> + <projectConfigurable groupId="root" groupWeight="45" dynamic="true" key="version.control.main.configurable.name" bundle="messages.VcsBundle" + provider="com.intellij.openapi.vcs.configurable.VcsManagerConfigurableProvider" id="vcs"/> <changesViewContent tabName="Repository" className="com.intellij.openapi.vcs.changes.committed.CommittedChangesViewManager" predicateClassName="com.intellij.openapi.vcs.changes.committed.CommittedChangesVisibilityPredicate"/> diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml index 566d674d0063..b6653d81eec7 100644 --- a/platform/platform-resources/src/META-INF/XmlPlugin.xml +++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml @@ -548,7 +548,7 @@ </extensions> <extensions defaultExtensionNs="org.jetbrains"> <urlOpener implementation="com.intellij.ide.browsers.impl.DefaultUrlOpener" order="last"/> - <webServerPathHandler implementation="org.jetbrains.builtInWebServer.DefaultWebServerPathHandler"/> + <webServerPathHandler implementation="org.jetbrains.builtInWebServer.DefaultWebServerPathHandler" order="last"/> <webServerFileHandler implementation="org.jetbrains.builtInWebServer.BuiltInWebServer$StaticFileHandler" order="last"/> <webServerRootsProvider implementation="org.jetbrains.builtInWebServer.DefaultWebServerRootsProvider"/> </extensions> diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml index d28921d17ba6..821cb528b6a9 100644 --- a/platform/platform-resources/src/META-INF/xdebugger.xml +++ b/platform/platform-resources/src/META-INF/xdebugger.xml @@ -30,7 +30,8 @@ <projectService serviceInterface="com.intellij.xdebugger.impl.XDebuggerHistoryManager" serviceImplementation="com.intellij.xdebugger.impl.XDebuggerHistoryManager"/> - <applicationConfigurable groupId="build" dynamic="true" key="debugger.configurable.display.name" bundle="messages.XDebuggerBundle" instance="com.intellij.xdebugger.impl.settings.DebuggerConfigurable"/> + <applicationConfigurable groupId="build" dynamic="true" key="debugger.configurable.display.name" bundle="messages.XDebuggerBundle" + provider="com.intellij.xdebugger.impl.settings.DebuggerConfigurableProvider"/> <customizableActionGroupProvider implementation="com.intellij.xdebugger.impl.ui.XDebugTabCustomizableActionGroupProvider"/> |