1 files changed, 35 insertions, 30 deletions
diff --git a/js/src/Ice/Ice.js b/js/src/Ice/Ice.js
index d7ec2f807bd..72289ad5c87 100644
--- a/js/src/Ice/Ice.js
+++ b/js/src/Ice/Ice.js
@@ -7,33 +7,38 @@
 //
 // **********************************************************************
 
-(function(){
-    require("Ice/TcpEndpointFactory"); // Must be loaded before Communicator and Instance
-    require("Ice/Initialize");
-    require("Ice/Communicator");
-    require("Ice/HashMap");
-    require("Ice/Object");
-    require("Ice/Long");
-    require("Ice/Logger");
-    require("Ice/ObjectPrx");
-    require("Ice/Metrics");
-    require("Ice/Properties");
-    require("Ice/IdentityUtil");
-    require("Ice/ProcessLogger");
-    require("Ice/Protocol");
-    require("Ice/Identity");
-    require("Ice/Exception");
-    require("Ice/LocalException");
-    require("Ice/BuiltinSequences");
-    require("Ice/StreamHelpers");
-    require("Ice/Promise");
-    require("Ice/EndpointTypes");
-    require("Ice/Locator");
-    require("Ice/Router");
-    require("Ice/Version");
-    require("Ice/ObjectFactory");
-    require("Ice/Buffer");
-    require("Ice/ArrayUtil");
-    require("Ice/UnknownSlicedObject");
-    require("Ice/Process");
-}());
+
+var __M = require("../Ice/ModuleRegistry").Ice.__M;
+
+module.exports.Ice = __M.require(module, "Ice",
+    [
+        "../Ice/TcpEndpointFactory", // Must be loaded before Communicator and Instance
+        "../Ice/Initialize",
+        "../Ice/Communicator",
+        "../Ice/HashMap",
+        "../Ice/Object",
+        "../Ice/Long",
+        "../Ice/Logger",
+        "../Ice/ObjectPrx",
+        "../Ice/Properties",
+        "../Ice/IdentityUtil",
+        "../Ice/ProcessLogger",
+        "../Ice/Protocol",
+        "../Ice/Identity",
+        "../Ice/Exception",
+        "../Ice/LocalException",
+        "../Ice/BuiltinSequences",
+        "../Ice/StreamHelpers",
+        "../Ice/Promise",
+        "../Ice/EndpointTypes",
+        "../Ice/Locator",
+        "../Ice/Router",
+        "../Ice/Version",
+        "../Ice/ObjectFactory",
+        "../Ice/Buffer",
+        "../Ice/ArrayUtil",
+        "../Ice/UnknownSlicedObject",
+        "../Ice/Process"
+    ]);
+
+module.exports.IceMX = require("../Ice/Metrics").IceMX;