Update the resource URI for PMkit

11 files changed, 15 insertions, 15 deletions

diff --git a/b2g/simulator/bootstrap.js b/b2g/simulator/bootstrap.js
index b0273ab77..dee096e79 100644
--- a/b2g/simulator/bootstrap.js
+++ b/b2g/simulator/bootstrap.js
@@ -28,7 +28,7 @@ function startup(data, reason) {
   let uri = registerAddonResourceHandler(data);
 
   let loaderModule =
-    Cu.import('resource://gre/modules/jetpack/toolkit/loader.js').Loader;
+    Cu.import('resource://gre/modules/commonjs/toolkit/loader.js').Loader;
   let { Loader, Require, Main } = loaderModule;
 
   const { ConsoleAPI } = Cu.import("resource://gre/modules/devtools/Console.jsm");
@@ -36,7 +36,7 @@ function startup(data, reason) {
   let loader = Loader({
     paths: {
       "./": uri + "lib/",
-      "": "resource://gre/modules/jetpack/"
+      "": "resource://gre/modules/commonjs/"
     },
     globals: {
       console: new ConsoleAPI({
diff --git a/testing/mochitest/jetpack-package-harness.js b/testing/mochitest/jetpack-package-harness.js
index 392d02ee8..fff9f8537 100644
--- a/testing/mochitest/jetpack-package-harness.js
+++ b/testing/mochitest/jetpack-package-harness.js
@@ -167,7 +167,7 @@ function testInit() {
       setPrefs("extensions." + TEST_ID + ".sdk", options);
 
       // Override the SDK modules if necessary
-      let sdkpath = "resource://gre/modules/jetpack/";
+      let sdkpath = "resource://gre/modules/commonjs/";
       try {
         let sdklibs = Services.prefs.getCharPref("extensions.sdk.path");
         // sdkpath is a file path, make it a URI and map a resource URI to it
diff --git a/toolkit/commonjs/bootstrap.js b/toolkit/commonjs/bootstrap.js
index 030e1100b..b37ea853b 100644
--- a/toolkit/commonjs/bootstrap.js
+++ b/toolkit/commonjs/bootstrap.js
@@ -128,7 +128,7 @@ function startup(data, reasonCode) {
       // Relative modules resolve to add-on package lib
       './': prefixURI + name + '/lib/',
       './tests/': prefixURI + name + '/tests/',
-      '': 'resource://gre/modules/jetpack/'
+      '': 'resource://gre/modules/commonjs/'
     };
 
     // Maps addon lib and tests ressource folders for each package
@@ -196,7 +196,7 @@ function startup(data, reasonCode) {
 
     // Import `cuddlefish.js` module using a Sandbox and bootstrap loader.
     let cuddlefishPath = 'loader/cuddlefish.js';
-    let cuddlefishURI = 'resource://gre/modules/jetpack/sdk/' + cuddlefishPath;
+    let cuddlefishURI = 'resource://gre/modules/commonjs/sdk/' + cuddlefishPath;
     if (paths['sdk/']) { // sdk folder has been overloaded
                          // (from pref, or cuddlefish is still in the xpi)
       cuddlefishURI = paths['sdk/'] + cuddlefishPath;
diff --git a/toolkit/commonjs/framescript/LoaderHelper.jsm b/toolkit/commonjs/framescript/LoaderHelper.jsm
index 3ec94e5c5..baf60f693 100644
--- a/toolkit/commonjs/framescript/LoaderHelper.jsm
+++ b/toolkit/commonjs/framescript/LoaderHelper.jsm
@@ -4,7 +4,7 @@
 "use strict";
 
 const { utils: Cu, classes: Cc, interfaces: Ci } = Components;
-const { Loader } = Cu.import('resource://gre/modules/jetpack/toolkit/loader.js', {});
+const { Loader } = Cu.import('resource://gre/modules/commonjs/toolkit/loader.js', {});
 const cpmm = Cc['@mozilla.org/childprocessmessagemanager;1'].getService(Ci.nsISyncMessageSender);
 
 // one Loader instance per addon (per @loader/options to be precise)
diff --git a/toolkit/commonjs/sdk/addon/bootstrap.js b/toolkit/commonjs/sdk/addon/bootstrap.js
index 0e5f3dab7..ab4741fe7 100644
--- a/toolkit/commonjs/sdk/addon/bootstrap.js
+++ b/toolkit/commonjs/sdk/addon/bootstrap.js
@@ -111,7 +111,7 @@ Bootstrap.prototype = {
         rootURI: baseURI,
         name: metadata.name,
         paths: Object.assign({
-          "": "resource://gre/modules/jetpack/",
+          "": "resource://gre/modules/commonjs/",
           "devtools/": "resource://gre/modules/devtools/",
           "./": baseURI
         }, readPaths(id)),
diff --git a/toolkit/commonjs/sdk/io/buffer.js b/toolkit/commonjs/sdk/io/buffer.js
index c5f4770ac..77a480597 100644
--- a/toolkit/commonjs/sdk/io/buffer.js
+++ b/toolkit/commonjs/sdk/io/buffer.js
@@ -19,7 +19,7 @@ module.metadata = {
 
 const { Cu } = require('chrome');
 const { isNumber } = require('sdk/lang/type');
-const { TextEncoder, TextDecoder } = Cu.import('resource://gre/modules/jetpack/toolkit/loader.js', {});
+const { TextEncoder, TextDecoder } = Cu.import('resource://gre/modules/commonjs/toolkit/loader.js', {});
 
 exports.TextEncoder = TextEncoder;
 exports.TextDecoder = TextDecoder;
diff --git a/toolkit/commonjs/sdk/system/Startup.js b/toolkit/commonjs/sdk/system/Startup.js
index 473ca7486..776409077 100644
--- a/toolkit/commonjs/sdk/system/Startup.js
+++ b/toolkit/commonjs/sdk/system/Startup.js
@@ -9,7 +9,7 @@ const { utils: Cu, interfaces: Ci, classes: Cc } = Components;
 const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
 const { defer } = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 
-const { XulApp } = Cu.import("resource://gre/modules/jetpack/sdk/system/xul-app.jsm", {});
+const { XulApp } = Cu.import("resource://gre/modules/commonjs/sdk/system/xul-app.jsm", {});
 
 const appStartupSrv = Cc["@mozilla.org/toolkit/app-startup;1"]
                        .getService(Ci.nsIAppStartup);
diff --git a/toolkit/components/osfile/tests/xpcshell/test_loader.js b/toolkit/components/osfile/tests/xpcshell/test_loader.js
index df75fd873..9eb0edee9 100644
--- a/toolkit/components/osfile/tests/xpcshell/test_loader.js
+++ b/toolkit/components/osfile/tests/xpcshell/test_loader.js
@@ -7,7 +7,7 @@
  * Test that OS.File can be loaded using the CommonJS loader.
  */
 
-let { Loader } = Components.utils.import('resource://gre/modules/jetpack/toolkit/loader.js', {});
+let { Loader } = Components.utils.import('resource://gre/modules/commonjs/toolkit/loader.js', {});
 
 function run_test() {
   run_next_test();
diff --git a/toolkit/devtools/Loader.jsm b/toolkit/devtools/Loader.jsm
index 9b53c1ba9..afeadb8b8 100644
--- a/toolkit/devtools/Loader.jsm
+++ b/toolkit/devtools/Loader.jsm
@@ -17,7 +17,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetUtil", "resource://gre/modules/NetUt
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 
-let loader = Cu.import("resource://gre/modules/jetpack/toolkit/loader.js", {}).Loader;
+let loader = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {}).Loader;
 let promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
 
 this.EXPORTED_SYMBOLS = ["DevToolsLoader", "devtools", "BuiltinProvider",
@@ -77,7 +77,7 @@ BuiltinProvider.prototype = {
       paths: {
         // When you add a line to this mapping, don't forget to make a
         // corresponding addition to the SrcdirProvider mapping below as well.
-        "": "resource://gre/modules/jetpack/",
+        "": "resource://gre/modules/commonjs/",
         "main": "resource://gre/modules/devtools/main.js",
         "devtools": "resource://gre/modules/devtools",
         "devtools/toolkit": "resource://gre/modules/devtools",
@@ -159,7 +159,7 @@ SrcdirProvider.prototype = {
       id: "fx-devtools",
       modules: loaderModules,
       paths: {
-        "": "resource://gre/modules/jetpack/",
+        "": "resource://gre/modules/commonjs/",
         "main": mainURI,
         "devtools": devtoolsURI,
         "devtools/toolkit": toolkitURI,
diff --git a/toolkit/devtools/gcli/commands/cmd.js b/toolkit/devtools/gcli/commands/cmd.js
index 787649bf6..dfa066ec7 100644
--- a/toolkit/devtools/gcli/commands/cmd.js
+++ b/toolkit/devtools/gcli/commands/cmd.js
@@ -9,7 +9,7 @@ const { Cc, Ci, Cu } = require("chrome");
 const { Promise: promise } = require("resource://gre/modules/Promise.jsm");
 
 const { OS } = Cu.import("resource://gre/modules/osfile.jsm", {});
-const { TextEncoder, TextDecoder } = Cu.import('resource://gre/modules/jetpack/toolkit/loader.js', {});
+const { TextEncoder, TextDecoder } = Cu.import('resource://gre/modules/commonjs/toolkit/loader.js', {});
 const gcli = require("gcli/index");
 
 loader.lazyGetter(this, "prefBranch", function() {
diff --git a/toolkit/devtools/worker-loader.js b/toolkit/devtools/worker-loader.js
index dc96638ef..148aa07d5 100644
--- a/toolkit/devtools/worker-loader.js
+++ b/toolkit/devtools/worker-loader.js
@@ -345,7 +345,7 @@ if (typeof Components === "object") {
       "PromiseDebugging": PromiseDebugging
     },
     paths: {
-      "": "resource://gre/modules/jetpack/",
+      "": "resource://gre/modules/commonjs/",
       "devtools": "resource://gre/modules/devtools",
       "devtools/server": "resource://gre/modules/devtools/server",
       "devtools/toolkit": "resource://gre/modules/devtools",