Initial integration changes

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "extension/httpmonitor"]
+	path = extension/httpmonitor
+	url = git@github.com:firebug/httpmonitor.git

extension/chrome.manifest

@@ -1,5 +1,6 @@
 content firebug content/firebug/
 content firebug content/firebug/ contentaccessible=yes
+content firebug-httpmonitor httpmonitor/content/httpmonitor/
 
 # Maps resource://firebug/* to files in modules/*
 # resource firebug modules/

extension/content/firebug/lib/object.js

@@ -27,17 +27,20 @@ Obj.bindFixed = function() // fn, thisObject, args => thisObject.fn(args);
 
 Obj.extend = function(l, r)
 {
-    if (!l || !r)
+    var newOb = {};
+    for (var i=0; i<arguments.length; i++)
     {
-        FBTrace.sysout("object.extend; ERROR", [l, r]);
-        throw new Error("Obj.extend on undefined object");
-    }
+        var arg = arguments[i];
 
-    var newOb = {};
-    for (var n in l)
-        newOb[n] = l[n];
-    for (var n in r)
-        newOb[n] = r[n];
+        if (!arg)
+        {
+            FBTrace.sysout("object.extend; ERROR", arguments);
+            throw new Error("Obj.extend on undefined object");
+        }
+
+        for (var n in arg)
+            newOb[n] = arg[n];
+    }
     return newOb;
 };
 

extension/content/firebug/main.js

@@ -54,6 +54,10 @@ paths["firebug/firefox/window"] = "firebug/chrome/window";
 paths["firebug/firefox/firefox"] = "firebug/chrome/firefox";
 paths["firebug/net/httpLib"] = "firebug/lib/http";
 
+// HTTP Monitor
+paths["httpmonitor/lib/trace"] = "firebug/lib/trace";
+paths["httpmonitor/lib/locale"] = "firebug/lib/locale";
+
 var originalLoad = require.load;
 require.load = function(context, fullName, url)
 {

extension/content/firebug/moduleConfig.js

@@ -23,7 +23,8 @@ Firebug.getModuleLoaderConfig = function(baseConfig)
 
     baseConfig.paths = baseConfig.paths || {
         "arch": baseConfig.arch,
-        "firebug": "chrome://firebug/content"
+        "firebug": "chrome://firebug/content",
+        "httpmonitor": "chrome://firebug-httpmonitor/content"
     };
 
     var config = {};