Various Ice for JavaScript changes

* Rename zeroc-ice to ice
* Fix slice2js to generate code with requrie('ice')
* Update tests
* Slim bower.json

43 files changed, 49 insertions, 67 deletions

diff --git a/js/bower.json b/js/bower.json
index d7bfbcc2499..b8ef141ebb1 100644
--- a/js/bower.json
+++ b/js/bower.json
@@ -1,24 +1,6 @@
 {
-  "name": "zeroc-icejs",
-  "version": "3.6.0",
-  "description": "Ice for JavaScript runtime",
-  "author": "Zeroc, Inc.",
-  "homepage": "https://zeroc.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/zeroc-ice/bower-ice.git"
-  },
-  "license": "GPL-2.0",
-  "main": [
-    "lib/Glacier2.js",
-    "lib/Ice.js",
-    "lib/IceStorm.js",
-    "lib/IceGrid.js"
-  ],
-  "keywords": [
-    "Ice",
-    "IceJS"
-  ],
+  "name": "ice",
+  "private": true,
   "dependencies": {
     "foundation": "~5.5.0",
     "jquery": "~2.1.3",
diff --git a/js/gulpfile.js b/js/gulpfile.js
index 5981fe759a1..34b0c9ec7f4 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -370,7 +370,7 @@ gulp.task("bower", [],
 
 gulp.task("dist:libs", ["bower"],
     function(){
-        return gulp.src(["bower_components/zeroc-icejs/lib/*"])
+        return gulp.src(["bower_components/ice/lib/*"])
             .pipe(gulp.dest("lib"));
     });
 
diff --git a/js/package.json b/js/package.json
index 8dafae3423b..9a48c1ae9d6 100644
--- a/js/package.json
+++ b/js/package.json
@@ -14,7 +14,7 @@
     "IceJS",
     "rpc"
   ],
-  "main": "src/zeroc-icejs.js",
+  "main": "src/index.js",
   "devDependencies": {
     "bower": "^1.4.1",
     "browser-sync": "^2.6.4",
diff --git a/js/src/zeroc-icejs.js b/js/src/ice.js
index c734d414036..c734d414036 100644
--- a/js/src/zeroc-icejs.js
+++ b/js/src/ice.js
diff --git a/js/test/Common/Common.js b/js/test/Common/Common.js
index 7029a61d846..d2bb087dd4f 100644
--- a/js/test/Common/Common.js
+++ b/js/test/Common/Common.js
@@ -7,26 +7,26 @@
 //
 // **********************************************************************
 
-(function(module, require, exports){   
-    var Ice = require("zeroc-icejs").Ice;
+(function(module, require, exports){
+    var Ice = require("ice").Ice;
 
     var write = function(msg)
     {
-        process.stdout.write(msg); 
+        process.stdout.write(msg);
     };
 
     var writeLine = function(msg)
     {
         this.write(msg + "\n");
     };
-    
+
     var run = function(m)
     {
         var id = new Ice.InitializationData();
         id.properties = Ice.createProperties(process.argv);
-        
+
         var test = m.require("./Client").__test__;
-        
+
         test({write: write, writeLine: writeLine}, id).exception(
             function(ex, r)
             {
diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js
index 73e80dc58a2..1f981582267 100644
--- a/js/test/Glacier2/router/Client.js
+++ b/js/test/Glacier2/router/Client.js
@@ -9,8 +9,8 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
-    var Glacier2 = require("zeroc-icejs").Glacier2;
+    var Ice = require("ice").Ice;
+    var Glacier2 = require("ice").Glacier2;
     var Test = require("Callback").Test;
     var Promise = Ice.Promise;
 
diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js
index 4e4bf5a7621..84d48d28d8d 100644
--- a/js/test/Ice/acm/Client.js
+++ b/js/test/Ice/acm/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;
 
diff --git a/js/test/Ice/ami/Client.js b/js/test/Ice/ami/Client.js
index 7ae1beba75c..69b443a3832 100644
--- a/js/test/Ice/ami/Client.js
+++ b/js/test/Ice/ami/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;
 
diff --git a/js/test/Ice/binding/Client.js b/js/test/Ice/binding/Client.js
index 19078264f30..ae19b4dd875 100644
--- a/js/test/Ice/binding/Client.js
+++ b/js/test/Ice/binding/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Promise = Ice.Promise;
diff --git a/js/test/Ice/defaultValue/Client.js b/js/test/Ice/defaultValue/Client.js
index ef3b47fb1a2..460f2f030eb 100644
--- a/js/test/Ice/defaultValue/Client.js
+++ b/js/test/Ice/defaultValue/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;
 
diff --git a/js/test/Ice/enums/Client.js b/js/test/Ice/enums/Client.js
index 8bca02c43e4..7c20393af18 100644
--- a/js/test/Ice/enums/Client.js
+++ b/js/test/Ice/enums/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Promise = Ice.Promise;
diff --git a/js/test/Ice/exceptions/Client.js b/js/test/Ice/exceptions/Client.js
index e8432ac1ef8..d0e75cf3a53 100644
--- a/js/test/Ice/exceptions/Client.js
+++ b/js/test/Ice/exceptions/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Promise = Ice.Promise;
diff --git a/js/test/Ice/exceptionsBidir/AMDThrowerI.js b/js/test/Ice/exceptionsBidir/AMDThrowerI.js
index 101eaf5a64e..4e11da59999 100644
--- a/js/test/Ice/exceptionsBidir/AMDThrowerI.js
+++ b/js/test/Ice/exceptionsBidir/AMDThrowerI.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var TestAMD = require("TestAMD").TestAMD;
     var Class = Ice.Class;
 
diff --git a/js/test/Ice/exceptionsBidir/Client.js b/js/test/Ice/exceptionsBidir/Client.js
index 67ba6a1ce67..4e856a71a02 100644
--- a/js/test/Ice/exceptionsBidir/Client.js
+++ b/js/test/Ice/exceptionsBidir/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var TestAMD = require("TestAMD").TestAMD;
 
diff --git a/js/test/Ice/exceptionsBidir/ThrowerI.js b/js/test/Ice/exceptionsBidir/ThrowerI.js
index 3b8ac414fa4..e193d24580b 100644
--- a/js/test/Ice/exceptionsBidir/ThrowerI.js
+++ b/js/test/Ice/exceptionsBidir/ThrowerI.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Class = Ice.Class;
diff --git a/js/test/Ice/facets/Client.js b/js/test/Ice/facets/Client.js
index a9b93f194f4..4ef4e0b07fd 100644
--- a/js/test/Ice/facets/Client.js
+++ b/js/test/Ice/facets/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     
     var Promise = Ice.Promise;
diff --git a/js/test/Ice/facetsBidir/Client.js b/js/test/Ice/facetsBidir/Client.js
index aa495cb7ccd..6ed035de473 100644
--- a/js/test/Ice/facetsBidir/Client.js
+++ b/js/test/Ice/facetsBidir/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Client = require("../facets/Client");
diff --git a/js/test/Ice/facetsBidir/TestI.js b/js/test/Ice/facetsBidir/TestI.js
index 288b22be71f..1027487ed18 100644
--- a/js/test/Ice/facetsBidir/TestI.js
+++ b/js/test/Ice/facetsBidir/TestI.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Class = Ice.Class;
diff --git a/js/test/Ice/hold/Client.js b/js/test/Ice/hold/Client.js
index 200af051c82..565308b61a7 100644
--- a/js/test/Ice/hold/Client.js
+++ b/js/test/Ice/hold/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;
 
diff --git a/js/test/Ice/inheritance/Client.js b/js/test/Ice/inheritance/Client.js
index 5fea1a02b9a..bec3a503df4 100644
--- a/js/test/Ice/inheritance/Client.js
+++ b/js/test/Ice/inheritance/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Promise = Ice.Promise;
diff --git a/js/test/Ice/inheritanceBidir/Client.js b/js/test/Ice/inheritanceBidir/Client.js
index f8969d36ac6..0271ba676a7 100644
--- a/js/test/Ice/inheritanceBidir/Client.js
+++ b/js/test/Ice/inheritanceBidir/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var InitialI = require("InitialI").InitialI;
     var Client = require("../inheritance/Client");
diff --git a/js/test/Ice/inheritanceBidir/InitialI.js b/js/test/Ice/inheritanceBidir/InitialI.js
index 3b8ad20f0b4..93cd05ea0b4 100644
--- a/js/test/Ice/inheritanceBidir/InitialI.js
+++ b/js/test/Ice/inheritanceBidir/InitialI.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Class = Ice.Class;
diff --git a/js/test/Ice/location/Client.js b/js/test/Ice/location/Client.js
index 798b67d7d60..9a417545545 100644
--- a/js/test/Ice/location/Client.js
+++ b/js/test/Ice/location/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Promise = Ice.Promise;
diff --git a/js/test/Ice/number/Client.js b/js/test/Ice/number/Client.js
index 59072e9560b..dcfe099937b 100644
--- a/js/test/Ice/number/Client.js
+++ b/js/test/Ice/number/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Promise = Ice.Promise;
 
     var test = function(b)
diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js
index 1291013fcdf..83388124444 100644
--- a/js/test/Ice/objects/Client.js
+++ b/js/test/Ice/objects/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Promise = Ice.Promise;
diff --git a/js/test/Ice/operations/BatchOneways.js b/js/test/Ice/operations/BatchOneways.js
index 5f04911b3dd..baace89f92a 100644
--- a/js/test/Ice/operations/BatchOneways.js
+++ b/js/test/Ice/operations/BatchOneways.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var run = function(communicator, prx, Test, bidir)
diff --git a/js/test/Ice/operations/Client.js b/js/test/Ice/operations/Client.js
index 8140f86dfbb..ed467143831 100644
--- a/js/test/Ice/operations/Client.js
+++ b/js/test/Ice/operations/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Twoways = require("Twoways").Twoways;
diff --git a/js/test/Ice/operations/Oneways.js b/js/test/Ice/operations/Oneways.js
index 995258ece48..c08689e1505 100644
--- a/js/test/Ice/operations/Oneways.js
+++ b/js/test/Ice/operations/Oneways.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var run = function(communicator, prx, Test, bidir)
diff --git a/js/test/Ice/operations/Twoways.js b/js/test/Ice/operations/Twoways.js
index f5777d5c6d5..f49c13ab79f 100644
--- a/js/test/Ice/operations/Twoways.js
+++ b/js/test/Ice/operations/Twoways.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var run = function(communicator, prx, Test, bidir)
diff --git a/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js b/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js
index e237a22e871..a8864118671 100644
--- a/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js
+++ b/js/test/Ice/operationsBidir/AMDMyDerivedClassI.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var TestAMD = require("TestAMD").TestAMD;
 
     var Class = Ice.Class;
diff --git a/js/test/Ice/operationsBidir/Client.js b/js/test/Ice/operationsBidir/Client.js
index e0cad33d049..b5f664b35ce 100644
--- a/js/test/Ice/operationsBidir/Client.js
+++ b/js/test/Ice/operationsBidir/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var TestAMD = require("TestAMD").TestAMD;
     var MyDerivedClassI = require("MyDerivedClassI").MyDerivedClassI;
diff --git a/js/test/Ice/operationsBidir/MyDerivedClassI.js b/js/test/Ice/operationsBidir/MyDerivedClassI.js
index d859781ce45..840c445a010 100644
--- a/js/test/Ice/operationsBidir/MyDerivedClassI.js
+++ b/js/test/Ice/operationsBidir/MyDerivedClassI.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Class = Ice.Class;
diff --git a/js/test/Ice/optional/Client.js b/js/test/Ice/optional/Client.js
index caa39eb6e83..d79c795e607 100644
--- a/js/test/Ice/optional/Client.js
+++ b/js/test/Ice/optional/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Promise = Ice.Promise;
diff --git a/js/test/Ice/optionalBidir/AMDInitialI.js b/js/test/Ice/optionalBidir/AMDInitialI.js
index c27ae34607c..b11e38f4a16 100644
--- a/js/test/Ice/optionalBidir/AMDInitialI.js
+++ b/js/test/Ice/optionalBidir/AMDInitialI.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var TestAMD = require("TestAMD").TestAMD;
 
     var Class = Ice.Class;
diff --git a/js/test/Ice/optionalBidir/Client.js b/js/test/Ice/optionalBidir/Client.js
index c07abc9e2c7..1d92c129a13 100644
--- a/js/test/Ice/optionalBidir/Client.js
+++ b/js/test/Ice/optionalBidir/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var TestAMD = require("TestAMD").TestAMD;
     var InitialI = require("InitialI").InitialI;
diff --git a/js/test/Ice/optionalBidir/InitialI.js b/js/test/Ice/optionalBidir/InitialI.js
index d741f523b6d..010401d1998 100644
--- a/js/test/Ice/optionalBidir/InitialI.js
+++ b/js/test/Ice/optionalBidir/InitialI.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
     var Class = Ice.Class;
diff --git a/js/test/Ice/promise/Client.js b/js/test/Ice/promise/Client.js
index d978a1f21f7..aca2b9a786e 100644
--- a/js/test/Ice/promise/Client.js
+++ b/js/test/Ice/promise/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Promise = Ice.Promise;
 
     var test = function(b)
diff --git a/js/test/Ice/properties/Client.js b/js/test/Ice/properties/Client.js
index 39cc93e81c5..9f2a3331875 100644
--- a/js/test/Ice/properties/Client.js
+++ b/js/test/Ice/properties/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Promise = Ice.Promise;
 
     var test = function(b)
diff --git a/js/test/Ice/proxy/Client.js b/js/test/Ice/proxy/Client.js
index 9cda7c15187..38bdd4d2310 100644
--- a/js/test/Ice/proxy/Client.js
+++ b/js/test/Ice/proxy/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;
 
diff --git a/js/test/Ice/retry/Client.js b/js/test/Ice/retry/Client.js
index a7d9ec81e58..9fc5504d39b 100644
--- a/js/test/Ice/retry/Client.js
+++ b/js/test/Ice/retry/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;
 
diff --git a/js/test/Ice/slicing/exceptions/Client.js b/js/test/Ice/slicing/exceptions/Client.js
index e1c9d4c54ce..28478294a97 100644
--- a/js/test/Ice/slicing/exceptions/Client.js
+++ b/js/test/Ice/slicing/exceptions/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;
     var ArrayUtil = Ice.ArrayUtil;
diff --git a/js/test/Ice/slicing/objects/Client.js b/js/test/Ice/slicing/objects/Client.js
index feafe51ebbf..be1a068ca37 100644
--- a/js/test/Ice/slicing/objects/Client.js
+++ b/js/test/Ice/slicing/objects/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;
     var ArrayUtil = Ice.ArrayUtil;
diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js
index 8e2ae3d27fa..78395b7942f 100644
--- a/js/test/Ice/timeout/Client.js
+++ b/js/test/Ice/timeout/Client.js
@@ -9,7 +9,7 @@
 
 (function(module, require, exports)
 {
-    var Ice = require("zeroc-icejs").Ice;
+    var Ice = require("ice").Ice;
     var Test = require("Test").Test;
     var Promise = Ice.Promise;