ICE-6634 - Using Ice in background worker.

1 files changed, 7 insertions, 45 deletions

diff --git a/js/gulpfile.js b/js/gulpfile.js
index 049c4afa22a..714efec8747 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -85,6 +85,7 @@ var common = {
         "bower_components/animo.js/animo.js",
         "bower_components/spin.js/spin.js",
         "bower_components/spin.js/jquery.spin.js",
+        "bower_components/URIjs/src/URI.js",
         "bower_components/highlightjs/highlight.pack.js",
         "assets/icejs.js"
     ],
@@ -164,32 +165,6 @@ function testTask(name) { return name.replace("/", "_"); }
 function testWatchTask(name) { return testTask(name) + ":watch"; }
 function testCleanDependTask(name) { return testTask(name) + "-depend:clean"; }
 function testCleanTask(name) { return testTask(name) + ":clean"; }
-function testHtmlTask(name) { return testTask(name) + ":html"; }
-function testHtmlCleanTask(name) { return testTask(name) + ":html:clean"; }
-
-tests.forEach(
-    function(name){
-        gulp.task(testHtmlTask(name), [],
-            function(){
-                return gulp.src("test/Common/index.html")
-                    .pipe(newer(path.join(name, "index.html")))
-                    .pipe(gulp.dest(path.join(name)));
-            });
-
-        gulp.task(testHtmlCleanTask(name), [],
-            function(){
-                del(path.join(name, "index.html"));
-            });
-    });
-
-gulp.task("html", tests.map(testHtmlTask));
-
-gulp.task("html:watch", ["html"],
-    function(){
-        gulp.watch(["test/Common/index.html"], ["html"]);
-    });
-
-gulp.task("html:clean", tests.map(testHtmlCleanTask));
 
 tests.forEach(
     function(name){
@@ -204,13 +179,12 @@ tests.forEach(
                     .pipe(gulp.dest(name));
             });
 
-        gulp.task(testWatchTask(name), [testTask(name), "html"],
+        gulp.task(testWatchTask(name), [testTask(name)],
             function(){
                 gulp.watch([path.join(name, "*.ice")], [testTask(name)]);
 
                 gulp.watch(
-                    [path.join(name, "*.js"), path.join(name, "browser", "*.js"),
-                     path.join(name, "*.html")]);
+                    [path.join(name, "*.js"), path.join(name, "browser", "*.js")]);
             });
 
         gulp.task(testCleanDependTask(name), [],
@@ -227,14 +201,12 @@ tests.forEach(
             });
     });
 
-gulp.task("test", tests.map(testTask).concat(
-    ["common:slice", "common:js", "common:css"].concat(tests.map(testHtmlTask))));
+gulp.task("test", tests.map(testTask).concat(["common:slice", "common:js", "common:css"]));
 
 gulp.task("test:watch", tests.map(testWatchTask).concat(
-    ["common:slice:watch", "common:css:watch", "common:js:watch", "html:watch"]));
+    ["common:slice:watch", "common:css:watch", "common:js:watch"]));
 
-gulp.task("test:clean", tests.map(testCleanTask).concat(
-    tests.map(testHtmlCleanTask).concat(["common:slice:clean"])));
+gulp.task("test:clean", tests.map(testCleanTask).concat(["common:slice:clean"]));
 
 //
 // Tasks to build IceJS Distribution
@@ -373,17 +345,7 @@ gulp.task("watch", ["test:watch"].concat(useBinDist ? [] : ["dist:watch"]));
 
 gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test"] : ["build"]),
     function(){
-        var serverLanguages =
-            {
-                languages: [{value: "cpp", name: "C++"}, {value: "java", name: "Java"}]
-            };
-        if(process.platform == "win32")
-        {
-            serverLanguages.languages.push({value: "csharp", name: "C#"});
-        }
-        fs.writeFileSync("server-languages.json", JSON.stringify(serverLanguages, null, 4));
         require("./bin/HttpServer")();
-
         var cmd = ["../scripts/TestController.py"]
         cmd = cmd.concat(process.argv.slice(3))
         var p  = require("child_process").spawn("python", cmd, {stdio: "inherit"});
@@ -408,7 +370,7 @@ gulp.task("test:run-with-browser", ["watch"].concat(useBinDist ? ["test"] : ["bu
             {
                 p.kill();
             });
-        return gulp.src("./test/Ice/acm/index.html")
+        return gulp.src("./test/Common/index.html")
                    .pipe(open("", {url: "http://127.0.0.1:8080/test/Ice/acm/index.html"}));
     });