From 9fd3aa02bfa9f0675e5a99d3d36026c71d8d9836 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Fri, 4 Sep 2009 16:40:03 +0400
Subject: [PATCH] move registration of CVS services to appropriate place

---
 .../platform-resources/src/META-INF/PlatformExtensions.xml  | 6 ------
 plugins/cvs/cvs-plugin/src/META-INF/plugin.xml              | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index 49ba268cf4d9..5afbb366576b 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -156,12 +156,6 @@
                       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"/>
-  <applicationService serviceInterface="com.intellij.cvsSupport2.connections.ssh.SshConnectionPool"
-                      serviceImplementation="com.intellij.cvsSupport2.connections.ssh.SshConnectionPool"/>
-  <applicationService serviceInterface="com.intellij.cvsSupport2.connections.ssh.EmptyPool"
-                      serviceImplementation="com.intellij.cvsSupport2.connections.ssh.EmptyPool"/>
-  <applicationService serviceInterface="com.intellij.cvsSupport2.connections.ssh.SocksAuthenticatorManager"
-                      serviceImplementation="com.intellij.cvsSupport2.connections.ssh.SocksAuthenticatorManager"/>
 
   <fileEditorProvider implementation="com.intellij.openapi.fileEditor.impl.http.HttpFileEditorProvider"/>
   <componentConfigurationMerger implementation="com.intellij.openapi.vcs.changes.shelf.ShelfManagerConfigurationMerger"/>
diff --git a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
index 08231dc23108..2c26915575b8 100644
--- a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
+++ b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
@@ -23,6 +23,12 @@
                    serviceImplementation="com.intellij.cvsSupport2.connections.ssh.SSHPasswordProviderImpl"/>
     <applicationService serviceInterface="com.intellij.cvsSupport2.config.ImportConfiguration"
                    serviceImplementation="com.intellij.cvsSupport2.config.ImportConfiguration"/>
+    <applicationService serviceInterface="com.intellij.cvsSupport2.connections.ssh.SshConnectionPool"
+                        serviceImplementation="com.intellij.cvsSupport2.connections.ssh.SshConnectionPool"/>
+    <applicationService serviceInterface="com.intellij.cvsSupport2.connections.ssh.EmptyPool"
+                        serviceImplementation="com.intellij.cvsSupport2.connections.ssh.EmptyPool"/>
+    <applicationService serviceInterface="com.intellij.cvsSupport2.connections.ssh.SocksAuthenticatorManager"
+                        serviceImplementation="com.intellij.cvsSupport2.connections.ssh.SocksAuthenticatorManager"/>
 
     <projectService serviceInterface="com.intellij.cvsSupport2.ui.CvsTabbedWindow"
                serviceImplementation="com.intellij.cvsSupport2.ui.CvsTabbedWindow"/>