diff options
Diffstat (limited to 'js/demo')
47 files changed, 12 insertions, 596 deletions
diff --git a/js/demo/ChatDemo/.depend.mak b/js/demo/ChatDemo/.depend.mak deleted file mode 100644 index cc1fb2a1c2b..00000000000 --- a/js/demo/ChatDemo/.depend.mak +++ /dev/null @@ -1,11 +0,0 @@ - -Chat.js: \ - .\Chat.ice - -ChatSession.js: \ - .\ChatSession.ice \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Glacier2/Session.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Glacier2/SSLInfo.ice" \ - ./Chat.ice diff --git a/js/demo/ChatDemo/Makefile b/js/demo/ChatDemo/Makefile deleted file mode 100644 index 5cc8d2ba0d3..00000000000 --- a/js/demo/ChatDemo/Makefile +++ /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 = ../.. - -TARGETS = Chat.js ChatSession.js - -ifeq ($(OPTIMIZE),yes) -TARGETS := $(TARGETS) Client.min.js Client.min.js.gz -endif - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) -I. - - -ifeq ($(OPTIMIZE),yes) - -CLOSUREFLAGS := $(CLOSUREFLAGS) --warning_level QUIET - -Client.min.js: $(libdir)/Ice.min.js $(libdir)/Glacier2.min.js Client.js Chat.js ChatSession.js - @rm -f browser/Client.min.js - java -jar $(CLOSURE_COMPILER) $(CLOSUREFLAGS) --js $(libdir)/Ice.min.js $(libdir)/Glacier2.min.js \ - Chat.js ChatSession.js Client.js --js_output_file Client.min.js - -Client.min.js.gz: Client.min.js $(libdir)/Ice.min.js $(libdir)/Glacier2.min.js - @rm -f browser/Client.min.js.gz - gzip -c9 Client.min.js > Client.min.js.gz -endif diff --git a/js/demo/ChatDemo/Makefile.mak b/js/demo/ChatDemo/Makefile.mak deleted file mode 100644 index d79fd18beac..00000000000 --- a/js/demo/ChatDemo/Makefile.mak +++ /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 = ..\.. - -GEN_SRCS = Chat.js ChatSession.js - -!if "$(OPTIMIZE)" == "yes" -TARGETS = $(GEN_SRCS) Client.min.js - -!if "$(GZIP_PATH)" != "" -TARGETS = $(GEN_SRCS) Client.min.js.gz -!endif - -!endif - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" -I. - -!if "$(OPTIMIZE)" == "yes" - -CLOSUREFLAGS = $(CLOSUREFLAGS) --warning_level QUIET - -Client.min.js: Client.js Chat.js ChatSession.js $(libdir)\Ice.min.js $(libdir)\Glacier2.min.js - @del /q Client.min.js - java -jar $(CLOSURE_COMPILER) $(CLOSUREFLAGS) --js $(libdir)\Ice.js $(libdir)\Glacier2.js \ - Chat.js ChatSession.js Client.js --js_output_file Client.min.js - -!if "$(GZIP_PATH)" != "" -Client.min.js.gz: Client.min.js - @del /q Client.min.js.gz - "$(GZIP_PATH)" -c9 Client.min.js > Client.min.js.gz -!endif - -!endif diff --git a/js/demo/ChatDemo/build.js b/js/demo/ChatDemo/build.js deleted file mode 100644 index 75c984102fe..00000000000 --- a/js/demo/ChatDemo/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require ("../../config/build").build(__dirname, ["Chat.ice", "ChatSession.ice"], ["-I."]); diff --git a/js/demo/ChatDemo/index.html b/js/demo/ChatDemo/index.html index 7f904d46f54..f74b5957a79 100644 --- a/js/demo/ChatDemo/index.html +++ b/js/demo/ChatDemo/index.html @@ -254,7 +254,8 @@ "menubar=no,scrollbars=yes,resizable=yes,toolbar=no"); return false; }); - + /* jshint browser:true, jquery:true */ + /* global checkGenerated: false */ if(["http:", "https:"].indexOf(document.location.protocol) !== -1) { checkGenerated(["Chat.js"]); diff --git a/js/demo/Glacier2/Makefile b/js/demo/Glacier2/Makefile deleted file mode 100644 index 7477f8ab00c..00000000000 --- a/js/demo/Glacier2/Makefile +++ /dev/null @@ -1,22 +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 = chat - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done - diff --git a/js/demo/Glacier2/Makefile.mak b/js/demo/Glacier2/Makefile.mak deleted file mode 100644 index 5741e662e6b..00000000000 --- a/js/demo/Glacier2/Makefile.mak +++ /dev/null @@ -1,19 +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 = chat - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/js/demo/Glacier2/build.js b/js/demo/Glacier2/build.js deleted file mode 100644 index b1d63b1a2e8..00000000000 --- a/js/demo/Glacier2/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require("../../config/build.js").buildDirectory(__dirname);
\ No newline at end of file diff --git a/js/demo/Glacier2/chat/.depend.mak b/js/demo/Glacier2/chat/.depend.mak deleted file mode 100644 index 0755641e27d..00000000000 --- a/js/demo/Glacier2/chat/.depend.mak +++ /dev/null @@ -1,7 +0,0 @@ - -Chat.js: \ - .\Chat.ice \ - "$(slicedir)/Glacier2/Session.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" \ - "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Glacier2/SSLInfo.ice" diff --git a/js/demo/Glacier2/chat/Client.js b/js/demo/Glacier2/chat/Client.js index 1ae8f9edaa7..7eddbc13ef8 100644 --- a/js/demo/Glacier2/chat/Client.js +++ b/js/demo/Glacier2/chat/Client.js @@ -7,8 +7,8 @@ // // ********************************************************************** -var Ice = require("icejs").Ice; -var Glacier2 = require("icejs").Glacier2; +var Ice = require("zeroc-icejs").Ice; +var Glacier2 = require("zeroc-icejs").Glacier2; var Demo = require("./Chat").Demo; // diff --git a/js/demo/Glacier2/chat/Makefile b/js/demo/Glacier2/chat/Makefile deleted file mode 100644 index 542cbb0040b..00000000000 --- a/js/demo/Glacier2/chat/Makefile +++ /dev/null @@ -1,16 +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 = ../../.. - -TARGETS = Chat.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) diff --git a/js/demo/Glacier2/chat/Makefile.mak b/js/demo/Glacier2/chat/Makefile.mak deleted file mode 100644 index ae6c4f9ce0c..00000000000 --- a/js/demo/Glacier2/chat/Makefile.mak +++ /dev/null @@ -1,16 +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 = ..\..\.. - -GEN_SRCS = Chat.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/demo/Glacier2/chat/build.js b/js/demo/Glacier2/chat/build.js deleted file mode 100644 index 3d7d64f2d61..00000000000 --- a/js/demo/Glacier2/chat/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require ("../../../config/build").build(__dirname, ["Chat.ice"]); diff --git a/js/demo/Ice/Makefile b/js/demo/Ice/Makefile deleted file mode 100644 index e712e1b4c47..00000000000 --- a/js/demo/Ice/Makefile +++ /dev/null @@ -1,26 +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 = hello \ - latency \ - minimal \ - throughput \ - bidir - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done - diff --git a/js/demo/Ice/Makefile.mak b/js/demo/Ice/Makefile.mak deleted file mode 100644 index d0788565168..00000000000 --- a/js/demo/Ice/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 = hello \ - latency \ - minimal \ - throughput \ - bidir - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/js/demo/Ice/bidir/.depend.mak b/js/demo/Ice/bidir/.depend.mak deleted file mode 100644 index c77a5dc16aa..00000000000 --- a/js/demo/Ice/bidir/.depend.mak +++ /dev/null @@ -1,4 +0,0 @@ - -Callback.js: \ - .\Callback.ice \ - "$(slicedir)/Ice/Identity.ice" diff --git a/js/demo/Ice/bidir/Client.js b/js/demo/Ice/bidir/Client.js index dfda491450d..c36b7197af8 100644 --- a/js/demo/Ice/bidir/Client.js +++ b/js/demo/Ice/bidir/Client.js @@ -7,7 +7,7 @@ // // ********************************************************************** -var Ice = require("icejs").Ice; +var Ice = require("zeroc-icejs").Ice; var Demo = require("./Callback").Demo; // diff --git a/js/demo/Ice/bidir/Makefile b/js/demo/Ice/bidir/Makefile deleted file mode 100644 index 5ea5f7b6123..00000000000 --- a/js/demo/Ice/bidir/Makefile +++ /dev/null @@ -1,16 +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 = ../../.. - -TARGETS = Callback.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) diff --git a/js/demo/Ice/bidir/Makefile.mak b/js/demo/Ice/bidir/Makefile.mak deleted file mode 100644 index 64413e11005..00000000000 --- a/js/demo/Ice/bidir/Makefile.mak +++ /dev/null @@ -1,16 +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 = ..\..\.. - -GEN_SRCS = Callback.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/demo/Ice/bidir/build.js b/js/demo/Ice/bidir/build.js deleted file mode 100644 index 5daf1f77267..00000000000 --- a/js/demo/Ice/bidir/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require ("../../../config/build").build(__dirname, ["Callback.ice"]);
\ No newline at end of file diff --git a/js/demo/Ice/build.js b/js/demo/Ice/build.js deleted file mode 100644 index b1d63b1a2e8..00000000000 --- a/js/demo/Ice/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require("../../config/build.js").buildDirectory(__dirname);
\ No newline at end of file diff --git a/js/demo/Ice/hello/.depend.mak b/js/demo/Ice/hello/.depend.mak deleted file mode 100644 index cbd82174dc8..00000000000 --- a/js/demo/Ice/hello/.depend.mak +++ /dev/null @@ -1,5 +0,0 @@ - -Hello.js: \ - .\Hello.ice \ - "$(slicedir)/Ice/Metrics.ice" \ - "$(slicedir)/Ice/BuiltinSequences.ice" diff --git a/js/demo/Ice/hello/Client.js b/js/demo/Ice/hello/Client.js index f5d6edc5084..822f98d4e8e 100644 --- a/js/demo/Ice/hello/Client.js +++ b/js/demo/Ice/hello/Client.js @@ -7,7 +7,7 @@ // // ********************************************************************** -var Ice = require("icejs").Ice; +var Ice = require("zeroc-icejs").Ice; var Demo = require("./Hello").Demo; function menu() diff --git a/js/demo/Ice/hello/Hello.ice b/js/demo/Ice/hello/Hello.ice index 14bd1c5bf85..31a0efbe21b 100644 --- a/js/demo/Ice/hello/Hello.ice +++ b/js/demo/Ice/hello/Hello.ice @@ -9,7 +9,6 @@ #pragma once -#include <Ice/Metrics.ice> module Demo { @@ -19,10 +18,5 @@ interface Hello void shutdown(); }; -class MyMetrics extends IceMX::Metrics -{ - string foo; -}; - }; diff --git a/js/demo/Ice/hello/Makefile b/js/demo/Ice/hello/Makefile deleted file mode 100644 index 465bd9c2a1d..00000000000 --- a/js/demo/Ice/hello/Makefile +++ /dev/null @@ -1,16 +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 = ../../.. - -TARGETS = Hello.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) diff --git a/js/demo/Ice/hello/Makefile.mak b/js/demo/Ice/hello/Makefile.mak deleted file mode 100644 index dd57d7bea37..00000000000 --- a/js/demo/Ice/hello/Makefile.mak +++ /dev/null @@ -1,16 +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 = ..\..\.. - -GEN_SRCS = Hello.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/demo/Ice/hello/browser/Client.js b/js/demo/Ice/hello/browser/Client.js index 8ce88b9e2f5..71355056173 100644 --- a/js/demo/Ice/hello/browser/Client.js +++ b/js/demo/Ice/hello/browser/Client.js @@ -256,11 +256,11 @@ $("#mode").on("change", function(e) { var newMode = $(this).val(); - + var href; if(document.location.protocol === "http:" && (newMode === "twoway-secure" || newMode === "oneway-secure" || newMode === "oneway-batch-secure")) { - var href = document.location.protocol + "//" + document.location.host + + href = document.location.protocol + "//" + document.location.host + document.location.pathname + "?mode=" + newMode; href = href.replace("http", "https"); href = href.replace("8080", "9090"); @@ -269,7 +269,7 @@ $("#mode").on("change", else if (document.location.protocol === "https:" && (newMode === "twoway" || newMode === "oneway" || newMode === "oneway-batch")) { - var href = document.location.protocol + "//" + document.location.host + + href = document.location.protocol + "//" + document.location.host + document.location.pathname + "?mode=" + newMode; href = href.replace("https", "http"); href = href.replace("9090", "8080"); diff --git a/js/demo/Ice/hello/build.js b/js/demo/Ice/hello/build.js deleted file mode 100644 index ef4b8e383fb..00000000000 --- a/js/demo/Ice/hello/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -var build = require ("../../../config/build").build(__dirname, ["Hello.ice"]); diff --git a/js/demo/Ice/latency/.depend.mak b/js/demo/Ice/latency/.depend.mak deleted file mode 100644 index 8c04c73a144..00000000000 --- a/js/demo/Ice/latency/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Latency.js: \ - .\Latency.ice diff --git a/js/demo/Ice/latency/Client.js b/js/demo/Ice/latency/Client.js index 8d94ca26d54..5b997bfea73 100644 --- a/js/demo/Ice/latency/Client.js +++ b/js/demo/Ice/latency/Client.js @@ -7,7 +7,7 @@ // // ********************************************************************** -var Ice = require("icejs").Ice; +var Ice = require("zeroc-icejs").Ice; var Demo = require("./Latency").Demo; var communicator; diff --git a/js/demo/Ice/latency/Makefile b/js/demo/Ice/latency/Makefile deleted file mode 100644 index f1a822683a1..00000000000 --- a/js/demo/Ice/latency/Makefile +++ /dev/null @@ -1,16 +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 = ../../.. - -TARGETS = Latency.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) diff --git a/js/demo/Ice/latency/Makefile.mak b/js/demo/Ice/latency/Makefile.mak deleted file mode 100644 index d97ae8361bd..00000000000 --- a/js/demo/Ice/latency/Makefile.mak +++ /dev/null @@ -1,16 +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 = ..\..\.. - -GEN_SRCS = Latency.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/demo/Ice/latency/build.js b/js/demo/Ice/latency/build.js deleted file mode 100644 index 759f0013c80..00000000000 --- a/js/demo/Ice/latency/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require ("../../../config/build").build(__dirname, ["Latency.ice"]); diff --git a/js/demo/Ice/minimal/.depend.mak b/js/demo/Ice/minimal/.depend.mak deleted file mode 100644 index c2b5f704d81..00000000000 --- a/js/demo/Ice/minimal/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Hello.js: \ - .\Hello.ice diff --git a/js/demo/Ice/minimal/Client.js b/js/demo/Ice/minimal/Client.js index 52afea1e093..49c8f3e0ce4 100644 --- a/js/demo/Ice/minimal/Client.js +++ b/js/demo/Ice/minimal/Client.js @@ -7,7 +7,7 @@ // // ********************************************************************** -var Ice = require("icejs").Ice; +var Ice = require("zeroc-icejs").Ice; var Demo = require("./Hello").Demo; var communicator; diff --git a/js/demo/Ice/minimal/Makefile b/js/demo/Ice/minimal/Makefile deleted file mode 100644 index cb3ee0772fe..00000000000 --- a/js/demo/Ice/minimal/Makefile +++ /dev/null @@ -1,33 +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 = ../../.. - -TARGETS = Hello.js - -ifeq ($(OPTIMIZE),yes) -TARGETS := $(TARGETS) browser/Client.min.js browser/Client.min.js.gz -endif - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) - -ifeq ($(OPTIMIZE),yes) - -CLOSUREFLAGS := $(CLOSUREFLAGS) --warning_level QUIET - -browser/Client.min.js: Hello.js browser/Client.js $(libdir)/Ice.min.js - @rm -f browser/Client.min.js - java -jar $(CLOSURE_COMPILER) $(CLOSUREFLAGS) --js $(libdir)/Ice.min.js Hello.js browser/Client.js --js_output_file browser/Client.min.js - -browser/Client.min.js.gz: browser/Client.min.js $(libdir)/Ice.min.js - @rm -f browser/Client.min.js.gz - gzip -c9 browser/Client.min.js > browser/Client.min.js.gz -endif diff --git a/js/demo/Ice/minimal/Makefile.mak b/js/demo/Ice/minimal/Makefile.mak deleted file mode 100644 index 4e368b37964..00000000000 --- a/js/demo/Ice/minimal/Makefile.mak +++ /dev/null @@ -1,41 +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 = ..\..\.. - -GEN_SRCS = Hello.js - -!if "$(OPTIMIZE)" == "yes" -TARGETS = $(GEN_SRCS) browser\Client.min.js - -!if "$(GZIP_PATH)" != "" -TARGETS = $(GEN_SRCS) browser\Client.min.js.gz -!endif - -!endif - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" -!if "$(OPTIMIZE)" == "yes" - -CLOSUREFLAGS = $(CLOSUREFLAGS) --warning_level QUIET - -browser\Client.min.js: browser\Client.js Hello.js $(libdir)\Ice.min.js - @del /q browser\Client.min.js - java -jar $(CLOSURE_COMPILER) $(CLOSUREFLAGS) --js $(libdir)\Ice.js Hello.js \ - browser\Client.js --js_output_file browser\Client.min.js - -!if "$(GZIP_PATH)" != "" -browser\Client.min.js.gz: browser\Client.min.js - @del /q Client.min.js.gz - "$(GZIP_PATH)" -c9 browser\Client.min.js > browser\Client.min.js.gz -!endif - -!endif diff --git a/js/demo/Ice/minimal/build.js b/js/demo/Ice/minimal/build.js deleted file mode 100644 index 83ba7e8b57f..00000000000 --- a/js/demo/Ice/minimal/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require ("../../../config/build").build(__dirname, ["Hello.ice"]); diff --git a/js/demo/Ice/minimal/index.html b/js/demo/Ice/minimal/index.html index cf3c872d667..92647e3623e 100644 --- a/js/demo/Ice/minimal/index.html +++ b/js/demo/Ice/minimal/index.html @@ -171,7 +171,6 @@ // Web browsers does not allow WS connections from // HTTPS pages. // - if(document.location.protocol === "https:") { var href = "http://" + document.location.hostname + ":8080" + document.location.pathname; diff --git a/js/demo/Ice/throughput/.depend.mak b/js/demo/Ice/throughput/.depend.mak deleted file mode 100644 index 6ee711b6551..00000000000 --- a/js/demo/Ice/throughput/.depend.mak +++ /dev/null @@ -1,3 +0,0 @@ - -Throughput.js: \ - .\Throughput.ice diff --git a/js/demo/Ice/throughput/Client.js b/js/demo/Ice/throughput/Client.js index 28753b2e3a6..5ca2879fe90 100644 --- a/js/demo/Ice/throughput/Client.js +++ b/js/demo/Ice/throughput/Client.js @@ -7,7 +7,7 @@ // // ********************************************************************** -var Ice = require("icejs").Ice; +var Ice = require("zeroc-icejs").Ice; var Demo = require("./Throughput").Demo; function menu() diff --git a/js/demo/Ice/throughput/Makefile b/js/demo/Ice/throughput/Makefile deleted file mode 100644 index f007f54248b..00000000000 --- a/js/demo/Ice/throughput/Makefile +++ /dev/null @@ -1,16 +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 = ../../.. - -TARGETS = Throughput.js - -include $(top_srcdir)/config/Make.rules.js - -SLICE2JSFLAGS := $(SLICE2JSFLAGS) -I$(slicedir) diff --git a/js/demo/Ice/throughput/Makefile.mak b/js/demo/Ice/throughput/Makefile.mak deleted file mode 100644 index fd74504cc82..00000000000 --- a/js/demo/Ice/throughput/Makefile.mak +++ /dev/null @@ -1,16 +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 = ..\..\.. - -GEN_SRCS = Throughput.js - -!include $(top_srcdir)\config\Make.rules.mak.js - -SLICE2JSFLAGS = $(SLICE2JSFLAGS) -I"$(slicedir)" diff --git a/js/demo/Ice/throughput/build.js b/js/demo/Ice/throughput/build.js deleted file mode 100644 index 8678807f22f..00000000000 --- a/js/demo/Ice/throughput/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require ("../../../config/build").build(__dirname, ["Throughput.ice"]); diff --git a/js/demo/Makefile b/js/demo/Makefile deleted file mode 100644 index 50bb4a6a210..00000000000 --- a/js/demo/Makefile +++ /dev/null @@ -1,22 +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 ChatDemo - -$(EVERYTHING):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done - diff --git a/js/demo/Makefile.mak b/js/demo/Makefile.mak deleted file mode 100644 index e47593e392b..00000000000 --- a/js/demo/Makefile.mak +++ /dev/null @@ -1,19 +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 ChatDemo - -$(EVERYTHING):: - @for %i in ( $(SUBDIRS) ) do \ - @echo "making $@ in %i" && \ - cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 diff --git a/js/demo/build.js b/js/demo/build.js deleted file mode 100644 index fca34d1f2af..00000000000 --- a/js/demo/build.js +++ /dev/null @@ -1,10 +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. -// -// ********************************************************************** - -require("../config/build.js").buildDirectory(__dirname);
\ No newline at end of file |