From d54f4f097352eec90f878a8aa7903351d3ffc0c8 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Wed, 16 Jan 2013 13:54:40 +0100
Subject: [PATCH] Added SSH Console for remote interpreter.

---
 python/build/pycharm_build.gant                    | 14 +++++++++-----
 .../python/remote/PyRemoteSdkAdditionalData.java   |  6 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index cf587c4c9855..e79ce5e2e7ca 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -152,7 +152,11 @@ private layoutPlugins(layouts) {
   dir("plugins") {
     layouts.layoutPlugin("django-db-config")
     layouts.layoutPlugin("python-javascript-debugger")
-    layouts.layoutPlugin("remote-run")
+    layouts.layoutPlugin("remote-run") {
+      fileset(dir: "$home/plugins/remote-run/lib") {
+        include(name: "jediterm-0.2.jar")
+      }
+    }
     layouts.layoutPlugin("python-remote-interpreter")
     layouts.layoutPlugin("vagrant") {
       fileset(dir: "$home/plugins/vagrant/lib") {
@@ -214,11 +218,11 @@ private layoutFull(Map args, String target, Set usedJars) {
       }
 
       jar("openapi.jar") {
-        openapiModules.each { module it}
+        openapiModules.each { module it }
       }
 
-      jar("annotations.jar") { module("annotations")}
-      jar("extensions.jar") { module("extensions")}
+      jar("annotations.jar") { module("annotations") }
+      jar("extensions.jar") { module("extensions") }
 
       jar("pycharm.jar") {
         implementationModules.each {
@@ -236,7 +240,7 @@ private layoutFull(Map args, String target, Set usedJars) {
         module("python-pydev")
       }
 
-      jar("bootstrap.jar") { module("bootstrap")}
+      jar("bootstrap.jar") { module("bootstrap") }
       jar("resources.jar") {
         module("platform-resources")
         module("colorSchemes")
diff --git a/python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalData.java b/python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalData.java
index effa53e5662a..2a401f6186ee 100644
--- a/python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalData.java
+++ b/python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalData.java
@@ -229,9 +229,9 @@ public final class PyRemoteSdkAdditionalData extends PythonSdkAdditionalData imp
     if (element != null) {
       data.myRemoteSdkDataHolder.loadRemoteSdkData(element);
       data.setSkeletonsPath(StringUtil.nullize(element.getAttributeValue(SKELETONS_PATH)));
-      String helpers_path = StringUtil.nullize(element.getAttributeValue("PYCHARM_HELPERS_PATH"));
-      if (helpers_path != null) {
-        data.setHelpersPath(helpers_path);
+      String helpersPath = StringUtil.nullize(element.getAttributeValue("PYCHARM_HELPERS_PATH"));
+      if (helpersPath != null) {
+        data.setHelpersPath(helpersPath);
       }
     }