Merge remote-tracking branch 'amb26/GPII-872'

Author: sgithens

gpii.js

@@ -13,13 +13,10 @@ https://github.com/gpii/universal/LICENSE.txt
 var fluid = require("universal"),
     kettle = fluid.registerNamespace("kettle");
 
-// TODO: it would be nice to not have to hardcode this path. A different module layout
-// for the platform packages, perhaps?
-fluid.require("./gpii/node_modules/registrySettingsHandler", require);
-fluid.require("./gpii/node_modules/registryResolver", require);
-fluid.require("./gpii/node_modules/spiSettingsHandler", require);
+require("./gpii/index.js");
 
 kettle.config.makeConfigLoader({
     nodeEnv: kettle.config.getNodeEnv("fm.ps.sr.dr.mm.os.lms.development"),
+// TODO: it would be nice to not have to hardcode this path.
     configPath: kettle.config.getConfigPath() || "../node_modules/universal/gpii/configs"
 });

gpii/index.js

@@ -1,5 +1,6 @@
 var fluid = require("universal");
 
+fluid.require("WindowsUtilities/WindowsUtilities.js", require);
 fluid.require("registrySettingsHandler", require);
 fluid.require("registryResolver", require);
 fluid.require("spiSettingsHandler", require);

tests/acceptanceTests/AcceptanceTests_include.js

@@ -21,11 +21,9 @@ var fluid = require("universal"),
 
 fluid.registerNamespace("gpii.acceptanceTesting.windows");
 
-fluid.require("../../gpii/node_modules/registrySettingsHandler", require);
-fluid.require("../../gpii/node_modules/registryResolver", require);
-fluid.require("../../gpii/node_modules/spiSettingsHandler", require);
+require("../../gpii/index.js");
 
-fluid.require("universal/tests/AcceptanceTests", require);
+fluid.require("universal/tests/AcceptanceTests.js", require);
 
 
 gpii.acceptanceTesting.windows.runTests = function (configFile, testDefs) {