diff options
Diffstat (limited to 'py/demo')
83 files changed, 160 insertions, 97 deletions
diff --git a/py/demo/Glacier2/callback/Callback.ice b/py/demo/Glacier2/callback/Callback.ice index ad84e380b68..45ae3041a20 100644 --- a/py/demo/Glacier2/callback/Callback.ice +++ b/py/demo/Glacier2/callback/Callback.ice @@ -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/py/demo/Glacier2/callback/Client.py b/py/demo/Glacier2/callback/Client.py index b3a551b3001..d3bb4461b4f 100755 --- a/py/demo/Glacier2/callback/Client.py +++ b/py/demo/Glacier2/callback/Client.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/py/demo/Glacier2/callback/Server.py b/py/demo/Glacier2/callback/Server.py index fc19cbaeec3..c6b68fb6186 100755 --- a/py/demo/Glacier2/callback/Server.py +++ b/py/demo/Glacier2/callback/Server.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/py/demo/Glacier2/callback/expect.py b/py/demo/Glacier2/callback/expect.py index 64f455e55da..274236d196d 100755 --- a/py/demo/Glacier2/callback/expect.py +++ b/py/demo/Glacier2/callback/expect.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/py/demo/Ice/async/Client.py b/py/demo/Ice/async/Client.py index cc1432f51e3..41636d58371 100755 --- a/py/demo/Ice/async/Client.py +++ b/py/demo/Ice/async/Client.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/py/demo/Ice/async/Hello.ice b/py/demo/Ice/async/Hello.ice index 1a4c6a2affe..774050becb0 100644 --- a/py/demo/Ice/async/Hello.ice +++ b/py/demo/Ice/async/Hello.ice @@ -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/py/demo/Ice/async/Server.py b/py/demo/Ice/async/Server.py index 984fe248806..d8fc8255d7e 100755 --- a/py/demo/Ice/async/Server.py +++ b/py/demo/Ice/async/Server.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/py/demo/Ice/async/expect.py b/py/demo/Ice/async/expect.py index 8441fc04a91..ca08fc7e985 100755 --- a/py/demo/Ice/async/expect.py +++ b/py/demo/Ice/async/expect.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/py/demo/Ice/bidir/Callback.ice b/py/demo/Ice/bidir/Callback.ice index e56bb60cfbc..e985dd9919a 100644 --- a/py/demo/Ice/bidir/Callback.ice +++ b/py/demo/Ice/bidir/Callback.ice @@ -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/py/demo/Ice/bidir/Client.py b/py/demo/Ice/bidir/Client.py index 1b0570eaed8..a48573a86d8 100755 --- a/py/demo/Ice/bidir/Client.py +++ b/py/demo/Ice/bidir/Client.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/py/demo/Ice/bidir/Server.py b/py/demo/Ice/bidir/Server.py index d8f61d708d7..3d2c78fa753 100755 --- a/py/demo/Ice/bidir/Server.py +++ b/py/demo/Ice/bidir/Server.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/py/demo/Ice/bidir/config.client b/py/demo/Ice/bidir/config.client index 7e2040cb224..5457ad318c8 100644 --- a/py/demo/Ice/bidir/config.client +++ b/py/demo/Ice/bidir/config.client @@ -2,7 +2,7 @@ # The client reads this property to create the reference to the # "CallbackSender" object in the server. # -CallbackSender.Proxy=sender:tcp -h localhost -p 10000 +CallbackSender.Proxy=sender:ws -h localhost -p 10002 # # Warn about connection exceptions @@ -31,3 +31,8 @@ Ice.ACM.Client=0 # 1 = trace protocol messages # #Ice.Trace.Protocol=1 + +# +# Websocket transport plugin +# +Ice.Plugin.IceWS=IceWS:createIceWS diff --git a/py/demo/Ice/bidir/config.server b/py/demo/Ice/bidir/config.server index 7e6e7246625..cc403cffdf5 100644 --- a/py/demo/Ice/bidir/config.server +++ b/py/demo/Ice/bidir/config.server @@ -3,7 +3,7 @@ # "Callback.Server". The following line sets the endpoints for this # adapter. # -Callback.Server.Endpoints=tcp -h localhost -p 10000 +Callback.Server.Endpoints=tcp -h localhost -p 10000:ws -h localhost -p 10002 # # Warn about connection exceptions @@ -27,3 +27,8 @@ Ice.Warn.Connections=1 # 1 = trace protocol messages # #Ice.Trace.Protocol=1 + +# +# Websocket transport plugin +# +Ice.Plugin.IceWS=IceWS:createIceWS diff --git a/py/demo/Ice/bidir/expect.py b/py/demo/Ice/bidir/expect.py index 71c1d8a02df..0091609a2cd 100755 --- a/py/demo/Ice/bidir/expect.py +++ b/py/demo/Ice/bidir/expect.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/py/demo/Ice/callback/Callback.ice b/py/demo/Ice/callback/Callback.ice index b71b0ffd942..32285977f03 100644 --- a/py/demo/Ice/callback/Callback.ice +++ b/py/demo/Ice/callback/Callback.ice @@ -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/py/demo/Ice/callback/Client.py b/py/demo/Ice/callback/Client.py index 9d18597990e..8b20500304d 100755 --- a/py/demo/Ice/callback/Client.py +++ b/py/demo/Ice/callback/Client.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/py/demo/Ice/callback/Server.py b/py/demo/Ice/callback/Server.py index 2b064c3bf55..47331e37ef8 100755 --- a/py/demo/Ice/callback/Server.py +++ b/py/demo/Ice/callback/Server.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/py/demo/Ice/callback/expect.py b/py/demo/Ice/callback/expect.py index d080744aba4..fa014c46cca 100755 --- a/py/demo/Ice/callback/expect.py +++ b/py/demo/Ice/callback/expect.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/py/demo/Ice/converter/Client.py b/py/demo/Ice/converter/Client.py index db446e57db0..f6fecb9ef15 100755 --- a/py/demo/Ice/converter/Client.py +++ b/py/demo/Ice/converter/Client.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/py/demo/Ice/converter/Greet.ice b/py/demo/Ice/converter/Greet.ice index fcfa2c827c7..c6a428cc700 100644 --- a/py/demo/Ice/converter/Greet.ice +++ b/py/demo/Ice/converter/Greet.ice @@ -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/py/demo/Ice/converter/Server.py b/py/demo/Ice/converter/Server.py index e919496d400..8ea6fd82446 100755 --- a/py/demo/Ice/converter/Server.py +++ b/py/demo/Ice/converter/Server.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/py/demo/Ice/converter/expect.py b/py/demo/Ice/converter/expect.py index 2c20d924049..a3b3f5c4099 100755 --- a/py/demo/Ice/converter/expect.py +++ b/py/demo/Ice/converter/expect.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/py/demo/Ice/hello/Client.py b/py/demo/Ice/hello/Client.py index ed5ccb6e01a..f99206c9f51 100755 --- a/py/demo/Ice/hello/Client.py +++ b/py/demo/Ice/hello/Client.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/py/demo/Ice/hello/Hello.ice b/py/demo/Ice/hello/Hello.ice index aca54020837..3e548e149a1 100644 --- a/py/demo/Ice/hello/Hello.ice +++ b/py/demo/Ice/hello/Hello.ice @@ -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/py/demo/Ice/hello/Server.py b/py/demo/Ice/hello/Server.py index ffe3f49b3ad..b99d4b6b967 100755 --- a/py/demo/Ice/hello/Server.py +++ b/py/demo/Ice/hello/Server.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/py/demo/Ice/hello/config.client b/py/demo/Ice/hello/config.client index c71a06aa5a0..70bf7c6f2e4 100644 --- a/py/demo/Ice/hello/config.client +++ b/py/demo/Ice/hello/config.client @@ -2,7 +2,7 @@ # The client reads this property to create the reference to the # "hello" object in the server. # -Hello.Proxy=hello:tcp -h localhost -p 10000:udp -h localhost -p 10000:ssl -h localhost -p 10001 +Hello.Proxy=hello:ws -h localhost -p 10002:udp -h localhost -p 10000:wss -h localhost -p 10003 # # Warn about connection exceptions @@ -39,7 +39,7 @@ Ice.Warn.Connections=1 # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:createIceSSL -IceSSL.DefaultDir=../../../../certs +IceSSL.DefaultDir=../../../../certs/wss IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=c_rsa1024_pub.pem IceSSL.KeyFile=c_rsa1024_priv.pem @@ -47,7 +47,12 @@ IceSSL.KeyFile=c_rsa1024_priv.pem # # IceMX configuration. # -#Ice.Admin.Endpoints=tcp -h localhost -p 10003 +#Ice.Admin.Endpoints=tcp -h localhost -p 10004 Ice.Admin.InstanceName=client IceMX.Metrics.Debug.GroupBy=id IceMX.Metrics.ByParent.GroupBy=parent + +# +# Websocket transport plugin +# +Ice.Plugin.IceWS=IceWS:createIceWS diff --git a/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server index 58f43bd4e3b..e47b22e6174 100644 --- a/py/demo/Ice/hello/config.server +++ b/py/demo/Ice/hello/config.server @@ -3,7 +3,7 @@ # "Hello". The following line sets the endpoints for this # adapter. # -Hello.Endpoints=tcp -h localhost -p 10000:udp -h localhost -p 10000:ssl -h localhost -p 10001 +Hello.Endpoints=tcp -h localhost -p 10000:udp -h localhost -p 10000:ssl -h localhost -p 10001:ws -h localhost -p 10002:wss -h localhost -p 10003 # # Warn about connection exceptions @@ -40,12 +40,17 @@ Ice.Warn.Connections=1 # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:createIceSSL -IceSSL.DefaultDir=../../../../certs +IceSSL.DefaultDir=../../../../certs/wss IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem IceSSL.KeyFile=s_rsa1024_priv.pem # +# For secure web sockets we need to disable VerifyPeer. +# +IceSSL.VerifyPeer=0 + +# # Uncomment the properties below if you want run the demo with the # Windows Store App hello client. # @@ -56,7 +61,12 @@ IceSSL.KeyFile=s_rsa1024_priv.pem # # IceMX configuration. # -#Ice.Admin.Endpoints=tcp -h localhost -p 10002 +#Ice.Admin.Endpoints=tcp -h localhost -p 10004 Ice.Admin.InstanceName=server IceMX.Metrics.Debug.GroupBy=id IceMX.Metrics.ByParent.GroupBy=parent + +# +# Websocket transport plugin +# +Ice.Plugin.IceWS=IceWS:createIceWS diff --git a/py/demo/Ice/hello/expect.py b/py/demo/Ice/hello/expect.py index 7cd67bdb816..080f27ac7f7 100755 --- a/py/demo/Ice/hello/expect.py +++ b/py/demo/Ice/hello/expect.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/py/demo/Ice/latency/Client.py b/py/demo/Ice/latency/Client.py index 7f46eb4330a..5a6936359e1 100755 --- a/py/demo/Ice/latency/Client.py +++ b/py/demo/Ice/latency/Client.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/py/demo/Ice/latency/Latency.ice b/py/demo/Ice/latency/Latency.ice index 927b1a2cc67..2391b2667aa 100644 --- a/py/demo/Ice/latency/Latency.ice +++ b/py/demo/Ice/latency/Latency.ice @@ -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/py/demo/Ice/latency/Server.py b/py/demo/Ice/latency/Server.py index eff85c70672..d4f79294858 100755 --- a/py/demo/Ice/latency/Server.py +++ b/py/demo/Ice/latency/Server.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/py/demo/Ice/latency/config.client b/py/demo/Ice/latency/config.client index fe9321872da..dac0a6fe9c4 100644 --- a/py/demo/Ice/latency/config.client +++ b/py/demo/Ice/latency/config.client @@ -2,7 +2,7 @@ # The client reads this property to create the reference to the "Ping" # object in the server. # -Ping.Proxy=ping:default -p 10000 -h localhost +Ping.Proxy=ping:ws -p 10002 -h localhost:wss -p 10003 -h localhost # # Disable client-side ACM. @@ -13,7 +13,7 @@ Ice.ACM.Client=0 # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:createIceSSL -IceSSL.DefaultDir=../../../../certs +IceSSL.DefaultDir=../../../../certs/wss IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=c_rsa1024_pub.pem IceSSL.KeyFile=c_rsa1024_priv.pem @@ -21,7 +21,12 @@ IceSSL.KeyFile=c_rsa1024_priv.pem # # IceMX configuration. # -#Ice.Admin.Endpoints=tcp -h localhost -p 10003 +#Ice.Admin.Endpoints=tcp -h localhost -p 10004 Ice.Admin.InstanceName=client IceMX.Metrics.Debug.GroupBy=id IceMX.Metrics.ByParent.GroupBy=parent + +# +# Websocket transport plugin +# +Ice.Plugin.IceWS=IceWS:createIceWS diff --git a/py/demo/Ice/latency/config.server b/py/demo/Ice/latency/config.server index f4855c64b94..0bf5d6905b6 100644 --- a/py/demo/Ice/latency/config.server +++ b/py/demo/Ice/latency/config.server @@ -2,7 +2,7 @@ # The server creates one single object adapter with the name # "Latency". The following line sets the endpoints for this adapter. # -Latency.Endpoints=default -p 10000 -h localhost +Latency.Endpoints=tcp -p 10000 -h localhost:ssl -p 10001 -h localhost:ws -p 10002 -h localhost:wss -p 10003 -h localhost # # Warn about connection exceptions @@ -13,15 +13,25 @@ Ice.Warn.Connections=1 # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:createIceSSL -IceSSL.DefaultDir=../../../../certs +IceSSL.DefaultDir=../../../../certs/wss IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem IceSSL.KeyFile=s_rsa1024_priv.pem # +# For secure web sockets we need to disable VerifyPeer. +# +IceSSL.VerifyPeer=0 + +# # IceMX configuration. # -#Ice.Admin.Endpoints=tcp -h localhost -p 10002 +#Ice.Admin.Endpoints=tcp -h localhost -p 10004 Ice.Admin.InstanceName=server IceMX.Metrics.Debug.GroupBy=id IceMX.Metrics.ByParent.GroupBy=parent + +# +# Websocket transport plugin +# +Ice.Plugin.IceWS=IceWS:createIceWS diff --git a/py/demo/Ice/latency/expect.py b/py/demo/Ice/latency/expect.py index bb906366c74..c5eb3f48e13 100755 --- a/py/demo/Ice/latency/expect.py +++ b/py/demo/Ice/latency/expect.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/py/demo/Ice/metrics/Metrics.py b/py/demo/Ice/metrics/Metrics.py index d9e7731bf22..4c3a9b13e66 100755 --- a/py/demo/Ice/metrics/Metrics.py +++ b/py/demo/Ice/metrics/Metrics.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # ********************************************************************** # -# 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/py/demo/Ice/metrics/expect.py b/py/demo/Ice/metrics/expect.py index 79a3322bb28..1104c506ce5 100755 --- a/py/demo/Ice/metrics/expect.py +++ b/py/demo/Ice/metrics/expect.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/py/demo/Ice/minimal/Client.py b/py/demo/Ice/minimal/Client.py index 5a95a21c54c..a0d32cb1d2e 100755 --- a/py/demo/Ice/minimal/Client.py +++ b/py/demo/Ice/minimal/Client.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. @@ -15,7 +15,7 @@ import Demo try: communicator = Ice.initialize(sys.argv) - hello = Demo.HelloPrx.checkedCast(communicator.stringToProxy("hello:tcp -h localhost -p 10000")) + hello = Demo.HelloPrx.checkedCast(communicator.stringToProxy("hello:default -h localhost -p 10000")) hello.sayHello() communicator.destroy() except: diff --git a/py/demo/Ice/minimal/Hello.ice b/py/demo/Ice/minimal/Hello.ice index e41e6c14c48..8e596e50d9a 100644 --- a/py/demo/Ice/minimal/Hello.ice +++ b/py/demo/Ice/minimal/Hello.ice @@ -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/py/demo/Ice/minimal/README b/py/demo/Ice/minimal/README index 8d325240508..9b6c381ab8e 100644 --- a/py/demo/Ice/minimal/README +++ b/py/demo/Ice/minimal/README @@ -12,3 +12,11 @@ $ python Client.py Note that this demo hardwires port 10000. If port 10000 is not available on your machine, you need to edit both client and server to use a free port. + +To run the server with web socket support: + +$ python Server.py --Ice.Default.Protocol=ws --Ice.Plugin.IceWS="IceWS:createIceWS" + +To run the client with web socket support: + +$ python Client.py --Ice.Default.Protocol=ws --Ice.Plugin.IceWS="IceWS:createIceWS" diff --git a/py/demo/Ice/minimal/Server.py b/py/demo/Ice/minimal/Server.py index 3edb7303bb8..d0dff8b4ea4 100755 --- a/py/demo/Ice/minimal/Server.py +++ b/py/demo/Ice/minimal/Server.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. @@ -19,7 +19,7 @@ class HelloI(Demo.Hello): try: communicator = Ice.initialize(sys.argv) - adapter = communicator.createObjectAdapterWithEndpoints("Hello", "tcp -h localhost -p 10000") + adapter = communicator.createObjectAdapterWithEndpoints("Hello", "default -h localhost -p 10000") adapter.add(HelloI(), communicator.stringToIdentity("hello")) adapter.activate() communicator.waitForShutdown() diff --git a/py/demo/Ice/minimal/expect.py b/py/demo/Ice/minimal/expect.py index 71dc2d068f6..5ff3641063e 100755 --- a/py/demo/Ice/minimal/expect.py +++ b/py/demo/Ice/minimal/expect.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/py/demo/Ice/optional/Client.py b/py/demo/Ice/optional/Client.py index 601209925df..1f787cd2bfe 100644 --- a/py/demo/Ice/optional/Client.py +++ b/py/demo/Ice/optional/Client.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/py/demo/Ice/optional/Contact.ice b/py/demo/Ice/optional/Contact.ice index efaa17caea7..ce47b858d5b 100644 --- a/py/demo/Ice/optional/Contact.ice +++ b/py/demo/Ice/optional/Contact.ice @@ -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/py/demo/Ice/optional/Server.py b/py/demo/Ice/optional/Server.py index bac205826c0..44b95d05fe0 100644 --- a/py/demo/Ice/optional/Server.py +++ b/py/demo/Ice/optional/Server.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/py/demo/Ice/optional/expect.py b/py/demo/Ice/optional/expect.py index 6b039a89fa6..cfea46048ad 100755 --- a/py/demo/Ice/optional/expect.py +++ b/py/demo/Ice/optional/expect.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/py/demo/Ice/properties/Client.py b/py/demo/Ice/properties/Client.py index 5365863eda7..ebe3ac1fd31 100644 --- a/py/demo/Ice/properties/Client.py +++ b/py/demo/Ice/properties/Client.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/py/demo/Ice/properties/Props.ice b/py/demo/Ice/properties/Props.ice index 580a6a9b71f..c3d0420afaa 100644 --- a/py/demo/Ice/properties/Props.ice +++ b/py/demo/Ice/properties/Props.ice @@ -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/py/demo/Ice/properties/Server.py b/py/demo/Ice/properties/Server.py index 4e35ffafa61..c66672675b1 100644 --- a/py/demo/Ice/properties/Server.py +++ b/py/demo/Ice/properties/Server.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/py/demo/Ice/properties/expect.py b/py/demo/Ice/properties/expect.py index 5179d5db3e4..1eaa38f7524 100755 --- a/py/demo/Ice/properties/expect.py +++ b/py/demo/Ice/properties/expect.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/py/demo/Ice/session/Client.py b/py/demo/Ice/session/Client.py index bd24583a976..061a91c2b16 100755 --- a/py/demo/Ice/session/Client.py +++ b/py/demo/Ice/session/Client.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/py/demo/Ice/session/Server.py b/py/demo/Ice/session/Server.py index a7d2c0a435b..954b74732ed 100755 --- a/py/demo/Ice/session/Server.py +++ b/py/demo/Ice/session/Server.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/py/demo/Ice/session/Session.ice b/py/demo/Ice/session/Session.ice index 41d35c29873..048b5357add 100644 --- a/py/demo/Ice/session/Session.ice +++ b/py/demo/Ice/session/Session.ice @@ -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/py/demo/Ice/session/expect.py b/py/demo/Ice/session/expect.py index 95f5e8d8b5f..0fba63e3b4f 100755 --- a/py/demo/Ice/session/expect.py +++ b/py/demo/Ice/session/expect.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/py/demo/Ice/throughput/Client.py b/py/demo/Ice/throughput/Client.py index 5da6fd8d27e..edea9175944 100755 --- a/py/demo/Ice/throughput/Client.py +++ b/py/demo/Ice/throughput/Client.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/py/demo/Ice/throughput/Server.py b/py/demo/Ice/throughput/Server.py index 6ba8fc10661..83c9ecf3e9b 100755 --- a/py/demo/Ice/throughput/Server.py +++ b/py/demo/Ice/throughput/Server.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. @@ -15,7 +15,7 @@ import Demo class ThroughputI(Demo.Throughput): def __init__(self): - warmup = False + self.warmup = False if sys.version_info[0] == 2: b = [] diff --git a/py/demo/Ice/throughput/Throughput.ice b/py/demo/Ice/throughput/Throughput.ice index c8e53db5eb3..c2216a15bfc 100644 --- a/py/demo/Ice/throughput/Throughput.ice +++ b/py/demo/Ice/throughput/Throughput.ice @@ -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/py/demo/Ice/throughput/config.client b/py/demo/Ice/throughput/config.client index 1e271e29c88..6d52096ef3e 100644 --- a/py/demo/Ice/throughput/config.client +++ b/py/demo/Ice/throughput/config.client @@ -2,7 +2,7 @@ # The client reads this property to create the reference to the # "Throughput" object in the server. # -Throughput.Proxy=throughput:default -p 10000 -h localhost +Throughput.Proxy=throughput:ws -p 10002 -h localhost:wss -p 10003 -h localhost # # Disable client-side ACM. @@ -13,7 +13,7 @@ Ice.ACM.Client=0 # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:createIceSSL -IceSSL.DefaultDir=../../../../certs +IceSSL.DefaultDir=../../../../certs/wss IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=c_rsa1024_pub.pem IceSSL.KeyFile=c_rsa1024_priv.pem @@ -21,7 +21,12 @@ IceSSL.KeyFile=c_rsa1024_priv.pem # # IceMX configuration. # -#Ice.Admin.Endpoints=tcp -h localhost -p 10003 +#Ice.Admin.Endpoints=tcp -h localhost -p 10004 Ice.Admin.InstanceName=client IceMX.Metrics.Debug.GroupBy=id IceMX.Metrics.ByParent.GroupBy=parent + +# +# Websocket transport plugin +# +Ice.Plugin.IceWS=IceWS:createIceWS diff --git a/py/demo/Ice/throughput/config.server b/py/demo/Ice/throughput/config.server index 86b3decf6dd..4e94235b828 100644 --- a/py/demo/Ice/throughput/config.server +++ b/py/demo/Ice/throughput/config.server @@ -3,7 +3,7 @@ # "Throughput". The following line sets the endpoints for this # adapter. # -Throughput.Endpoints=default -p 10000 -h localhost +Throughput.Endpoints=tcp -p 10000 -h localhost:ssl -p 10001 -h localhost:ws -p 10002 -h localhost:wss -p 10003 -h localhost # # Warn about connection exceptions @@ -14,15 +14,25 @@ Ice.Warn.Connections=1 # SSL Configuration # Ice.Plugin.IceSSL=IceSSL:createIceSSL -IceSSL.DefaultDir=../../../../certs +IceSSL.DefaultDir=../../../../certs/wss IceSSL.CertAuthFile=cacert.pem IceSSL.CertFile=s_rsa1024_pub.pem IceSSL.KeyFile=s_rsa1024_priv.pem # +# For secure web sockets we need to disable VerifyPeer. +# +IceSSL.VerifyPeer=0 + +# # IceMX configuration. # -#Ice.Admin.Endpoints=tcp -h localhost -p 10002 +#Ice.Admin.Endpoints=tcp -h localhost -p 10004 Ice.Admin.InstanceName=server IceMX.Metrics.Debug.GroupBy=id IceMX.Metrics.ByParent.GroupBy=parent + +# +# Websocket transport plugin +# +Ice.Plugin.IceWS=IceWS:createIceWS diff --git a/py/demo/Ice/throughput/expect.py b/py/demo/Ice/throughput/expect.py index 2b492b31971..6d363db85f1 100755 --- a/py/demo/Ice/throughput/expect.py +++ b/py/demo/Ice/throughput/expect.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/py/demo/Ice/value/Client.py b/py/demo/Ice/value/Client.py index 17ce5d7d3f4..76925aabd2d 100755 --- a/py/demo/Ice/value/Client.py +++ b/py/demo/Ice/value/Client.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/py/demo/Ice/value/Printer.py b/py/demo/Ice/value/Printer.py index bc006fbd212..62c33bad070 100755 --- a/py/demo/Ice/value/Printer.py +++ b/py/demo/Ice/value/Printer.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/py/demo/Ice/value/Server.py b/py/demo/Ice/value/Server.py index 79e4c96c846..7fada644f25 100755 --- a/py/demo/Ice/value/Server.py +++ b/py/demo/Ice/value/Server.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/py/demo/Ice/value/Value.ice b/py/demo/Ice/value/Value.ice index 4ac477f0e03..bcbfeaeb7c1 100644 --- a/py/demo/Ice/value/Value.ice +++ b/py/demo/Ice/value/Value.ice @@ -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/py/demo/Ice/value/expect.py b/py/demo/Ice/value/expect.py index f7da828bfde..0f695b1ae09 100755 --- a/py/demo/Ice/value/expect.py +++ b/py/demo/Ice/value/expect.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/py/demo/IceGrid/simple/Client.py b/py/demo/IceGrid/simple/Client.py index fb446c12d9c..a21e4eeb566 100755 --- a/py/demo/IceGrid/simple/Client.py +++ b/py/demo/IceGrid/simple/Client.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/py/demo/IceGrid/simple/Hello.ice b/py/demo/IceGrid/simple/Hello.ice index 4859970f6a1..617d061e087 100644 --- a/py/demo/IceGrid/simple/Hello.ice +++ b/py/demo/IceGrid/simple/Hello.ice @@ -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/py/demo/IceGrid/simple/Server.py b/py/demo/IceGrid/simple/Server.py index 61012a66512..ae238f4737c 100755 --- a/py/demo/IceGrid/simple/Server.py +++ b/py/demo/IceGrid/simple/Server.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/py/demo/IceGrid/simple/application.xml b/py/demo/IceGrid/simple/application.xml index e2fdb1248d0..78629a282f7 100644 --- a/py/demo/IceGrid/simple/application.xml +++ b/py/demo/IceGrid/simple/application.xml @@ -1,7 +1,7 @@ <!-- ********************************************************************** - 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/py/demo/IceGrid/simple/application_with_replication.xml b/py/demo/IceGrid/simple/application_with_replication.xml index c38ef57a23d..b30d7fc9c54 100644 --- a/py/demo/IceGrid/simple/application_with_replication.xml +++ b/py/demo/IceGrid/simple/application_with_replication.xml @@ -1,7 +1,7 @@ <!-- ********************************************************************** - 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/py/demo/IceGrid/simple/application_with_template.xml b/py/demo/IceGrid/simple/application_with_template.xml index ebb6bb0a3d8..3d9211158bc 100644 --- a/py/demo/IceGrid/simple/application_with_template.xml +++ b/py/demo/IceGrid/simple/application_with_template.xml @@ -1,7 +1,7 @@ <!-- ********************************************************************** - 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/py/demo/IceGrid/simple/expect.py b/py/demo/IceGrid/simple/expect.py index e34e90aa757..766f56a24ce 100755 --- a/py/demo/IceGrid/simple/expect.py +++ b/py/demo/IceGrid/simple/expect.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/py/demo/IceStorm/clock/Clock.ice b/py/demo/IceStorm/clock/Clock.ice index 4adfd3d80ec..99292e6304d 100644 --- a/py/demo/IceStorm/clock/Clock.ice +++ b/py/demo/IceStorm/clock/Clock.ice @@ -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/py/demo/IceStorm/clock/Publisher.py b/py/demo/IceStorm/clock/Publisher.py index fccf92e2128..cc2b01d5db2 100755 --- a/py/demo/IceStorm/clock/Publisher.py +++ b/py/demo/IceStorm/clock/Publisher.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/py/demo/IceStorm/clock/Subscriber.py b/py/demo/IceStorm/clock/Subscriber.py index 5e56cc6c09f..bd89258ce3f 100755 --- a/py/demo/IceStorm/clock/Subscriber.py +++ b/py/demo/IceStorm/clock/Subscriber.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/py/demo/IceStorm/clock/expect.py b/py/demo/IceStorm/clock/expect.py index c966539e4e6..8fd18987833 100755 --- a/py/demo/IceStorm/clock/expect.py +++ b/py/demo/IceStorm/clock/expect.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/py/demo/book/printer/Client.py b/py/demo/book/printer/Client.py index 0d3a8c3f663..0834d2cd6e8 100755 --- a/py/demo/book/printer/Client.py +++ b/py/demo/book/printer/Client.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/py/demo/book/printer/Printer.ice b/py/demo/book/printer/Printer.ice index 5418132e600..343fd8e627b 100644 --- a/py/demo/book/printer/Printer.ice +++ b/py/demo/book/printer/Printer.ice @@ -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/py/demo/book/printer/Server.py b/py/demo/book/printer/Server.py index eb177cb442d..70cfb576405 100755 --- a/py/demo/book/printer/Server.py +++ b/py/demo/book/printer/Server.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/py/demo/book/printer/expect.py b/py/demo/book/printer/expect.py index d41155ff7d4..6bbcf3eaa53 100755 --- a/py/demo/book/printer/expect.py +++ b/py/demo/book/printer/expect.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/py/demo/book/simple_filesystem/Client.py b/py/demo/book/simple_filesystem/Client.py index 27832721f92..75bf17aefc6 100755 --- a/py/demo/book/simple_filesystem/Client.py +++ b/py/demo/book/simple_filesystem/Client.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/py/demo/book/simple_filesystem/Filesystem.ice b/py/demo/book/simple_filesystem/Filesystem.ice index a1d1d848c2c..21e8a435fcb 100644 --- a/py/demo/book/simple_filesystem/Filesystem.ice +++ b/py/demo/book/simple_filesystem/Filesystem.ice @@ -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/py/demo/book/simple_filesystem/Server.py b/py/demo/book/simple_filesystem/Server.py index e5e7fc0a99d..46393576f03 100755 --- a/py/demo/book/simple_filesystem/Server.py +++ b/py/demo/book/simple_filesystem/Server.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/py/demo/book/simple_filesystem/expect.py b/py/demo/book/simple_filesystem/expect.py index a14d5434f9a..8cf7d50e291 100755 --- a/py/demo/book/simple_filesystem/expect.py +++ b/py/demo/book/simple_filesystem/expect.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. |