61 files changed, 81 insertions, 114 deletions
diff --git a/cpp/demo/IceGrid/Makefile b/cpp/demo/IceGrid/Makefile
index 777716cee40..5a8ee2db067 100644
--- a/cpp/demo/IceGrid/Makefile
+++ b/cpp/demo/IceGrid/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/Makefile.mak b/cpp/demo/IceGrid/Makefile.mak
index 389a9d8197e..60a6b0c6484 100644
--- a/cpp/demo/IceGrid/Makefile.mak
+++ b/cpp/demo/IceGrid/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/allocate/Client.cpp b/cpp/demo/IceGrid/allocate/Client.cpp
index 79520be6bca..0de09584229 100644
--- a/cpp/demo/IceGrid/allocate/Client.cpp
+++ b/cpp/demo/IceGrid/allocate/Client.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/allocate/Hello.ice b/cpp/demo/IceGrid/allocate/Hello.ice
index bb8fc0971a5..4b123a06908 100644
--- a/cpp/demo/IceGrid/allocate/Hello.ice
+++ b/cpp/demo/IceGrid/allocate/Hello.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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 @@ module Demo
 
 interface Hello
 {
-    ["cpp:const"] idempotent void sayHello();
+    idempotent void sayHello();
     void shutdown();
 };
 
diff --git a/cpp/demo/IceGrid/allocate/HelloI.cpp b/cpp/demo/IceGrid/allocate/HelloI.cpp
index d92675288cf..233c8ec1f54 100644
--- a/cpp/demo/IceGrid/allocate/HelloI.cpp
+++ b/cpp/demo/IceGrid/allocate/HelloI.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -17,7 +17,7 @@ HelloI::HelloI(const string& name) : _name(name)
 }
 
 void
-HelloI::sayHello(const Ice::Current&) const
+HelloI::sayHello(const Ice::Current&)
 {
     cout << _name << " says Hello World!" << endl;
 }
diff --git a/cpp/demo/IceGrid/allocate/HelloI.h b/cpp/demo/IceGrid/allocate/HelloI.h
index 189afa1a2da..62802cbc591 100644
--- a/cpp/demo/IceGrid/allocate/HelloI.h
+++ b/cpp/demo/IceGrid/allocate/HelloI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -18,7 +18,7 @@ public:
 
     HelloI(const std::string&);
 
-    virtual void sayHello(const Ice::Current&) const;
+    virtual void sayHello(const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 
 private:
diff --git a/cpp/demo/IceGrid/allocate/Makefile b/cpp/demo/IceGrid/allocate/Makefile
index b7ed50d2fe7..d4c30e1fec0 100644
--- a/cpp/demo/IceGrid/allocate/Makefile
+++ b/cpp/demo/IceGrid/allocate/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak
index e64501912c1..91ccc5e5684 100644
--- a/cpp/demo/IceGrid/allocate/Makefile.mak
+++ b/cpp/demo/IceGrid/allocate/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/allocate/Server.cpp b/cpp/demo/IceGrid/allocate/Server.cpp
index 3f50a036bd8..bf2e6fa7f5d 100644
--- a/cpp/demo/IceGrid/allocate/Server.cpp
+++ b/cpp/demo/IceGrid/allocate/Server.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/allocate/application-multiple.xml b/cpp/demo/IceGrid/allocate/application-multiple.xml
index df57ae9754b..2ab100dcc05 100644
--- a/cpp/demo/IceGrid/allocate/application-multiple.xml
+++ b/cpp/demo/IceGrid/allocate/application-multiple.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+ Copyright (c) 2003-2009 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/cpp/demo/IceGrid/allocate/application-single.xml b/cpp/demo/IceGrid/allocate/application-single.xml
index 61a0e1cd9fb..b6612e39118 100644
--- a/cpp/demo/IceGrid/allocate/application-single.xml
+++ b/cpp/demo/IceGrid/allocate/application-single.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+ Copyright (c) 2003-2009 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/cpp/demo/IceGrid/allocate/expect.py b/cpp/demo/IceGrid/allocate/expect.py
index 5fbed8d84f3..6f24a914009 100755
--- a/cpp/demo/IceGrid/allocate/expect.py
+++ b/cpp/demo/IceGrid/allocate/expect.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/icebox/Client.cpp b/cpp/demo/IceGrid/icebox/Client.cpp
index 061b9c32ef8..05fa29acb27 100644
--- a/cpp/demo/IceGrid/icebox/Client.cpp
+++ b/cpp/demo/IceGrid/icebox/Client.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/icebox/Hello.ice b/cpp/demo/IceGrid/icebox/Hello.ice
index ac9d5f5283e..6cd2473fc45 100644
--- a/cpp/demo/IceGrid/icebox/Hello.ice
+++ b/cpp/demo/IceGrid/icebox/Hello.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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 @@ module Demo
 
 interface Hello
 {
-    void sayHello();
+    idempotent void sayHello();
 };
 
 };
diff --git a/cpp/demo/IceGrid/icebox/HelloI.cpp b/cpp/demo/IceGrid/icebox/HelloI.cpp
index 2041dfed909..db41064b2d3 100644
--- a/cpp/demo/IceGrid/icebox/HelloI.cpp
+++ b/cpp/demo/IceGrid/icebox/HelloI.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/icebox/HelloI.h b/cpp/demo/IceGrid/icebox/HelloI.h
index 80bdc1cdbee..151dcaf228f 100644
--- a/cpp/demo/IceGrid/icebox/HelloI.h
+++ b/cpp/demo/IceGrid/icebox/HelloI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/icebox/HelloServiceI.cpp b/cpp/demo/IceGrid/icebox/HelloServiceI.cpp
index ebd54df2d95..9e889dc1fbf 100644
--- a/cpp/demo/IceGrid/icebox/HelloServiceI.cpp
+++ b/cpp/demo/IceGrid/icebox/HelloServiceI.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/icebox/HelloServiceI.h b/cpp/demo/IceGrid/icebox/HelloServiceI.h
index 572b66d6e5b..e07f97364fb 100644
--- a/cpp/demo/IceGrid/icebox/HelloServiceI.h
+++ b/cpp/demo/IceGrid/icebox/HelloServiceI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/icebox/Makefile b/cpp/demo/IceGrid/icebox/Makefile
index e41ba72c351..711dba7e35d 100644
--- a/cpp/demo/IceGrid/icebox/Makefile
+++ b/cpp/demo/IceGrid/icebox/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/icebox/Makefile.mak b/cpp/demo/IceGrid/icebox/Makefile.mak
index 34a72669a9b..22a0b3765db 100644
--- a/cpp/demo/IceGrid/icebox/Makefile.mak
+++ b/cpp/demo/IceGrid/icebox/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/icebox/expect.py b/cpp/demo/IceGrid/icebox/expect.py
index 9cfbc351353..1fd646b714a 100755
--- a/cpp/demo/IceGrid/icebox/expect.py
+++ b/cpp/demo/IceGrid/icebox/expect.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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.
@@ -23,7 +23,7 @@ from demoscript import *
 from demoscript.IceGrid import icebox
 
 desc = 'application.xml'
-if Util.getBuild() == 'debug':
+if Util.isDebugBuild():
     fi = open(desc, "r")
     desc = 'tmp_application.xml'
     fo = open(desc, "w")
@@ -34,7 +34,6 @@ if Util.getBuild() == 'debug':
     fi.close()
     fo.close()
 
-directory = os.path.dirname(os.path.abspath(__file__))
-Util.addLdPath(directory)
+Util.addLdPath(os.getcwd())
 
 icebox.run('./client', desc[0:len(desc)-4])
diff --git a/cpp/demo/IceGrid/replication/Client.cpp b/cpp/demo/IceGrid/replication/Client.cpp
index 394372cfef4..b4ae2156d3a 100644
--- a/cpp/demo/IceGrid/replication/Client.cpp
+++ b/cpp/demo/IceGrid/replication/Client.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/replication/Hello.ice b/cpp/demo/IceGrid/replication/Hello.ice
index 8ddccb8a15f..8cbcb4bdfd3 100644
--- a/cpp/demo/IceGrid/replication/Hello.ice
+++ b/cpp/demo/IceGrid/replication/Hello.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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 @@ module Demo
 
 interface Hello
 {
-    ["cpp:const"] idempotent string getGreeting();
+    idempotent string getGreeting();
     void shutdown();
 };
 
diff --git a/cpp/demo/IceGrid/replication/HelloI.cpp b/cpp/demo/IceGrid/replication/HelloI.cpp
index 96a802abe58..7f81c6eb0fc 100644
--- a/cpp/demo/IceGrid/replication/HelloI.cpp
+++ b/cpp/demo/IceGrid/replication/HelloI.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -17,7 +17,7 @@ HelloI::HelloI(const string& name) : _name(name)
 }
 
 std::string
-HelloI::getGreeting(const Ice::Current&) const
+HelloI::getGreeting(const Ice::Current&)
 {
     return _name + " says Hello World!";
 }
diff --git a/cpp/demo/IceGrid/replication/HelloI.h b/cpp/demo/IceGrid/replication/HelloI.h
index a34a3b3b085..7c1f0fcd5d9 100644
--- a/cpp/demo/IceGrid/replication/HelloI.h
+++ b/cpp/demo/IceGrid/replication/HelloI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -18,7 +18,7 @@ public:
 
     HelloI(const std::string&);
 
-    virtual std::string getGreeting(const Ice::Current&) const;
+    virtual std::string getGreeting(const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 
 private:
diff --git a/cpp/demo/IceGrid/replication/Makefile b/cpp/demo/IceGrid/replication/Makefile
index 519ac04602e..70d73a4fb7e 100644
--- a/cpp/demo/IceGrid/replication/Makefile
+++ b/cpp/demo/IceGrid/replication/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/replication/Makefile.mak b/cpp/demo/IceGrid/replication/Makefile.mak
index 499849c81a9..164cb68f834 100644
--- a/cpp/demo/IceGrid/replication/Makefile.mak
+++ b/cpp/demo/IceGrid/replication/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/replication/Server.cpp b/cpp/demo/IceGrid/replication/Server.cpp
index 3f50a036bd8..bf2e6fa7f5d 100644
--- a/cpp/demo/IceGrid/replication/Server.cpp
+++ b/cpp/demo/IceGrid/replication/Server.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/replication/application.xml b/cpp/demo/IceGrid/replication/application.xml
index 73e511f40f0..d9cbb4da7bf 100644
--- a/cpp/demo/IceGrid/replication/application.xml
+++ b/cpp/demo/IceGrid/replication/application.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+ Copyright (c) 2003-2009 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/cpp/demo/IceGrid/replication/expect.py b/cpp/demo/IceGrid/replication/expect.py
index 97a455b28dc..b2379475fdf 100755
--- a/cpp/demo/IceGrid/replication/expect.py
+++ b/cpp/demo/IceGrid/replication/expect.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/secure/.gitignore b/cpp/demo/IceGrid/secure/.gitignore
index 778c6285ebc..58441e933c7 100644
--- a/cpp/demo/IceGrid/secure/.gitignore
+++ b/cpp/demo/IceGrid/secure/.gitignore
@@ -5,6 +5,6 @@ client
 server
 Hello.cpp
 Hello.h
-db/node/*
 db/registry/*
+db/node/*
 certs/*
diff --git a/cpp/demo/IceGrid/secure/Client.cpp b/cpp/demo/IceGrid/secure/Client.cpp
index 31f6a858af9..450b7bf773a 100644
--- a/cpp/demo/IceGrid/secure/Client.cpp
+++ b/cpp/demo/IceGrid/secure/Client.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/secure/Hello.ice b/cpp/demo/IceGrid/secure/Hello.ice
index bb8fc0971a5..4b123a06908 100644
--- a/cpp/demo/IceGrid/secure/Hello.ice
+++ b/cpp/demo/IceGrid/secure/Hello.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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 @@ module Demo
 
 interface Hello
 {
-    ["cpp:const"] idempotent void sayHello();
+    idempotent void sayHello();
     void shutdown();
 };
 
diff --git a/cpp/demo/IceGrid/secure/HelloI.cpp b/cpp/demo/IceGrid/secure/HelloI.cpp
index d92675288cf..233c8ec1f54 100644
--- a/cpp/demo/IceGrid/secure/HelloI.cpp
+++ b/cpp/demo/IceGrid/secure/HelloI.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -17,7 +17,7 @@ HelloI::HelloI(const string& name) : _name(name)
 }
 
 void
-HelloI::sayHello(const Ice::Current&) const
+HelloI::sayHello(const Ice::Current&)
 {
     cout << _name << " says Hello World!" << endl;
 }
diff --git a/cpp/demo/IceGrid/secure/HelloI.h b/cpp/demo/IceGrid/secure/HelloI.h
index 189afa1a2da..62802cbc591 100644
--- a/cpp/demo/IceGrid/secure/HelloI.h
+++ b/cpp/demo/IceGrid/secure/HelloI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -18,7 +18,7 @@ public:
 
     HelloI(const std::string&);
 
-    virtual void sayHello(const Ice::Current&) const;
+    virtual void sayHello(const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 
 private:
diff --git a/cpp/demo/IceGrid/secure/Makefile b/cpp/demo/IceGrid/secure/Makefile
index a1aa116a1b4..4e0a067bfc5 100644
--- a/cpp/demo/IceGrid/secure/Makefile
+++ b/cpp/demo/IceGrid/secure/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/secure/Makefile.mak b/cpp/demo/IceGrid/secure/Makefile.mak
index 96a2c7898ca..b7824112f7b 100644
--- a/cpp/demo/IceGrid/secure/Makefile.mak
+++ b/cpp/demo/IceGrid/secure/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/secure/Server.cpp b/cpp/demo/IceGrid/secure/Server.cpp
index 7b2b0b3f005..40e7ca45676 100644
--- a/cpp/demo/IceGrid/secure/Server.cpp
+++ b/cpp/demo/IceGrid/secure/Server.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/secure/application.xml b/cpp/demo/IceGrid/secure/application.xml
index 30cf2770347..b0b2094fb98 100644
--- a/cpp/demo/IceGrid/secure/application.xml
+++ b/cpp/demo/IceGrid/secure/application.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+ Copyright (c) 2003-2009 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/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py
index c4363002259..da66cbcb03c 100755
--- a/cpp/demo/IceGrid/secure/expect.py
+++ b/cpp/demo/IceGrid/secure/expect.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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.
@@ -62,8 +62,7 @@ print "ok"
 
 print "starting icegrid...",
 sys.stdout.flush()
-registryProps = " --Ice.PrintAdapterReady" + \
-                " --IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerifier"
+registryProps = " --Ice.PrintAdapterReady"
 registry = Util.spawn('icegridregistry --Ice.Config=config.registry' + registryProps)
 registry.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready')
 node = Util.spawn('icegridnode --Ice.Config=config.node --Ice.PrintAdapterReady %s' % (args))
@@ -73,9 +72,7 @@ print "ok"
 print "starting glacier2...",
 sys.stdout.flush()
 
-glacier2Props = " --Ice.PrintAdapterReady --Glacier2.SessionTimeout=5" + \
-                " --Glacier2.SSLSessionManager=DemoIceGrid/AdminSSLSessionManager" + \
-                " --Glacier2.SSLPermissionsVerifier=DemoGlacier2/NullSSLPermissionsVerifier"
+glacier2Props = " --Ice.PrintAdapterReady --Glacier2.SessionTimeout=5"
 glacier2 = Util.spawn('glacier2router --Ice.Config=config.glacier2' + glacier2Props)
 glacier2.expect('Glacier2.Client ready')
 glacier2.expect('Glacier2.Server ready')
@@ -109,35 +106,6 @@ sys.stdout.flush()
 runtest()
 print "ok"
 
-print "testing icegridadmin...",
-sys.stdout.flush()
-
-admin = Util.spawn('icegridadmin --Ice.Config=config.admin --Ice.Default.Router="DemoGlacier2/router:ssl -p 4064"')
-admin.expect('>>>')
-admin.sendline("server list")
-admin.expect('SimpleServer')
-admin.expect('>>>')
-admin.sendline('exit')
-admin.waitTestSuccess(timeout=120)
-
-admin = Util.spawn('icegridadmin --Ice.Config=config.admin --ssl')
-admin.expect('>>>')
-admin.sendline("server list")
-admin.expect('SimpleServer')
-admin.expect('>>>')
-admin.sendline('exit')
-admin.waitTestSuccess(timeout=120)
-
-admin = Util.spawn('icegridadmin --Ice.Config=config.admin --ssl --Ice.Default.Router="DemoGlacier2/router:ssl -p 4064"')
-admin.expect('>>>')
-admin.sendline("server list")
-admin.expect('SimpleServer')
-admin.expect('>>>')
-admin.sendline('exit')
-admin.waitTestSuccess(timeout=120)
-
-print "ok"
-
 print "completing shutdown...", 
 sys.stdout.flush()
 
diff --git a/cpp/demo/IceGrid/secure/makecerts.py b/cpp/demo/IceGrid/secure/makecerts.py
index 3f9ebfc92a6..5af14affc19 100755
--- a/cpp/demo/IceGrid/secure/makecerts.py
+++ b/cpp/demo/IceGrid/secure/makecerts.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/sessionActivation/Client.cpp b/cpp/demo/IceGrid/sessionActivation/Client.cpp
index ddf896d5ae0..0307a9e38d3 100644
--- a/cpp/demo/IceGrid/sessionActivation/Client.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Client.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/sessionActivation/Hello.ice b/cpp/demo/IceGrid/sessionActivation/Hello.ice
index 871a5123e30..6cd2473fc45 100644
--- a/cpp/demo/IceGrid/sessionActivation/Hello.ice
+++ b/cpp/demo/IceGrid/sessionActivation/Hello.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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 @@ module Demo
 
 interface Hello
 {
-    ["cpp:const"] idempotent void sayHello();
+    idempotent void sayHello();
 };
 
 };
diff --git a/cpp/demo/IceGrid/sessionActivation/HelloI.cpp b/cpp/demo/IceGrid/sessionActivation/HelloI.cpp
index caa0bbccc1c..5cae1cd58e7 100644
--- a/cpp/demo/IceGrid/sessionActivation/HelloI.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/HelloI.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -17,7 +17,7 @@ HelloI::HelloI(const string& name) : _name(name)
 }
 
 void
-HelloI::sayHello(const Ice::Current&) const
+HelloI::sayHello(const Ice::Current&)
 {
     cout << _name << " says Hello World!" << endl;
 }
diff --git a/cpp/demo/IceGrid/sessionActivation/HelloI.h b/cpp/demo/IceGrid/sessionActivation/HelloI.h
index b2e4c6ee55c..692f30b3c81 100644
--- a/cpp/demo/IceGrid/sessionActivation/HelloI.h
+++ b/cpp/demo/IceGrid/sessionActivation/HelloI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -18,7 +18,7 @@ public:
 
     HelloI(const std::string&);
 
-    virtual void sayHello(const Ice::Current&) const;
+    virtual void sayHello(const Ice::Current&);
 
 private:
     
diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile b/cpp/demo/IceGrid/sessionActivation/Makefile
index b7ed50d2fe7..d4c30e1fec0 100644
--- a/cpp/demo/IceGrid/sessionActivation/Makefile
+++ b/cpp/demo/IceGrid/sessionActivation/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak
index c7f0e00647c..645b2af88f1 100644
--- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak
+++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/sessionActivation/Server.cpp b/cpp/demo/IceGrid/sessionActivation/Server.cpp
index 3f50a036bd8..bf2e6fa7f5d 100644
--- a/cpp/demo/IceGrid/sessionActivation/Server.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Server.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/sessionActivation/application.xml b/cpp/demo/IceGrid/sessionActivation/application.xml
index fed60ef2de3..90f4d5e7755 100644
--- a/cpp/demo/IceGrid/sessionActivation/application.xml
+++ b/cpp/demo/IceGrid/sessionActivation/application.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+ Copyright (c) 2003-2009 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/cpp/demo/IceGrid/sessionActivation/expect.py b/cpp/demo/IceGrid/sessionActivation/expect.py
index 821455ebd92..0f511c38612 100755
--- a/cpp/demo/IceGrid/sessionActivation/expect.py
+++ b/cpp/demo/IceGrid/sessionActivation/expect.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp
index 31f6a858af9..450b7bf773a 100644
--- a/cpp/demo/IceGrid/simple/Client.cpp
+++ b/cpp/demo/IceGrid/simple/Client.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/simple/Hello.ice b/cpp/demo/IceGrid/simple/Hello.ice
index bb8fc0971a5..4b123a06908 100644
--- a/cpp/demo/IceGrid/simple/Hello.ice
+++ b/cpp/demo/IceGrid/simple/Hello.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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 @@ module Demo
 
 interface Hello
 {
-    ["cpp:const"] idempotent void sayHello();
+    idempotent void sayHello();
     void shutdown();
 };
 
diff --git a/cpp/demo/IceGrid/simple/HelloI.cpp b/cpp/demo/IceGrid/simple/HelloI.cpp
index d92675288cf..233c8ec1f54 100644
--- a/cpp/demo/IceGrid/simple/HelloI.cpp
+++ b/cpp/demo/IceGrid/simple/HelloI.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -17,7 +17,7 @@ HelloI::HelloI(const string& name) : _name(name)
 }
 
 void
-HelloI::sayHello(const Ice::Current&) const
+HelloI::sayHello(const Ice::Current&)
 {
     cout << _name << " says Hello World!" << endl;
 }
diff --git a/cpp/demo/IceGrid/simple/HelloI.h b/cpp/demo/IceGrid/simple/HelloI.h
index 189afa1a2da..62802cbc591 100644
--- a/cpp/demo/IceGrid/simple/HelloI.h
+++ b/cpp/demo/IceGrid/simple/HelloI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.
@@ -18,7 +18,7 @@ public:
 
     HelloI(const std::string&);
 
-    virtual void sayHello(const Ice::Current&) const;
+    virtual void sayHello(const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 
 private:
diff --git a/cpp/demo/IceGrid/simple/Makefile b/cpp/demo/IceGrid/simple/Makefile
index b7ed50d2fe7..d4c30e1fec0 100644
--- a/cpp/demo/IceGrid/simple/Makefile
+++ b/cpp/demo/IceGrid/simple/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak
index e64501912c1..91ccc5e5684 100644
--- a/cpp/demo/IceGrid/simple/Makefile.mak
+++ b/cpp/demo/IceGrid/simple/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/cpp/demo/IceGrid/simple/Server.cpp b/cpp/demo/IceGrid/simple/Server.cpp
index 7b2b0b3f005..40e7ca45676 100644
--- a/cpp/demo/IceGrid/simple/Server.cpp
+++ b/cpp/demo/IceGrid/simple/Server.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/cpp/demo/IceGrid/simple/application.xml b/cpp/demo/IceGrid/simple/application.xml
index 707ad51fa10..f9f0fb275f2 100644
--- a/cpp/demo/IceGrid/simple/application.xml
+++ b/cpp/demo/IceGrid/simple/application.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+ Copyright (c) 2003-2009 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/cpp/demo/IceGrid/simple/application_with_replication.xml b/cpp/demo/IceGrid/simple/application_with_replication.xml
index 47ed2716e38..3bdbe39f5b9 100644
--- a/cpp/demo/IceGrid/simple/application_with_replication.xml
+++ b/cpp/demo/IceGrid/simple/application_with_replication.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+ Copyright (c) 2003-2009 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/cpp/demo/IceGrid/simple/application_with_template.xml b/cpp/demo/IceGrid/simple/application_with_template.xml
index 293092211ce..1a7b28ae744 100644
--- a/cpp/demo/IceGrid/simple/application_with_template.xml
+++ b/cpp/demo/IceGrid/simple/application_with_template.xml
@@ -1,7 +1,7 @@
 <!--
  **********************************************************************
 
- Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+ Copyright (c) 2003-2009 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/cpp/demo/IceGrid/simple/expect.py b/cpp/demo/IceGrid/simple/expect.py
index f64723b42e4..536302ca552 100755
--- a/cpp/demo/IceGrid/simple/expect.py
+++ b/cpp/demo/IceGrid/simple/expect.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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.