merging javascript branch

17 files changed, 28 insertions, 27 deletions

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.