JavaScript updates to use gulp and add npm and bower packages

24 files changed, 169 insertions, 862 deletions

diff --git a/js/src/Glacier2/.depend.mak b/js/src/Glacier2/.depend.mak
deleted file mode 100644
index 9e48702faed..00000000000
--- a/js/src/Glacier2/.depend.mak
+++ /dev/null
@@ -1,35 +0,0 @@
-
-Metrics.js: \
-    "$(slicedir)\Glacier2\Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-PermissionsVerifier.js: \
-    "$(slicedir)\Glacier2\PermissionsVerifier.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-PermissionsVerifierF.js: \
-    "$(slicedir)\Glacier2\PermissionsVerifierF.ice"
-
-Router.js: \
-    "$(slicedir)\Glacier2\Router.ice" \
-    "$(slicedir)/Ice/Router.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/Glacier2/PermissionsVerifier.ice"
-
-RouterF.js: \
-    "$(slicedir)\Glacier2\RouterF.ice"
-
-Session.js: \
-    "$(slicedir)\Glacier2\Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice"
-
-SSLInfo.js: \
-    "$(slicedir)\Glacier2\SSLInfo.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
diff --git a/js/src/Glacier2/Makefile b/js/src/Glacier2/Makefile
deleted file mode 100644
index 8f69267b424..00000000000
--- a/js/src/Glacier2/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBNAME = Glacier2
-
-MODULES = $(LIBNAME)
-
-TARGETS	= $(call mklibtargets,$(LIBNAME))
-
-SLICES = $(SDIR)/Metrics.ice \
-	$(SDIR)/PermissionsVerifier.ice \
-	$(SDIR)/PermissionsVerifierF.ice \
-	$(SDIR)/Router.ice \
-	$(SDIR)/RouterF.ice \
-	$(SDIR)/Session.ice \
-	$(SDIR)/SSLInfo.ice
-
-SDIR	= $(slicedir)/Glacier2
-
-GEN_SRCS = $(patsubst 	$(SDIR)/%.ice, %.js,  $(SLICES))
-
-SRCS		:= $(GEN_SRCS)
-INSTALL_SRCS	:= Glacier2.js $(GEN_SRCS)
-
-include $(top_srcdir)/config/Make.rules.js
-
-SLICE2JSFLAGS	:= $(SLICE2JSFLAGS) --ice -I$(slicedir) --icejs
-
-lint:: $(INSTALL_SRCS)
-	jshint $(LINTFLAGS) $(INSTALL_SRCS)
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBNAME))
-	$(call installmodule,$(DESTDIR)$(install_moduledir),$(INSTALL_SRCS),$(LIBNAME))
diff --git a/js/src/Glacier2/Makefile.mak b/js/src/Glacier2/Makefile.mak
deleted file mode 100644
index 1b7bc490856..00000000000
--- a/js/src/Glacier2/Makefile.mak
+++ /dev/null
@@ -1,40 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME = Glacier2
-
-MODULES = $(LIBNAME)
-
-GEN_SRCS = Metrics.js \
-	PermissionsVerifier.js \
-	PermissionsVerifierF.js \
-	Router.js \
-	RouterF.js \
-	Session.js \
-	SSLInfo.js
-
-SDIR		= $(slicedir)\Glacier2
-
-SRCS		= $(GEN_SRCS)
-INSTALL_SRCS	= Glacier2.js $(GEN_SRCS)
-
-!include $(top_srcdir)\config\Make.rules.mak.js
-
-SLICE2JSFLAGS	= $(SLICE2JSFLAGS) --ice -I"$(slicedir)" --icejs
-
-MODULEDIR       = $(install_moduledir)\$(LIBNAME)
-
-install:: all
-        @if not exist $(MODULEDIR) \
-            @echo "Creating $(MODULEDIR)" && \
-            mkdir "$(MODULEDIR)"
-        @for %i in ( $(INSTALL_SRCS) ) do \
-            copy %i "$(MODULEDIR)"
diff --git a/js/src/Glacier2/sources.json b/js/src/Glacier2/sources.json
new file mode 100644
index 00000000000..c72bb8e75cb
--- /dev/null
+++ b/js/src/Glacier2/sources.json
@@ -0,0 +1,14 @@
+{
+    "modules": [
+        "Glacier2"],
+    "slice":[
+        "Glacier2/Metrics.ice", 
+        "Glacier2/PermissionsVerifier.ice",
+        "Glacier2/PermissionsVerifierF.ice", 
+        "Glacier2/Router.ice", 
+        "Glacier2/RouterF.ice",
+        "Glacier2/Session.ice",
+        "Glacier2/SSLInfo.ice"],
+    "common":[
+        "Glacier2/Glacier2.js"]
+}
\ No newline at end of file
diff --git a/js/src/Ice/.depend.mak b/js/src/Ice/.depend.mak
deleted file mode 100644
index 4d3c2673d3f..00000000000
--- a/js/src/Ice/.depend.mak
+++ /dev/null
@@ -1,82 +0,0 @@
-
-BuiltinSequences.js: \
-    "$(slicedir)\Ice\BuiltinSequences.ice"
-
-Connection.js: \
-    "$(slicedir)\Ice\Connection.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-ConnectionF.js: \
-    "$(slicedir)\Ice\ConnectionF.ice"
-
-Current.js: \
-    "$(slicedir)\Ice\Current.ice" \
-    "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ConnectionF.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice"
-
-Endpoint.js: \
-    "$(slicedir)\Ice\Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-EndpointF.js: \
-    "$(slicedir)\Ice\EndpointF.ice"
-
-EndpointInfo.js: \
-    "$(slicedir)\IceSSL\EndpointInfo.ice" \
-    "$(slicedir)/Ice/Endpoint.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/EndpointF.ice"
-
-EndpointTypes.js: \
-    "$(slicedir)\Ice\EndpointTypes.ice"
-
-Identity.js: \
-    "$(slicedir)\Ice\Identity.ice"
-
-LocalException.js: \
-    "$(slicedir)\Ice\LocalException.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/Version.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Locator.js: \
-    "$(slicedir)\Ice\Locator.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
-
-Metrics.js: \
-    "$(slicedir)\Ice\Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-ObjectAdapterF.js: \
-    "$(slicedir)\Ice\ObjectAdapterF.ice"
-
-Process.js: \
-    "$(slicedir)\Ice\Process.ice"
-
-ProcessF.js: \
-    "$(slicedir)\Ice\ProcessF.ice"
-
-PropertiesAdmin.js: \
-    "$(slicedir)\Ice\PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Router.js: \
-    "$(slicedir)\Ice\Router.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-SliceChecksumDict.js: \
-    "$(slicedir)\Ice\SliceChecksumDict.ice"
-
-Version.js: \
-    "$(slicedir)\Ice\Version.ice"
diff --git a/js/src/Ice/Makefile b/js/src/Ice/Makefile
deleted file mode 100644
index 28969f74eea..00000000000
--- a/js/src/Ice/Makefile
+++ /dev/null
@@ -1,165 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBNAME = Ice
-
-MODULES = $(LIBNAME) IceMX IceSSL
-
-TARGETS	= $(call mklibtargets,$(LIBNAME))
-
-SLICES = \
-	$(SDIR)/BuiltinSequences.ice \
-	$(SDIR)/Connection.ice \
-	$(SDIR)/ConnectionF.ice \
-	$(SDIR)/Current.ice \
-	$(SDIR)/Endpoint.ice \
-	$(SDIR)/EndpointF.ice \
-	$(SDIR)/EndpointTypes.ice \
-	$(SDIR)/Identity.ice \
-	$(SDIR)/LocalException.ice \
-	$(SDIR)/Locator.ice \
-	$(SDIR)/Metrics.ice \
-	$(SDIR)/ObjectAdapterF.ice \
-	$(SDIR)/Process.ice \
-	$(SDIR)/ProcessF.ice \
-	$(SDIR)/PropertiesAdmin.ice \
-	$(SDIR)/Router.ice \
-	$(SDIR)/SliceChecksumDict.ice \
-	$(SDIR)/Version.ice
-
-SDIR	= $(slicedir)/Ice
-
-GEN_SRCS = $(patsubst $(SDIR)/%.ice, %.js, $(SLICES)) EndpointInfo.js
-
-COMMON_SRCS = \
-	ACM.js \
-	Address.js \
-	ArrayUtil.js \
-	AsyncResult.js \
-	AsyncResultBase.js \
-	AsyncStatus.js \
-	Base64.js \
-	BasicStream.js \
-	Class.js \
-	Communicator.js \
-	CompactIdRegistry.js \
-	ConnectionI.js \
-	ConnectionRequestHandler.js \
-	ConnectRequestHandler.js \
-	DefaultsAndOverrides.js \
-	DispatchStatus.js \
-	EndpointI.js \
-	EndpointFactoryManager.js \
-	EnumBase.js \
-	Exception.js \
-	ExUtil.js \
-	FormatType.js \
-	HashMap.js \
-	HashUtil.js \
-	IdentityUtil.js \
-	ImplicitContextI.js \
-	IncomingAsync.js \
-	Initialize.js \
-	Instance.js \
-	IPEndpointI.js \
-	LocatorInfo.js \
-	LocatorManager.js \
-	LocatorTable.js \
-	Logger.js \
-	Long.js \
-	Object.js \
-	ObjectAdapterFactory.js \
-	ObjectAdapterI.js \
-	ObjectFactory.js \
-	ObjectFactoryManager.js \
-	ObjectPrx.js \
-	OpaqueEndpointI.js \
-	Operation.js \
-	OptionalFormat.js \
-	OutgoingAsync.js \
-	OutgoingConnectionFactory.js \
-	ProcessLogger.js \
-	Promise.js \
-	Properties.js \
-	Property.js \
-	PropertyNames.js \
-	Protocol.js \
-	ProtocolInstance.js \
-	ProxyFactory.js \
-	Reference.js \
-	ReferenceMode.js \
-	RequestHandlerFactory.js \
-	RetryException.js \
-	RetryQueue.js \
-	RouterInfo.js \
-	RouterManager.js \
-	ServantManager.js \
-	SocketOperation.js \
-	StreamHelpers.js \
-	StringUtil.js \
-	Struct.js \
-	TcpEndpointFactory.js \
-	TcpEndpointI.js \
-	Timer.js \
-	TraceLevels.js \
-	TraceUtil.js \
-	UnknownSlicedObject.js \
-	UUID.js \
-	WSEndpoint.js \
-	WSEndpointFactory.js
-
-NODEJS_SRCS = \
-	Debug.js \
-	Buffer.js \
-	Ice.js \
-	ModuleRegistry.js \
-	TcpTransceiver.js
-
-BROWSER_SRCS = \
-	browser/Buffer.js \
-	browser/ModuleRegistry.js \
-	browser/WSTransceiver.js
-
-ifneq ($(OPTIMIZE),yes)
-    BROWSER_SRCS := $(BROWSER_SRCS) browser/Debug.js
-endif
-
-SRCS		:= $(BROWSER_SRCS) $(GEN_SRCS) $(COMMON_SRCS)
-INSTALL_SRCS	:= $(NODEJS_SRCS) $(GEN_SRCS) $(COMMON_SRCS)
-
-include $(top_srcdir)/config/Make.rules.js
-
-# Prevent generation of these files from .ice files
-Communicator.js:
-	
-Properties.js:
-	
-Logger.js:
-	
-ServantLocator.js:
-	
-ObjectFactory.js:
-	
-SLICE2JSFLAGS	:= $(SLICE2JSFLAGS) --ice -I$(slicedir) --icejs
-
-# NOTE: we include IceSSL generated code in the Ice.js module to allow
-# parsing SSL endpoints.
-EndpointInfo.js: $(slicedir)/IceSSL/EndpointInfo.ice $(SLICE2JS) $(SLICEPARSERLIB)
-	rm -f $(*F).js
-	$(SLICE2JS) $(SLICE2JSFLAGS) $<
-
-lint:: $(SRCS)
-	jshint $(LINTFLAGS) $(NODEJS_SRCS) $(BROWSER_SRCS) $(GEN_SRCS) $(COMMON_SRCS)
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBNAME))
-	$(call installmodule,$(DESTDIR)$(install_moduledir),$(INSTALL_SRCS),$(LIBNAME))
-
diff --git a/js/src/Ice/Makefile.mak b/js/src/Ice/Makefile.mak
deleted file mode 100644
index 947eef1ed23..00000000000
--- a/js/src/Ice/Makefile.mak
+++ /dev/null
@@ -1,168 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME = Ice
-
-MODULES = $(LIBNAME) IceMX IceSSL
-
-GEN_SRCS = \
-	BuiltinSequences.js \
-	Connection.js \
-	ConnectionF.js \
-	Current.js \
-	Endpoint.js \
-	EndpointF.js \
-	EndpointInfo.js \
-	EndpointTypes.js \
-	Identity.js \
-	LocalException.js \
-	Locator.js \
-	Metrics.js \
-	ObjectAdapterF.js \
-	Process.js \
-	ProcessF.js \
-	PropertiesAdmin.js \
-	Router.js \
-	SliceChecksumDict.js \
-	Version.js
-
-COMMON_SRCS = \
-	ACM.js \
-	Address.js \
-	ArrayUtil.js \
-	AsyncResult.js \
-	AsyncResultBase.js \
-	AsyncStatus.js \
-	Base64.js \
-	BasicStream.js \
-	Class.js \
-	Communicator.js \
-	CompactIdRegistry.js \
-	ConnectionI.js \
-	ConnectionRequestHandler.js \
-	ConnectRequestHandler.js \
-	DefaultsAndOverrides.js \
-	DispatchStatus.js \
-	EndpointI.js \
-	EndpointFactoryManager.js \
-	EnumBase.js \
-	Exception.js \
-	ExUtil.js \
-	FormatType.js \
-	HashMap.js \
-	HashUtil.js \
-	IdentityUtil.js \
-	ImplicitContextI.js \
-	IncomingAsync.js \
-	Initialize.js \
-	Instance.js \
-	IPEndpointI.js \
-	LocatorInfo.js \
-	LocatorManager.js \
-	LocatorTable.js \
-	Logger.js \
-	Long.js \
-	Object.js \
-	ObjectAdapterFactory.js \
-	ObjectAdapterI.js \
-	ObjectFactory.js \
-	ObjectFactoryManager.js \
-	ObjectPrx.js \
-	OpaqueEndpointI.js \
-	Operation.js \
-	OptionalFormat.js \
-	OutgoingAsync.js \
-	OutgoingConnectionFactory.js \
-	ProcessLogger.js \
-	Promise.js \
-	Properties.js \
-	Property.js \
-	PropertyNames.js \
-	Protocol.js \
-	ProtocolInstance.js \
-	ProxyFactory.js \
-	Reference.js \
-	ReferenceMode.js \
-	RequestHandlerFactory.js \
-	RetryException.js \
-	RetryQueue.js \
-	RouterInfo.js \
-	RouterManager.js \
-	ServantManager.js \
-	SocketOperation.js \
-	StreamHelpers.js \
-	StringUtil.js \
-	Struct.js \
-	TcpEndpointFactory.js \
-	TcpEndpointI.js \
-	Timer.js \
-	TraceLevels.js \
-	TraceUtil.js \
-	UnknownSlicedObject.js \
-	UUID.js \
-	WSEndpoint.js \
-	WSEndpointFactory.js
-
-NODEJS_SRCS = \
-	Debug.js \
-	Buffer.js \
-	Ice.js \
-	ModuleRegistry.js \
-	TcpTransceiver.js
-
-BROWSER_SRCS = \
-	browser\Buffer.js \
-	browser\ModuleRegistry.js \
-	browser\WSTransceiver.js
-
-!if "$(OPTIMIZE)" != "yes"
-BROWSER_SRCS	= $(BROWSER_SRCS) browser\Debug.js
-!endif
-
-SDIR		= $(slicedir)\Ice
-
-SRCS		= $(BROWSER_SRCS) $(GEN_SRCS) $(COMMON_SRCS)
-INSTALL_SRCS	= $(NODEJS_SRCS) $(GEN_SRCS) $(COMMON_SRCS)
-
-!include $(top_srcdir)\config\Make.rules.mak.js
-
-# Prevent generation of these files from .ice files
-Communicator.js:
-	
-Properties.js:
-	
-Logger.js:
-	
-ServantLocator.js:
-	
-ObjectFactory.js:
-	
-SLICE2JSFLAGS	= $(SLICE2JSFLAGS) --ice -I"$(slicedir)" --icejs
-
-MODULEDIR	= $(install_moduledir)\$(LIBNAME)
-
-# NOTE: we include IceSSL generated code in the Ice.js module to allow
-# parsing SSL endpoints.
-EndpointInfo.js : "$(slicedir)\IceSSL\EndpointInfo.ice"
-        "$(SLICE2JS)" $(SLICE2JSFLAGS) "$(slicedir)\IceSSL\EndpointInfo.ice"
-
-EndpointInfo.d : "$(slicedir)\IceSSL\EndpointInfo.ice"
-	@echo Generating dependencies for $(slicedir)\IceSSL\EndpointInfo.ice
-	@"$(SLICE2JS)" $(SLICE2JSFLAGS) --depend "$(slicedir)\IceSSL\EndpointInfo.ice" |\
-	cscript /NoLogo $(top_srcdir)\..\config\makedepend-slice.vbs $(*F).ice
-
-install:: all
-	@if not exist $(MODULEDIR) \
-	    @echo "Creating $(MODULEDIR)" && \
-	    mkdir "$(MODULEDIR)"
-	@for %i in ( $(INSTALL_SRCS) ) do \
-	    copy %i "$(MODULEDIR)"
-
diff --git a/js/src/Ice/ModuleRegistry.js b/js/src/Ice/ModuleRegistry.js
index 373b3240d81..a92683363e4 100644
--- a/js/src/Ice/ModuleRegistry.js
+++ b/js/src/Ice/ModuleRegistry.js
@@ -52,6 +52,6 @@ var __M =
 };
 
 var Ice = __M.module("Ice");
-Ice.Slice = {};
+Ice.Slice = Ice.Slice || {};
 Ice.__M = __M;
 exports.Ice = Ice;
diff --git a/js/src/Ice/WSEndpoint.js b/js/src/Ice/WSEndpoint.js
index 25c17ff2237..6ccc3dcaf40 100644
--- a/js/src/Ice/WSEndpoint.js
+++ b/js/src/Ice/WSEndpoint.js
@@ -16,6 +16,7 @@ Ice.__M.require(module,
         "../Ice/StringUtil",
         "../Ice/EndpointI",
         "../Ice/LocalException",
+        "../Ice/WSTransceiver"
     ]);
 
 var HashUtil = Ice.HashUtil;
@@ -208,3 +209,4 @@ else
 }
 
 Ice.WSEndpoint = WSEndpoint;
+exports.Ice = Ice;
diff --git a/js/src/Ice/WSEndpointFactory.js b/js/src/Ice/WSEndpointFactory.js
index 5a9cc28315c..f532229be67 100644
--- a/js/src/Ice/WSEndpointFactory.js
+++ b/js/src/Ice/WSEndpointFactory.js
@@ -45,3 +45,4 @@ var WSEndpointFactory = Ice.Class({
     }
 });
 Ice.WSEndpointFactory = WSEndpointFactory;
+exports.Ice = Ice;
\ No newline at end of file
diff --git a/js/src/Ice/WSTransceiver.js b/js/src/Ice/WSTransceiver.js
new file mode 100644
index 00000000000..ea329be6ab3
--- /dev/null
+++ b/js/src/Ice/WSTransceiver.js
@@ -0,0 +1,10 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+// dummy WSS trasnsceiver for nodejs
diff --git a/js/src/Ice/sources.json b/js/src/Ice/sources.json
new file mode 100644
index 00000000000..534bbb2bde9
--- /dev/null
+++ b/js/src/Ice/sources.json
@@ -0,0 +1,114 @@
+{
+    "modules": [
+        "Ice", "IceMX", "IceSSL"],
+    "slice":[
+        "Ice/BuiltinSequences.ice", 
+        "Ice/Connection.ice", 
+        "Ice/ConnectionF.ice", 
+        "Ice/Current.ice", 
+        "Ice/Endpoint.ice",
+        "Ice/EndpointF.ice", 
+        "Ice/EndpointTypes.ice",
+        "Ice/Identity.ice", 
+        "Ice/LocalException.ice",
+        "Ice/Locator.ice",
+        "Ice/Metrics.ice",
+        "Ice/ObjectAdapterF.ice",
+        "Ice/Process.ice",
+        "Ice/ProcessF.ice",
+        "Ice/PropertiesAdmin.ice",
+        "Ice/Router.ice",
+        "Ice/SliceChecksumDict.ice", 
+        "Ice/Version.ice",
+        "IceSSL/EndpointInfo.ice"],
+    
+    "common": [
+        "ACM.js",
+        "Address.js",
+        "ArrayUtil.js",
+        "AsyncResult.js",
+        "AsyncResultBase.js",
+        "AsyncStatus.js",
+        "Base64.js",
+        "BasicStream.js",
+        "Class.js",
+        "Communicator.js",
+        "CompactIdRegistry.js",
+        "ConnectionI.js",
+        "ConnectionRequestHandler.js",
+        "ConnectRequestHandler.js",
+        "DefaultsAndOverrides.js",
+        "DispatchStatus.js",
+        "EndpointI.js",
+        "EndpointFactoryManager.js",
+        "EnumBase.js",
+        "Exception.js",
+        "ExUtil.js",
+        "FormatType.js",
+        "HashMap.js",
+        "HashUtil.js",
+        "IdentityUtil.js",
+        "ImplicitContextI.js",
+        "IncomingAsync.js",
+        "Initialize.js",
+        "Instance.js",
+        "IPEndpointI.js",
+        "LocatorInfo.js",
+        "LocatorManager.js",
+        "LocatorTable.js",
+        "Logger.js",
+        "Long.js",
+        "Object.js",
+        "ObjectAdapterFactory.js",
+        "ObjectAdapterI.js",
+        "ObjectFactory.js",
+        "ObjectFactoryManager.js",
+        "ObjectPrx.js",
+        "OpaqueEndpointI.js",
+        "Operation.js",
+        "OptionalFormat.js",
+        "OutgoingAsync.js",
+        "OutgoingConnectionFactory.js",
+        "ProcessLogger.js",
+        "Promise.js",
+        "Properties.js",
+        "Property.js",
+        "PropertyNames.js",
+        "Protocol.js",
+        "ProtocolInstance.js",
+        "ProxyFactory.js",
+        "Reference.js",
+        "ReferenceMode.js",
+        "RequestHandlerFactory.js",
+        "RetryException.js",
+        "RetryQueue.js",
+        "RouterInfo.js",
+        "RouterManager.js",
+        "ServantManager.js",
+        "SocketOperation.js",
+        "StreamHelpers.js",
+        "StringUtil.js",
+        "Struct.js",
+        "TcpEndpointFactory.js",
+        "TcpEndpointI.js",
+        "Timer.js",
+        "TraceLevels.js",
+        "TraceUtil.js",
+        "UnknownSlicedObject.js",
+        "UUID.js",
+        "WSEndpoint.js",
+        "WSEndpointFactory.js"],
+    
+    "node":[
+        "Debug.js",
+        "Buffer.js",
+        "Ice.js",
+        "ModuleRegistry.js",
+        "TcpTransceiver.js"],
+    
+    "browser":[
+        "browser/Buffer.js",
+        "browser/Debug.js",
+        "browser/ModuleRegistry.js",
+        "browser/WSTransceiver.js"]
+}
diff --git a/js/src/IceGrid/.depend.mak b/js/src/IceGrid/.depend.mak
deleted file mode 100644
index 28c048540ba..00000000000
--- a/js/src/IceGrid/.depend.mak
+++ /dev/null
@@ -1,85 +0,0 @@
-
-Admin.js: \
-    "$(slicedir)\IceGrid\Admin.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-Descriptor.js: \
-    "$(slicedir)\IceGrid\Descriptor.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Exception.js: \
-    "$(slicedir)\IceGrid\Exception.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-FileParser.js: \
-    "$(slicedir)\IceGrid\FileParser.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-Locator.js: \
-    "$(slicedir)\IceGrid\Locator.ice" \
-    "$(slicedir)/Ice/Locator.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
-
-Observer.js: \
-    "$(slicedir)\IceGrid\Observer.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice"
-
-Query.js: \
-    "$(slicedir)\IceGrid\Query.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/IceGrid/Exception.ice"
-
-Registry.js: \
-    "$(slicedir)\IceGrid\Registry.ice" \
-    "$(slicedir)/IceGrid/Exception.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/IceGrid/Session.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Admin.ice" \
-    "$(slicedir)/Ice/Properties.ice" \
-    "$(slicedir)/Ice/PropertiesAdmin.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceGrid/Descriptor.ice"
-
-Session.js: \
-    "$(slicedir)\IceGrid\Session.ice" \
-    "$(slicedir)/Glacier2/Session.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Glacier2/SSLInfo.ice" \
-    "$(slicedir)/IceGrid/Exception.ice"
-
-UserAccountMapper.js: \
-    "$(slicedir)\IceGrid\UserAccountMapper.ice"
diff --git a/js/src/IceGrid/Makefile b/js/src/IceGrid/Makefile
deleted file mode 100644
index e2ff52495a5..00000000000
--- a/js/src/IceGrid/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBNAME = IceGrid
-
-MODULES = $(LIBNAME)
-
-TARGETS	= $(call mklibtargets,$(LIBNAME))
-
-SLICES = \
-	$(SDIR)/Admin.ice \
-	$(SDIR)/Descriptor.ice \
-	$(SDIR)/Exception.ice \
-	$(SDIR)/FileParser.ice \
-	$(SDIR)/Locator.ice \
-	$(SDIR)/Observer.ice \
-	$(SDIR)/Query.ice \
-	$(SDIR)/Registry.ice \
-	$(SDIR)/Session.ice \
-	$(SDIR)/UserAccountMapper.ice
-
-SDIR	= $(slicedir)/IceGrid
-
-GEN_SRCS = $(patsubst $(SDIR)/%.ice, %.js, $(SLICES))
-
-SRCS		:= $(GEN_SRCS)
-INSTALL_SRCS	:= IceGrid.js $(GEN_SRCS)
-
-include $(top_srcdir)/config/Make.rules.js
-
-SLICE2JSFLAGS	:= $(SLICE2JSFLAGS) --ice -I$(slicedir) --icejs
-
-lint:: $(INSTALL_SRCS)
-	jshint $(LINTFLAGS) $(INSTALL_SRCS)
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBNAME))
-	$(call installmodule,$(DESTDIR)$(install_moduledir),$(INSTALL_SRCS),$(LIBNAME))
diff --git a/js/src/IceGrid/Makefile.mak b/js/src/IceGrid/Makefile.mak
deleted file mode 100644
index 6fa1148cfc0..00000000000
--- a/js/src/IceGrid/Makefile.mak
+++ /dev/null
@@ -1,44 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME = IceGrid
-
-MODULES = $(LIBNAME)
-
-GEN_SRCS = \
-	Admin.js \
-	Descriptor.js \
-	Exception.js \
-	FileParser.js \
-	Locator.js \
-	Observer.js \
-	Query.js \
-	Registry.js \
-	Session.js \
-	UserAccountMapper.js
-
-SDIR		= $(slicedir)\IceGrid
-
-SRCS		= $(GEN_SRCS)
-INSTALL_SRCS	= IceGrid.js $(GEN_SRCS)
-
-!include $(top_srcdir)\config\Make.rules.mak.js
-
-SLICE2JSFLAGS	= $(SLICE2JSFLAGS) --ice -I"$(slicedir)" --icejs
-
-MODULEDIR       = $(install_moduledir)\$(LIBNAME)
-
-install:: all
-        @if not exist $(MODULEDIR) \
-            @echo "Creating $(MODULEDIR)" && \
-            mkdir "$(MODULEDIR)"
-        @for %i in ( $(INSTALL_SRCS) ) do \
-            copy %i "$(MODULEDIR)"
diff --git a/js/src/IceGrid/sources.json b/js/src/IceGrid/sources.json
new file mode 100644
index 00000000000..3ccaca61e66
--- /dev/null
+++ b/js/src/IceGrid/sources.json
@@ -0,0 +1,19 @@
+{
+    "modules": [
+        "IceGrid"],
+    
+    "slice":[
+        "IceGrid/Admin.ice", 
+        "IceGrid/Descriptor.ice",
+        "IceGrid/Exception.ice",
+        "IceGrid/FileParser.ice",
+        "IceGrid/Locator.ice",
+        "IceGrid/Observer.ice",
+        "IceGrid/Query.ice",
+        "IceGrid/Registry.ice",
+        "IceGrid/Session.ice", 
+        "IceGrid/UserAccountMapper.ice"],
+
+    "common":
+        ["IceGrid/IceGrid.js"]
+}
\ No newline at end of file
diff --git a/js/src/IceStorm/.depend.mak b/js/src/IceStorm/.depend.mak
deleted file mode 100644
index b7fa2314d64..00000000000
--- a/js/src/IceStorm/.depend.mak
+++ /dev/null
@@ -1,13 +0,0 @@
-
-IceStorm.js: \
-    "$(slicedir)\IceStorm\IceStorm.ice" \
-    "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/SliceChecksumDict.ice" \
-    "$(slicedir)/IceStorm/Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
-
-Metrics.js: \
-    "$(slicedir)\IceStorm\Metrics.ice" \
-    "$(slicedir)/Ice/Metrics.ice" \
-    "$(slicedir)/Ice/BuiltinSequences.ice"
diff --git a/js/src/IceStorm/Makefile b/js/src/IceStorm/Makefile
deleted file mode 100644
index 7d6d43aef50..00000000000
--- a/js/src/IceStorm/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../..
-
-LIBNAME = IceStorm
-
-MODULES = $(LIBNAME)
-
-TARGETS	= $(call mklibtargets,$(LIBNAME))
-
-SLICES = $(SDIR)/IceStorm.ice \
-	$(SDIR)/Metrics.ice
-
-SDIR	= $(slicedir)/IceStorm
-
-GEN_SRCS = $(patsubst $(SDIR)/%.ice, %.js, $(SLICES))
-
-SRCS		:= $(GEN_SRCS)
-INSTALL_SRCS	:= $(SRCS)
-
-include $(top_srcdir)/config/Make.rules.js
-
-SLICE2JSFLAGS	:= $(SLICE2JSFLAGS) --ice -I$(slicedir) --icejs
-
-lint:: $(INSTALL_SRCS)
-	jshint $(LINTFLAGS) $(INSTALL_SRCS)
-
-install:: all
-	$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBNAME))
-	$(call installmodule,$(DESTDIR)$(install_moduledir),$(INSTALL_SRCS),$(LIBNAME))
diff --git a/js/src/IceStorm/Makefile.mak b/js/src/IceStorm/Makefile.mak
deleted file mode 100644
index bbe10d4b75f..00000000000
--- a/js/src/IceStorm/Makefile.mak
+++ /dev/null
@@ -1,35 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME = IceStorm
-
-MODULES = $(LIBNAME)
-
-GEN_SRCS = IceStorm.js \
-	   Metrics.js
-
-SDIR		= $(slicedir)\IceStorm
-
-SRCS		= $(GEN_SRCS)
-INSTALL_SRCS	= IceStorm.js $(GEN_SRCS)
-
-!include $(top_srcdir)\config\Make.rules.mak.js
-
-SLICE2JSFLAGS	= $(SLICE2JSFLAGS) --ice -I"$(slicedir)" --icejs
-
-MODULEDIR       = $(install_moduledir)\$(LIBNAME)
-
-install:: all
-        @if not exist $(MODULEDIR) \
-            @echo "Creating $(MODULEDIR)" && \
-            mkdir "$(MODULEDIR)"
-        @for %i in ( $(INSTALL_SRCS) ) do \
-            copy %i "$(MODULEDIR)"
diff --git a/js/src/IceStorm/sources.json b/js/src/IceStorm/sources.json
new file mode 100644
index 00000000000..220aa50d139
--- /dev/null
+++ b/js/src/IceStorm/sources.json
@@ -0,0 +1,4 @@
+{
+    "modules": ["IceStorm"],
+    "slice": ["IceStorm/IceStorm.ice", "IceStorm/Metrics.ice"]
+}
\ No newline at end of file
diff --git a/js/src/Makefile b/js/src/Makefile
deleted file mode 100644
index a101c0b2329..00000000000
--- a/js/src/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..
-
-include $(top_srcdir)/config/Make.rules.js
-
-SUBDIRS		= Ice Glacier2 IceStorm IceGrid
-
-.PHONY: $(EVERYTHING) $(SUBDIRS)
-
-
-all:: $(SUBDIRS)
-
-$(SUBDIRS):
-	@echo "making all in $@"
-	@$(MAKE) all --directory=$@
-
-$(EVERYTHING_EXCEPT_ALL)::
-	@for subdir in $(SUBDIRS); \
-        do \
-            if test -d $$subdir ; \
-            then \
-                echo "making $@ in $$subdir"; \
-                ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
-            fi; \
-        done
-
-install:: all
-	$(call installdata,icejs.js,$(DESTDIR)$(install_moduledir))
-	$(call installdata,package.json,$(DESTDIR)$(install_moduledir))
diff --git a/js/src/Makefile.mak b/js/src/Makefile.mak
deleted file mode 100644
index 4ad6e4b4fed..00000000000
--- a/js/src/Makefile.mak
+++ /dev/null
@@ -1,23 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ..
-
-!include $(top_srcdir)\config\Make.rules.mak.js
-
-SUBDIRS		= Ice Glacier2 IceStorm IceGrid
-
-$(EVERYTHING)::
-	@for %i in ( $(SUBDIRS) ) do \
-	    @echo "making $@ in %i" && \
-	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
-
-install:: all
-    copy icejs.js $(install_moduledir)
-    copy package.json $(install_moduledir)
\ No newline at end of file
diff --git a/js/src/package.json b/js/src/package.json
deleted file mode 100644
index f6ac953e608..00000000000
--- a/js/src/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "name": "icejs",
-    "version": "3.5.1",
-    "main": "icejs.js"
-}
diff --git a/js/src/icejs.js b/js/src/zeroc-icejs.js
index 4334949c418..c734d414036 100644
--- a/js/src/icejs.js
+++ b/js/src/zeroc-icejs.js
@@ -7,9 +7,9 @@
 //
 // **********************************************************************
 
-module.exports.Ice = require("./Ice/Ice").Ice;
-module.exports.IceMX = require("./Ice/Ice").IceMX;
-module.exports.IceSSL = require("./Ice/Ice").IceSSL;
+module.exports.Ice      = require("./Ice/Ice").Ice;
+module.exports.IceMX    = require("./Ice/Ice").IceMX;
+module.exports.IceSSL   = require("./Ice/Ice").IceSSL;
 module.exports.Glacier2 = require("./Glacier2/Glacier2").Glacier2;
-module.exports.IceGrid = require("./IceGrid/IceGrid").IceGrid;
+module.exports.IceGrid  = require("./IceGrid/IceGrid").IceGrid;
 module.exports.IceStorm = require("./IceStorm/IceStorm").IceStorm;