merging javascript branch

40 files changed, 59 insertions, 53 deletions

diff --git a/demoscript/Freeze/__init__.py b/demoscript/Freeze/__init__.py
index be3e0c74888..ef96a353f70 100755
--- a/demoscript/Freeze/__init__.py
+++ b/demoscript/Freeze/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Freeze/bench.py b/demoscript/Freeze/bench.py
index 15becc0ff4d..4e4c21222f0 100755
--- a/demoscript/Freeze/bench.py
+++ b/demoscript/Freeze/bench.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Freeze/casino.py b/demoscript/Freeze/casino.py
index 05245462b9c..6923c46cec3 100755
--- a/demoscript/Freeze/casino.py
+++ b/demoscript/Freeze/casino.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Freeze/library.py b/demoscript/Freeze/library.py
index 5adaa8593a6..50908567909 100755
--- a/demoscript/Freeze/library.py
+++ b/demoscript/Freeze/library.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Freeze/phonebook.py b/demoscript/Freeze/phonebook.py
index a2f38da587d..843db7dcccb 100755
--- a/demoscript/Freeze/phonebook.py
+++ b/demoscript/Freeze/phonebook.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Freeze/transform.py b/demoscript/Freeze/transform.py
index 0feb569365c..517cc8eb671 100755
--- a/demoscript/Freeze/transform.py
+++ b/demoscript/Freeze/transform.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Glacier2/__init__.py b/demoscript/Glacier2/__init__.py
index be3e0c74888..ef96a353f70 100755
--- a/demoscript/Glacier2/__init__.py
+++ b/demoscript/Glacier2/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Glacier2/callback.py b/demoscript/Glacier2/callback.py
index a9996442371..a74456f879c 100755
--- a/demoscript/Glacier2/callback.py
+++ b/demoscript/Glacier2/callback.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/__init__.py b/demoscript/Ice/__init__.py
index 05594b656d0..3ada3fc9a65 100644
--- a/demoscript/Ice/__init__.py
+++ b/demoscript/Ice/__init__.py
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/async.py b/demoscript/Ice/async.py
index a4cfe44f0c5..72a4f6d7be0 100644
--- a/demoscript/Ice/async.py
+++ b/demoscript/Ice/async.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/bidir.py b/demoscript/Ice/bidir.py
index aec9d62ed1c..1885b42bce3 100644
--- a/demoscript/Ice/bidir.py
+++ b/demoscript/Ice/bidir.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/callback.py b/demoscript/Ice/callback.py
index 2a0f97ece50..91ab0f49657 100644
--- a/demoscript/Ice/callback.py
+++ b/demoscript/Ice/callback.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py
index d3287701606..f4cb5770b5b 100644
--- a/demoscript/Ice/hello.py
+++ b/demoscript/Ice/hello.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
@@ -11,7 +11,7 @@
 import sys
 import Expect
 
-def runtests(client, server, secure):
+def runtests(client, server, secure, datagram):
     sys.stdout.write("testing twoway ")
     sys.stdout.flush()
     client.sendline('t')
@@ -20,7 +20,7 @@ def runtests(client, server, secure):
     sys.stdout.flush()
     client.sendline('o')
     server.expect('Hello World!')
-    if not secure:
+    if not secure and datagram:
         sys.stdout.write("datagram ")
         sys.stdout.flush()
         client.sendline('d')
@@ -38,7 +38,7 @@ def runtests(client, server, secure):
     client.sendline('f')
     server.expect('Hello World!')
     server.expect('Hello World!')
-    if not secure:
+    if not secure and datagram:
         sys.stdout.write("datagram ")
         sys.stdout.flush()
         client.sendline('D')
@@ -68,17 +68,18 @@ def runtests(client, server, secure):
     client.sendline('T')
     print("ok")
 
-def run(client, server):
-    runtests(client, server, False)
+def run(client, server, sslSupport = True, datagramSupport = True):
+    runtests(client, server, False, datagramSupport)
 
-    print("repeating tests with SSL")
+    if sslSupport:
+        print("repeating tests with SSL")
+        client.sendline('S')
 
-    client.sendline('S')
-
-    runtests(client, server, True)
+        runtests(client, server, True, datagramSupport)
 
     client.sendline('s')
     server.waitTestSuccess()
-
+    print("server shutdown");
     client.sendline('x')
     client.waitTestSuccess()
+    print("client shutdown");
\ No newline at end of file
diff --git a/demoscript/Ice/interleaved.py b/demoscript/Ice/interleaved.py
index 7abc0d7d99c..17f902e6054 100644
--- a/demoscript/Ice/interleaved.py
+++ b/demoscript/Ice/interleaved.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/invoke.py b/demoscript/Ice/invoke.py
index 5d8e2050b4d..e60f2a71441 100644
--- a/demoscript/Ice/invoke.py
+++ b/demoscript/Ice/invoke.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py
index 661e6abb519..059fe37cf9c 100644
--- a/demoscript/Ice/multicast.py
+++ b/demoscript/Ice/multicast.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/nested.py b/demoscript/Ice/nested.py
index ee1e68c1953..880e1436046 100644
--- a/demoscript/Ice/nested.py
+++ b/demoscript/Ice/nested.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/nrvo.py b/demoscript/Ice/nrvo.py
index 4a1694d0658..606a5cda998 100644
--- a/demoscript/Ice/nrvo.py
+++ b/demoscript/Ice/nrvo.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/optional.py b/demoscript/Ice/optional.py
index 36596ea5f42..3fd82f6bda8 100644
--- a/demoscript/Ice/optional.py
+++ b/demoscript/Ice/optional.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/plugin.py b/demoscript/Ice/plugin.py
index f20c2cc38fd..ae0cd7b6513 100644
--- a/demoscript/Ice/plugin.py
+++ b/demoscript/Ice/plugin.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/properties.py b/demoscript/Ice/properties.py
index 013bc41e98e..059115a506a 100644
--- a/demoscript/Ice/properties.py
+++ b/demoscript/Ice/properties.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/serialize.py b/demoscript/Ice/serialize.py
index 017d16a9183..5e7b9f1fb78 100644
--- a/demoscript/Ice/serialize.py
+++ b/demoscript/Ice/serialize.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/session.py b/demoscript/Ice/session.py
index cb0f7e96592..dcf32f6f049 100644
--- a/demoscript/Ice/session.py
+++ b/demoscript/Ice/session.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/throughput.py b/demoscript/Ice/throughput.py
index 4fde1779c67..e44e201c430 100644
--- a/demoscript/Ice/throughput.py
+++ b/demoscript/Ice/throughput.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Ice/value.py b/demoscript/Ice/value.py
index 0d4b56f1373..c6a3db31b1f 100644
--- a/demoscript/Ice/value.py
+++ b/demoscript/Ice/value.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceBox/__init__.py b/demoscript/IceBox/__init__.py
index be3e0c74888..ef96a353f70 100755
--- a/demoscript/IceBox/__init__.py
+++ b/demoscript/IceBox/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceBox/hello.py b/demoscript/IceBox/hello.py
index a60afec8c85..6adc15a1bb5 100755
--- a/demoscript/IceBox/hello.py
+++ b/demoscript/IceBox/hello.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceGrid/__init__.py b/demoscript/IceGrid/__init__.py
index be3e0c74888..ef96a353f70 100755
--- a/demoscript/IceGrid/__init__.py
+++ b/demoscript/IceGrid/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceGrid/allocate.py b/demoscript/IceGrid/allocate.py
index 7b15b033627..eb47ca8ed19 100755
--- a/demoscript/IceGrid/allocate.py
+++ b/demoscript/IceGrid/allocate.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceGrid/icebox.py b/demoscript/IceGrid/icebox.py
index 7c14e43d72b..cb94aa7ae16 100755
--- a/demoscript/IceGrid/icebox.py
+++ b/demoscript/IceGrid/icebox.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceGrid/sessionActivation.py b/demoscript/IceGrid/sessionActivation.py
index 4ff647ae9b2..068f0052265 100755
--- a/demoscript/IceGrid/sessionActivation.py
+++ b/demoscript/IceGrid/sessionActivation.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceGrid/simple.py b/demoscript/IceGrid/simple.py
index 7b9b55ea6df..62e19490b0e 100755
--- a/demoscript/IceGrid/simple.py
+++ b/demoscript/IceGrid/simple.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceStorm/__init__.py b/demoscript/IceStorm/__init__.py
index be3e0c74888..ef96a353f70 100755
--- a/demoscript/IceStorm/__init__.py
+++ b/demoscript/IceStorm/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/IceStorm/clock.py b/demoscript/IceStorm/clock.py
index 88716d76e4c..48782154c62 100755
--- a/demoscript/IceStorm/clock.py
+++ b/demoscript/IceStorm/clock.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/Util.py b/demoscript/Util.py
index 9c3eaf1b067..7489ef6e022 100644
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
@@ -302,7 +302,7 @@ def configurePaths():
     # On Windows, C# assemblies are found thanks to the .exe.config files.
     #
     if isCompactFramework():
-        addPathToEnv("DEVPATH", os.path.join(getIceDir("cs"), "Assemblies", "cf"))
+        addenv("DEVPATH", os.path.join(getIceDir("cs"), "Assemblies", "cf"))
     elif isWin32():
         addenv("DEVPATH", os.path.join(getIceDir("cs"), "Assemblies"))
     else:
@@ -316,11 +316,16 @@ def configurePaths():
     else:
         addenv("PYTHONPATH", os.path.join(getIceDir("py"), "python"))
     addenv("RUBYLIB", os.path.join(getIceDir("rb"), "ruby"))
+    
+    if getMapping() == "js":
+        addenv("NODE_PATH", os.path.join(getIceDir("js"), "src"))
+        addenv("NODE_PATH", ".")
 
 # Mapping to the associated subdirectory.
 mappingDirs = {
     "cpp" : ( os.path.join("cpp", "demo"), "demo"),
     "java" : ( os.path.join("java", "demo"), "demoj"),
+    "js" : ( os.path.join("js", "demo"), "demojs"),
     "cs" : ( os.path.join("cs", "demo"), "democs"),
     "vb" : ( os.path.join("vb", "demo"), "demovb"),
     "py" : ( os.path.join("py", "demo"), "demopy"),
@@ -411,9 +416,9 @@ def getMapping():
     dir = here[len(toplevel)+1:].split(os.sep)[0]
 
     if sourcedist:
-        mapping = { "cpp": "cpp", "cs": "cs", "java": "java", "php": "php", "py": "py", "rb": "rb", "vb": "vb" }
+        mapping = { "cpp": "cpp", "cs": "cs", "java": "java", "js": "js", "php": "php", "py": "py", "rb": "rb", "vb": "vb" }
     else:
-        mapping = { "demo": "cpp", "democs": "cs", "demoj": "java", "demophp": "php", "demopy": "py",
+        mapping = { "demo": "cpp", "democs": "cs", "demoj": "java", "demojs": "js", "demophp": "php", "demopy": "py",
                     "demorb": "rb", "demovb": "vb" }
     return mapping[dir]
 
diff --git a/demoscript/__init__.py b/demoscript/__init__.py
index d2839e48ae1..c118f16c3ca 100644
--- a/demoscript/__init__.py
+++ b/demoscript/__init__.py
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/book/__init__.py b/demoscript/book/__init__.py
index be3e0c74888..ef96a353f70 100755
--- a/demoscript/book/__init__.py
+++ b/demoscript/book/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/book/evictor_filesystem.py b/demoscript/book/evictor_filesystem.py
index 0679072444b..ba5245bf685 100755
--- a/demoscript/book/evictor_filesystem.py
+++ b/demoscript/book/evictor_filesystem.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/book/lifecycle.py b/demoscript/book/lifecycle.py
index 0679072444b..ba5245bf685 100755
--- a/demoscript/book/lifecycle.py
+++ b/demoscript/book/lifecycle.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.
diff --git a/demoscript/book/map_filesystem.py b/demoscript/book/map_filesystem.py
index 0679072444b..ba5245bf685 100755
--- a/demoscript/book/map_filesystem.py
+++ b/demoscript/book/map_filesystem.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2014 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.