From 04f5acfe5c4a5e4490f73f5418935aecb91fd44f Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Mon, 5 Nov 2012 01:13:35 +0100
Subject: [PATCH] remote-sdk-api moved to the platform (python plugin should
 work now) remote-sdk-impl renamed to remote-run.

---
 python/build/pycharm_build.gant                        |  6 +++---
 python/build/python_plugin_build.gant                  |  2 +-
 python/pluginSrc/META-INF/plugin.xml                   |  2 +-
 python/python-ide.iml                                  |  1 -
 python/python-tests.iml                                |  1 -
 python/python.iml                                      |  1 -
 .../jetbrains/python/console/PydevConsoleRunner.java   | 10 ++--------
 .../com/jetbrains/python/debugger/PyDebugProcess.java  |  2 +-
 .../python/packaging/PyPackageManagerImpl.java         |  7 +++----
 .../python/remote/PyRemoteSdkAdditionalData.java       |  4 ++--
 .../python/remote/PythonRemoteInterpreterManager.java  |  6 +++---
 .../jetbrains/python/run/PythonCommandLineState.java   |  5 ++---
 .../jetbrains/python/sdk/CreateVirtualEnvDialog.java   |  2 +-
 .../com/jetbrains/python/sdk/PyRemoteSdkFlavor.java    |  2 +-
 python/src/com/jetbrains/python/sdk/PySdkUtil.java     |  2 +-
 python/src/com/jetbrains/python/sdk/PythonSdkType.java |  2 +-
 16 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 0d30e21c6b32..52d33f276223 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -38,7 +38,7 @@ setProperty("pluginFilter", [   //modules to compile
             "database-impl", "DatabaseSupport",
             "sql",
             "coffeescript",
-            "remote-sdk-impl",
+            "remote-run",
             "python-remote-interpreter",
             "diagram-api", "uml",
             "python-uml", "localization",
@@ -54,7 +54,7 @@ private List<String> pycharmPlatformApiModules() {
 
 
 private List pycharmImplementationModules() {   //modules to put into pycharm.jar
-  return ["yaml", "graph", "coverage-common", "python", "python-ide", "python-openapi", "python-psi-api", "remote-sdk-api"]
+  return ["yaml", "graph", "coverage-common", "python", "python-ide", "python-openapi", "python-psi-api"]
 }
 
 class Paths {
@@ -179,7 +179,7 @@ private layoutPlugins() {
   dir("plugins") {
     layouts.layoutPlugin("django-db-config")
     layouts.layoutPlugin("python-javascript-debugger")
-    layouts.layoutPlugin("remote-sdk-impl")
+    layouts.layoutPlugin("remote-run")
     layouts.layoutPlugin("python-remote-interpreter")
     layouts.layoutPlugin("python-uml")
     layouts.layoutPlugin("localization")
diff --git a/python/build/python_plugin_build.gant b/python/build/python_plugin_build.gant
index e2acaccb4afd..f028d81e7161 100644
--- a/python/build/python_plugin_build.gant
+++ b/python/build/python_plugin_build.gant
@@ -82,7 +82,7 @@ target(name: "compile", description: "Compile module python") {
     dirset(dir: "${pluginHome}/../ultimate/ultimate-verifier") {
       include(name: "src")
     }
-    dirset(dir: "${pluginHome}/../plugins/remote-sdk-api") {
+    dirset(dir: "${pluginHome}/../plugins/remote-run") {
       include(name: "src")
     }
   }
diff --git a/python/pluginSrc/META-INF/plugin.xml b/python/pluginSrc/META-INF/plugin.xml
index 80d727fb8011..a5d2b52fd62c 100644
--- a/python/pluginSrc/META-INF/plugin.xml
+++ b/python/pluginSrc/META-INF/plugin.xml
@@ -11,7 +11,7 @@
   <depends>com.intellij.modules.java</depends>
   <depends>Coverage</depends>
   <depends>org.jetbrains.plugins.yaml</depends>
-  <depends>org.jetbrains.plugins.python-remote-interpreter</depends>
+  <depends optional="true">org.jetbrains.plugins.python-remote-interpreter</depends>
 
 
   <vendor url="http://www.jetbrains.com/pycharm/" logo="/com/jetbrains/python/python.png">JetBrains, Keith Lea</vendor>
diff --git a/python/python-ide.iml b/python/python-ide.iml
index dae2f6f5d82c..08470fc95b07 100644
--- a/python/python-ide.iml
+++ b/python/python-ide.iml
@@ -22,7 +22,6 @@
     <orderEntry type="module" module-name="xml" />
     <orderEntry type="module" module-name="relaxng" scope="RUNTIME" />
     <orderEntry type="library" name="XmlRPC" level="project" />
-    <orderEntry type="module" module-name="remote-sdk-api" />
   </component>
 </module>
 
diff --git a/python/python-tests.iml b/python/python-tests.iml
index 6e5e05ec6d6c..a50bd7957267 100644
--- a/python/python-tests.iml
+++ b/python/python-tests.iml
@@ -23,7 +23,6 @@
     <orderEntry type="module" module-name="relaxng" scope="RUNTIME" />
     <orderEntry type="library" name="Velocity" level="project" />
     <orderEntry type="module" module-name="python-helpers" scope="RUNTIME" />
-    <orderEntry type="module" module-name="remote-sdk-api" scope="TEST" />
   </component>
 </module>
 
diff --git a/python/python.iml b/python/python.iml
index 6ab1c023abe7..e1a273bae6d0 100644
--- a/python/python.iml
+++ b/python/python.iml
@@ -37,7 +37,6 @@
     <orderEntry type="module" module-name="ChromeConnector" />
     <orderEntry type="module" module-name="FirefoxConnector" />
     <orderEntry type="module" module-name="python-openapi" exported="" />
-    <orderEntry type="module" module-name="remote-sdk-api" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
index 2cecb76e6fc5..f6b47daa330e 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
@@ -42,9 +42,8 @@ import com.intellij.util.IJSwingUtilities;
 import com.intellij.util.net.NetUtils;
 import com.intellij.util.ui.UIUtil;
 import com.jetbrains.django.run.Runner;
-import com.jetbrains.plugins.remotesdk.RemoteInterpreterException;
-import com.jetbrains.plugins.remotesdk.RemoteSdkData;
-import com.jetbrains.plugins.remotesdk.RemoteSshProcess;
+import com.intellij.remotesdk.RemoteSdkData;
+import com.intellij.remotesdk.RemoteSshProcess;
 import com.jetbrains.python.PythonHelpersLocator;
 import com.jetbrains.python.console.completion.PydevConsoleElement;
 import com.jetbrains.python.console.parsing.PythonConsoleData;
@@ -224,13 +223,8 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
     if (PySdkUtil.isRemote(mySdk)) {
       PythonRemoteInterpreterManager manager = PythonRemoteInterpreterManager.getInstance();
       if (manager != null) {
-        try {
           return createRemoteConsoleProcess(manager, myCommandLineArgumentsProvider.getArguments(),
                                             myCommandLineArgumentsProvider.getAdditionalEnvs());
-        }
-        catch (final RemoteInterpreterException e) {
-          throw new ExecutionException(e.getMessage(), e);
-        }
       }
       throw new PythonRemoteInterpreterManager.PyRemoteInterpreterExecutionException();
     }
diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
index 7164ee84fa63..397bd7bd5be8 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
@@ -26,7 +26,7 @@ import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.frame.XValueChildrenList;
 import com.intellij.xdebugger.stepping.XSmartStepIntoHandler;
 import com.jetbrains.django.util.DjangoUtil;
-import com.jetbrains.plugins.remotesdk.RemoteProcessHandlerBase;
+import com.intellij.remotesdk.RemoteProcessHandlerBase;
 import com.jetbrains.python.console.pydev.PydevCompletionVariant;
 import com.jetbrains.python.debugger.django.DjangoExceptionBreakpointHandler;
 import com.jetbrains.python.debugger.pydev.*;
diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
index f51c7e7a338f..d419cb7c502e 100644
--- a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
+++ b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
@@ -35,9 +35,8 @@ import com.intellij.util.Function;
 import com.intellij.util.SystemProperties;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.net.HttpConfigurable;
-import com.jetbrains.plugins.remotesdk.RemoteFile;
-import com.jetbrains.plugins.remotesdk.RemoteInterpreterException;
-import com.jetbrains.plugins.remotesdk.RemoteSdkData;
+import com.intellij.remotesdk.RemoteFile;
+import com.intellij.remotesdk.RemoteSdkData;
 import com.jetbrains.python.PythonHelpersLocator;
 import com.jetbrains.python.psi.LanguageLevel;
 import com.jetbrains.python.psi.PyExpression;
@@ -651,7 +650,7 @@ public class PyPackageManagerImpl extends PyPackageManager {
           while (true);
           return processOutput;
         }
-        catch (RemoteInterpreterException e) {
+        catch (ExecutionException e) {
           throw new PyExternalProcessException(ERROR_INVALID_SDK, helperPath, args, "Error running SDK: " + e.getMessage(), e);
         }
       }
diff --git a/python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalData.java b/python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalData.java
index af46e41df606..ef79e923be18 100644
--- a/python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalData.java
+++ b/python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalData.java
@@ -2,8 +2,8 @@ package com.jetbrains.python.remote;
 
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.text.StringUtil;
-import com.jetbrains.plugins.remotesdk.RemoteSdkAdditionalData;
-import com.jetbrains.plugins.remotesdk.RemoteSdkDataHolder;
+import com.intellij.remotesdk.RemoteSdkAdditionalData;
+import com.intellij.remotesdk.RemoteSdkDataHolder;
 import com.jetbrains.python.sdk.PythonSdkAdditionalData;
 import com.jetbrains.python.sdk.PythonSdkFlavor;
 import com.jetbrains.python.sdk.UnixPythonSdkFlavor;
diff --git a/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java b/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java
index 725f26d31fd4..c80341483d68 100644
--- a/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java
+++ b/python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java
@@ -11,9 +11,9 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkModificator;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.plugins.remotesdk.RemoteInterpreterException;
-import com.jetbrains.plugins.remotesdk.RemoteSdkData;
-import com.jetbrains.plugins.remotesdk.RemoteSshProcess;
+import com.intellij.remotesdk.RemoteInterpreterException;
+import com.intellij.remotesdk.RemoteSdkData;
+import com.intellij.remotesdk.RemoteSshProcess;
 import com.jetbrains.python.PythonHelpersLocator;
 import com.intellij.util.PathMappingSettings;
 import com.jetbrains.python.remote.ui.RemoteProjectSettings;
diff --git a/python/src/com/jetbrains/python/run/PythonCommandLineState.java b/python/src/com/jetbrains/python/run/PythonCommandLineState.java
index f24f6a0ba680..d3f38d21ac3c 100644
--- a/python/src/com/jetbrains/python/run/PythonCommandLineState.java
+++ b/python/src/com/jetbrains/python/run/PythonCommandLineState.java
@@ -29,7 +29,6 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.HashMap;
-import com.jetbrains.plugins.remotesdk.RemoteInterpreterException;
 import com.jetbrains.python.console.PyDebugConsoleBuilder;
 import com.jetbrains.python.debugger.PyDebugRunner;
 import com.jetbrains.python.debugger.PyDebuggerSettings;
@@ -178,7 +177,7 @@ public abstract class PythonCommandLineState extends CommandLineState {
           processHandler = doStartRemoteProcess(sdk, commandLine, manager);
           break;
         }
-        catch (RemoteInterpreterException e) {
+        catch (ExecutionException e) {
           if (Messages.showYesNoDialog(e.getMessage() + "\nTry again?", "Can't Run Remote Interpreter", Messages.getErrorIcon()) ==
               Messages.NO) {
             throw new ExecutionException("Can't run remote python interpreter: " + e.getMessage());
@@ -194,7 +193,7 @@ public abstract class PythonCommandLineState extends CommandLineState {
   }
 
   protected ProcessHandler doStartRemoteProcess(Sdk sdk, GeneralCommandLine commandLine, PythonRemoteInterpreterManager manager)
-    throws RemoteInterpreterException {
+    throws ExecutionException {
 
     return manager.startRemoteProcess(myConfig.getProject(), (PyRemoteSdkAdditionalData)sdk.getSdkAdditionalData(), commandLine,
                                       myConfig.getMappingSettings());
diff --git a/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java b/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java
index 4f8924315b40..a21645d0dcd4 100644
--- a/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java
+++ b/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java
@@ -12,7 +12,7 @@ import com.intellij.ui.CollectionComboBoxModel;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.components.JBCheckBox;
 import com.intellij.util.PathUtil;
-import com.jetbrains.plugins.remotesdk.RemoteSdkDataHolder;
+import com.intellij.remotesdk.RemoteSdkDataHolder;
 import com.jetbrains.python.packaging.PyPackageService;
 import com.jetbrains.python.ui.IdeaDialog;
 
diff --git a/python/src/com/jetbrains/python/sdk/PyRemoteSdkFlavor.java b/python/src/com/jetbrains/python/sdk/PyRemoteSdkFlavor.java
index a244a735de5f..364555c42fb9 100644
--- a/python/src/com/jetbrains/python/sdk/PyRemoteSdkFlavor.java
+++ b/python/src/com/jetbrains/python/sdk/PyRemoteSdkFlavor.java
@@ -2,7 +2,7 @@ package com.jetbrains.python.sdk;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.util.text.StringUtil;
-import com.jetbrains.plugins.remotesdk.RemoteFile;
+import com.intellij.remotesdk.RemoteFile;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
diff --git a/python/src/com/jetbrains/python/sdk/PySdkUtil.java b/python/src/com/jetbrains/python/sdk/PySdkUtil.java
index 6170adaf176f..be3e1902344f 100644
--- a/python/src/com/jetbrains/python/sdk/PySdkUtil.java
+++ b/python/src/com/jetbrains/python/sdk/PySdkUtil.java
@@ -8,7 +8,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.HashMap;
-import com.jetbrains.plugins.remotesdk.RemoteSdkData;
+import com.intellij.remotesdk.RemoteSdkData;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkType.java b/python/src/com/jetbrains/python/sdk/PythonSdkType.java
index 4ab5f3b6ecb4..0653b98c5296 100644
--- a/python/src/com/jetbrains/python/sdk/PythonSdkType.java
+++ b/python/src/com/jetbrains/python/sdk/PythonSdkType.java
@@ -36,7 +36,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.SmartList;
-import com.jetbrains.plugins.remotesdk.RemoteSdkDataHolder;
+import com.intellij.remotesdk.RemoteSdkDataHolder;
 import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.PyNames;
 import com.jetbrains.python.PythonFileType;