6 files changed, 25 insertions, 10 deletions
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.