depend on sandbox iso ide

gero3 · May 17, 2012 · 533b492 · 533b492
1 parent 22cd1d8
commit 533b492
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/plugins-server/cloud9.run.node-debug/node_debug.js b/plugins-server/cloud9.run.node-debug/node_debug.js
@@ -10,17 +10,22 @@ var NodeDebugProxy = require("./nodedebugproxy");
 
 var exports = module.exports = function setup(options, imports, register) {
     var pm = imports["process-manager"];
-    var ide = imports.ide.getServer();
     var vfs = imports.vfs;
 
-    pm.addRunner("node-debug", exports.factory(vfs, ide));
+    imports.sandbox.getProjectDir(function(err, projectDir) {
+        if (err)
+            return register(err);
 
-    register(null, {
-        "run-node-debug": {}
+        pm.addRunner("node-debug", exports.factory(vfs, projectDir));
+
+        register(null, {
+            "run-node-debug": {}
+        });
     });
+
 };
 
-exports.factory = function(vfs, ide) {
+exports.factory = function(vfs, workspaceDir) {
     return function(args, eventEmitter, eventName) {
         var cwd = args.cwd || ide.workspaceDir;
         return new Runner(vfs, {

diff --git a/plugins-server/cloud9.run.node-debug/package.json b/plugins-server/cloud9.run.node-debug/package.json
@@ -16,7 +16,7 @@
         "consumes": [
             "process-manager",
             "vfs",
-            "ide"
+            "sandbox"
         ]
     }
 }
diff --git a/plugins-server/cloud9.run.node/node.js b/plugins-server/cloud9.run.node/node.js
@@ -9,19 +9,23 @@ var ShellRunner = require("../cloud9.run.shell/shell").Runner;
 
 var exports = module.exports = function setup(options, imports, register) {
     var pm = imports["process-manager"];
-    var ide = imports.ide.getServer();
     var vfs = imports.vfs;
 
-    pm.addRunner("node", exports.factory(vfs, ide));
+    imports.sandbox.getProjectDir(function(err, projectDir) {
+        if (err)
+            return register(err);
 
-    register(null, {
-        "run-node": {}
+        pm.addRunner("node", exports.factory(vfs, projectDir));
+
+        register(null, {
+            "run-node": {}
+        });
     });
 };
 
-exports.factory = function(vfs, ide) {
+exports.factory = function(vfs, workspaceDir) {
     return function(args, eventEmitter, eventName) {
-        var cwd = args.cwd || ide.workspaceDir;
+        var cwd = args.cwd || workspaceDir;
 
         return new Runner(vfs, {
             file: args.file,

diff --git a/plugins-server/cloud9.run.node/package.json b/plugins-server/cloud9.run.node/package.json
@@ -12,7 +12,7 @@
         "consumes": [
             "process-manager",
             "vfs",
-            "ide"
+            "sandbox"
         ]
     }
 }