From beaf3acbd3193030e9f871e5171f14bc051a672f Mon Sep 17 00:00:00 2001
From: Jan Steemann <jan@arangodb.com>
Date: Tue, 6 Oct 2015 11:58:23 +0200
Subject: [PATCH] simplifications

---
 js/common/bootstrap/modules.js | 16 ----------------
 js/server/upgrade-database.js  |  8 ++++----
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/js/common/bootstrap/modules.js b/js/common/bootstrap/modules.js
index 3c402ee269..53a611dec8 100644
--- a/js/common/bootstrap/modules.js
+++ b/js/common/bootstrap/modules.js
@@ -609,22 +609,6 @@ Module._extensions['.coffee'] = function(module, filename) {
   module._compile(cs.compile(stripBOM(content), {bare: true}), filename);
 };
 
-// backwards compatibility
-Module._oldAppPath = function () {
-  if (internal.appPath === undefined) {
-    return undefined;
-  }
-  return fs.join(internal.appPath, 'databases', internal.db._name());
-};
-
-// backwards compatibility
-Module._devAppPath = function () {
-  if (internal.devAppPath === undefined) {
-    return undefined;
-  }
-  return fs.join(internal.devAppPath, 'databases', internal.db._name());
-};
-
 // backwards compatibility
 Module.Module = Module;
 
diff --git a/js/server/upgrade-database.js b/js/server/upgrade-database.js
index 888251b314..e5f95f6d19 100644
--- a/js/server/upgrade-database.js
+++ b/js/server/upgrade-database.js
@@ -39,8 +39,8 @@
   var internal = require("internal");
   var fs = require("fs");
   var console = require("console");
-  var Module = require('module');
   var userManager = require("org/arangodb/users");
+  var FoxxService = require("org/arangodb/foxx/service");
   require("org/arangodb/cluster"); // TODO Is this unused or magic?
   var currentVersion = require("org/arangodb/database-version").CURRENT_VERSION;
   var sprintf = internal.sprintf;
@@ -1324,7 +1324,7 @@
         var appsToZip = aal.byExample({type: "app", isSystem: false});
         while (appsToZip.hasNext()) {
           tmp = appsToZip.next();
-          path = fs.join(Module._oldAppPath(), tmp.path);
+          path = fs.join(FoxxService._oldAppPath, tmp.path);
           try {
             mapAppZip[tmp.app] = fmUtils.zipDirectory(path);
           } catch (e) {
@@ -1334,7 +1334,7 @@
 
         // 2. If development mode, Zip all development APPs and create a map name => zipFile
         
-        var devPath = Module._devAppPath();
+        var devPath = FoxxService._devAppPath;
         var mapDevAppZip = {};
         var i;
         if (devPath !== undefined) {
@@ -1354,7 +1354,7 @@
         // 3. Remove old appPath
 
         try {
-          fs.removeDirectoryRecursive(Module._oldAppPath(), true);
+          fs.removeDirectoryRecursive(FoxxService._oldAppPath, true);
         } catch(e) {
         }