Bug 788463 - Import log4moz.js from resource:/// instead of resource://gre/. r=mdas
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 06 Sep 2012 08:13:13 +0200
changeset 104368 0c4fa25f637ba230081d9fca316acc063187e6b2
parent 104367 5f8055d8dde1cda9ed9672e3ac0974faa4042855
child 104369 eaddbfdee40b9820b2069430347fad4c3ccdceb1
child 110934 16a74f8678e91aa93a5fab760818e55c90e4b71a
push id23420
push usermh@glandium.org
push dateThu, 06 Sep 2012 06:13:35 +0000
treeherdermozilla-central@0c4fa25f637b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmdas
bugs788463
milestone18.0a1
first release with
nightly linux32
0c4fa25f637b / 18.0a1 / 20120906030518 / files
nightly linux64
0c4fa25f637b / 18.0a1 / 20120906030518 / files
nightly mac
0c4fa25f637b / 18.0a1 / 20120906030518 / files
nightly win32
0c4fa25f637b / 18.0a1 / 20120906030518 / files
nightly win64
0c4fa25f637b / 18.0a1 / 20120906030518 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 788463 - Import log4moz.js from resource:/// instead of resource://gre/. r=mdas
testing/marionette/components/marionettecomponent.js
testing/marionette/marionette-actors.js
--- a/testing/marionette/components/marionettecomponent.js
+++ b/testing/marionette/components/marionettecomponent.js
@@ -7,17 +7,17 @@ const {classes: Cc, interfaces: Ci, util
 const MARIONETTE_CONTRACTID = "@mozilla.org/marionette;1";
 const MARIONETTE_CID = Components.ID("{786a1369-dca5-4adc-8486-33d23c88010a}");
 const DEBUGGER_ENABLED_PREF = 'devtools.debugger.remote-enabled';
 const MARIONETTE_ENABLED_PREF = 'marionette.defaultPrefs.enabled';
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
-Cu.import("resource://gre/modules/services-common/log4moz.js");
+Cu.import("resource:///modules/services-common/log4moz.js");
 
 function MarionetteComponent() {
   this._loaded = false;
   // set up the logger
   this.logger = Log4Moz.repository.getLogger("Marionette");
   this.logger.level = Log4Moz.Level["All"];
   let logf = FileUtils.getFile('ProfD', ['marionette.log']);
   
--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -30,17 +30,17 @@ specialpowers.specialPowersObserver.init
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");  
 
 Services.prefs.setBoolPref("marionette.contentListener", false);
 let appName = Services.appinfo.name;
 
 // import logger
-Cu.import("resource://gre/modules/services-common/log4moz.js");
+Cu.import("resource:///modules/services-common/log4moz.js");
 let logger = Log4Moz.repository.getLogger("Marionette");
 logger.info('marionette-actors.js loaded');
 
 /**
  * Creates the root actor once a connection is established
  */
 
 function createRootActor(aConnection)