Squashed commit of the following:

commit c2f83d9a3e0e1f97e76f33d7992ef8e3e2994d91 Author: Matthew Newhook <matthew@zeroc.com> Date: Thu Mar 6 14:22:52 2008 +0800 Cleanup some IceGrid configuration files. commit 4e33903c9ae238b9e317fc3f1f3e281c816374dd Author: Matthew Newhook <matthew@zeroc.com> Date: Thu Mar 6 14:17:10 2008 +0800 remove ttl setting. commit c418b308ff7cc8e8a4296819938b88dfedc16a97 Author: Matthew Newhook <matthew@zeroc.com> Date: Thu Mar 6 14:16:32 2008 +0800 remove useless PopulateEmptyIndices config. commit da70d3936f921aa2c92bd2db7b1fcddb4467a9bd Author: Matthew Newhook <matthew@zeroc.com> Date: Thu Mar 6 13:59:51 2008 +0800 - Removed interrupt handlers for interactive C++ demos. - Lots of cleanups to demos.
author: Matthew Newhook <matthew@zeroc.com> 2008-03-06 14:26:07 +0800
committer: Matthew Newhook <matthew@zeroc.com> 2008-03-06 14:26:07 +0800
commit: bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6 (patch)
tree: dc10cb41cd1280cf115c6bf5a1302481a969e15d
parent: Fix to fix for 2395. Backed out Dwayne's previous change because we both work... (diff)
download: ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.tar.bz2
ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.tar.xz
ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.zip
252 files changed, 1668 insertions, 1106 deletions
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 0954535d8c6..24915169313 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -144,7 +144,6 @@ public:
     TestApp(const string&);
 
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -483,6 +482,7 @@ private:
 };
 
 TestApp::TestApp(const string& envName) :
+    Application(Ice::NoSignalHandling),
     _envName(envName),
     _repetitions(10000)
 {
@@ -724,12 +724,6 @@ TestApp::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     _connection = Freeze::createConnection(communicator(), _envName);
 
     cout << "IntIntMap" << endl;
@@ -823,12 +817,6 @@ TestApp::run(int argc, char* argv[])
     return EXIT_SUCCESS;
 }
 
-void
-TestApp::interruptCallback(int)
-{
-    exit(EXIT_SUCCESS);
-}
-
 int
 main(int argc, char* argv[])
 {
diff --git a/cpp/demo/Freeze/casino/config.client b/cpp/demo/Freeze/casino/config.client
index 8169fbeb95f..98eb6324dd0 100644
--- a/cpp/demo/Freeze/casino/config.client
+++ b/cpp/demo/Freeze/casino/config.client
@@ -1 +1,5 @@
+#
+# The client reads this property to create the reference to the
+# "bank" object in the server.
+#
 Bank.Proxy=bank/Montecito:default -p 10000
diff --git a/cpp/demo/Freeze/casino/config.server b/cpp/demo/Freeze/casino/config.server
index b1d28a9512a..3faf56e8050 100644
--- a/cpp/demo/Freeze/casino/config.server
+++ b/cpp/demo/Freeze/casino/config.server
@@ -1,21 +1,53 @@
+#
+# Configure the server endpoints.
+#
 Casino.Endpoints=default -p 10000
 
+#
+# The bank can have more chances of winning than regular players.
+# must be >= 1
+# 1 : like 1 players
+# 2 : like 2 players
+# etc
+#
+Bank.Edge=2
+
+#
+# Configure the ice server thread pool with 10 threads.
+#
 Ice.ThreadPool.Server.Size=10
 
+#
+# Disable Freeze deadlock warnings.
+#
 Freeze.Warn.Deadlocks=1
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
 #Freeze.Trace.Evictor=1
 
+#
+# Configure the bank/bet and player evictors to rollback the
+# transaction on any user exception. The default is to commit the
+# transaction.
+#
 Freeze.Evictor.db.bank.RollbackOnUserException=1
 Freeze.Evictor.db.bet.RollbackOnUserException=1
 Freeze.Evictor.db.player.RollbackOnUserException=1
 
-#Freeze.Trace.Transaction=1
-
 #
-# The bank can have more chances of winning than regular players.
-# must be >= 1
-# 1 : like 1 players
-# 2 : like 2 players
-# etc
+# Freeze Transaction Tracing.
 #
-Bank.Edge=2
+# 0 = No transaction activity trace (default). 
+# 1 = Trace transaction IDs and commit and rollback activity.
+#
+#Freeze.Trace.Transaction=1
+
diff --git a/cpp/demo/Freeze/customEvictor/EvictorBase.h b/cpp/demo/Freeze/customEvictor/EvictorBase.h
index 1e5b5ce4d87..0058e5eb36c 100644
--- a/cpp/demo/Freeze/customEvictor/EvictorBase.h
+++ b/cpp/demo/Freeze/customEvictor/EvictorBase.h
@@ -10,7 +10,7 @@
 #ifndef EVICTOR_BASE_H
 #define EVICTOR_BASE_H
 
-#include <Ice/ServantLocator.h>
+#include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
 #include <map>
 #include <list>
diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp
index 5b4345a2936..4e8b21772d5 100644
--- a/cpp/demo/Freeze/library/Client.cpp
+++ b/cpp/demo/Freeze/library/Client.cpp
@@ -14,8 +14,11 @@ using namespace std;
 
 class LibraryClient : public Ice::Application
 {
+public:
+
+    LibraryClient();
+
     virtual int run(int argc, char* argv[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -25,33 +28,18 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
-int
-LibraryClient::run(int argc, char* argv[])
-{
+LibraryClient::LibraryClient() :
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
+    // Since this is an interactive demo we don't want any signal
+    // handling.
     //
-    callbackOnInterrupt();
-
-    int runParser(int, char*[], const Ice::CommunicatorPtr&);
-    return runParser(argc, argv, communicator());
+    Application(Ice::NoSignalHandling)
+{
 }
 
-void
-LibraryClient::interruptCallback(int)
+int
+LibraryClient::run(int argc, char* argv[])
 {
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
+    int runParser(int, char*[], const Ice::CommunicatorPtr&);
+    return runParser(argc, argv, communicator());
 }
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index 682861d8663..8adfb80a77f 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -18,13 +18,9 @@ class LibraryCollocated : public Ice::Application
 {
 public:
     
-    LibraryCollocated(const string& envName) :
-        _envName(envName)
-    {
-    }
+    LibraryCollocated(const string&);
 
     virtual int run(int argc, char* argv[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -38,15 +34,19 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.collocated");
 }
 
-int
-LibraryCollocated::run(int argc, char* argv[])
-{
+LibraryCollocated::LibraryCollocated(const string& envName) :
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
+    // Since this is an interactive demo we don't want any signal
+    // handling.
     //
-    callbackOnInterrupt();
+    Application(Ice::NoSignalHandling),
+    _envName(envName)
+{
+}
 
+int
+LibraryCollocated::run(int argc, char* argv[])
+{
     Ice::PropertiesPtr properties = communicator()->getProperties();
     
     //
@@ -90,21 +90,3 @@ LibraryCollocated::run(int argc, char* argv[])
 
     return status;
 }
-
-void
-LibraryCollocated::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
diff --git a/cpp/demo/Freeze/library/config.collocated b/cpp/demo/Freeze/library/config.collocated
index 26327b7738c..b6ad3d16c2c 100644
--- a/cpp/demo/Freeze/library/config.collocated
+++ b/cpp/demo/Freeze/library/config.collocated
@@ -1,13 +1,49 @@
+#
+# Configure the server endpoints.
+#
 Library.Endpoints=default -p 10000
-Library.Proxy=library:default -p 10000
+
+#
+# Set the evictor size. The size set here (3) is far too small for
+# real-world applications. However, for the purposes of this demo,
+# setting the size to 3 allows us to see the operation of the evictor
+# with evictor tracing.
+#
 EvictorSize=3
 
 #
-# Don't warn about unknown properties.
+# The client reads this property to create the reference to the
+# "library" object in the server.
+#
+Library.Proxy=library:default -p 10000
+
+#
+# Don't warn about unknown properties. If this is not set we'll get a
+# warning about "Library.Proxy" since the Ice run time thinks this is
+# an OA property due to the Object Adapter "Library".
 # 
 Ice.Warn.UnknownProperties=0
 
+#
+# Freeze Map Tracing.
+#
+# 0 = No map activity trace (default). 
+# 1 = Trace database open and close. 
+# 2 = Also trace iterator and transaction operations, and reference
+# counting of the underlying database.
+#
 Freeze.Trace.Map=1
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
 Freeze.Trace.Evictor=2
 
 #
diff --git a/cpp/demo/Freeze/library/config.server b/cpp/demo/Freeze/library/config.server
index e239f6e3583..b8c1a05fbbd 100644
--- a/cpp/demo/Freeze/library/config.server
+++ b/cpp/demo/Freeze/library/config.server
@@ -1,7 +1,36 @@
+#
+# Configure the server endpoints.
+#
 Library.Endpoints=default -p 10000
+
+#
+# Set the evictor size. The size set here (3) is far too small for
+# real-world applications. However, for the purposes of this demo,
+# setting the size to 3 allows us to see the operation of the evictor
+# with evictor tracing.
+#
 EvictorSize=3
 
+#
+# Freeze Map Tracing.
+#
+# 0 = No map activity trace (default). 
+# 1 = Trace database open and close. 
+# 2 = Also trace iterator and transaction operations, and reference
+# counting of the underlying database.
+#
 Freeze.Trace.Map=1
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
 Freeze.Trace.Evictor=2
 
 #
diff --git a/cpp/demo/Freeze/phonebook/Client.cpp b/cpp/demo/Freeze/phonebook/Client.cpp
index afdc0d2d0d4..0c695d5c527 100644
--- a/cpp/demo/Freeze/phonebook/Client.cpp
+++ b/cpp/demo/Freeze/phonebook/Client.cpp
@@ -14,8 +14,11 @@ using namespace std;
 
 class PhoneBookClient : public Ice::Application
 {
+public:
+
+    PhoneBookClient();
+
     virtual int run(int argc, char* argv[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -25,33 +28,18 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
-int
-PhoneBookClient::run(int argc, char* argv[])
-{
+PhoneBookClient::PhoneBookClient() :
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
+    // Since this is an interactive demo we don't want any signal
+    // handling.
     //
-    callbackOnInterrupt();
-
-    int runParser(int, char*[], const Ice::CommunicatorPtr&);
-    return runParser(argc, argv, communicator());
+    Application(Ice::NoSignalHandling)
+{
 }
 
-void
-PhoneBookClient::interruptCallback(int)
+int
+PhoneBookClient::run(int argc, char* argv[])
 {
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
+    int runParser(int, char*[], const Ice::CommunicatorPtr&);
+    return runParser(argc, argv, communicator());
 }
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 2acbe14dc81..8f46ce1f935 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -18,13 +18,8 @@ class PhoneBookCollocated : public Ice::Application
 {
 public:
     
-    PhoneBookCollocated(const string& envName) :
-        _envName(envName)
-    {
-    }
-
+    PhoneBookCollocated(const string&);
     virtual int run(int argc, char* argv[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -38,15 +33,19 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.collocated");
 }
 
-int
-PhoneBookCollocated::run(int argc, char* argv[])
-{
+PhoneBookCollocated::PhoneBookCollocated(const string& envName) :
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
+    // Since this is an interactive demo we don't want any signal
+    // handling.
     //
-    callbackOnInterrupt();
+    Application(Ice::NoSignalHandling),
+    _envName(envName)
+{
+}
 
+int
+PhoneBookCollocated::run(int argc, char* argv[])
+{
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     //
@@ -107,21 +106,3 @@ PhoneBookCollocated::run(int argc, char* argv[])
 
     return status;
 }
-
-void
-PhoneBookCollocated::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
diff --git a/cpp/demo/Freeze/phonebook/config.client b/cpp/demo/Freeze/phonebook/config.client
index a190c3fbdea..4173a2bc068 100644
--- a/cpp/demo/Freeze/phonebook/config.client
+++ b/cpp/demo/Freeze/phonebook/config.client
@@ -1,3 +1,7 @@
+#
+# The client reads this property to create the reference to the
+# "phonebook" object in the server.
+#
 PhoneBook.Proxy=phonebook:default -p 10000
 
 #
diff --git a/cpp/demo/Freeze/phonebook/config.collocated b/cpp/demo/Freeze/phonebook/config.collocated
index ba4ffb95401..74a333f5ca5 100644
--- a/cpp/demo/Freeze/phonebook/config.collocated
+++ b/cpp/demo/Freeze/phonebook/config.collocated
@@ -1,18 +1,57 @@
-Freeze.Trace.Evictor=2
-Freeze.Trace.DbEnv=2
-Freeze.Evictor.db.contacts.SavePeriod=10000
-Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
-
+#
+# Configure the server endpoints.
+#
 PhoneBook.Endpoints=default -p 10000
-PhoneBook.Proxy=phonebook:default -p 10000
+
+#
+# Set the evictor size. The size set here (3) is far too small for
+# real-world applications. However, for the purposes of this demo,
+# setting the size to 3 allows us to see the operation of the evictor
+# with evictor tracing.
+#
 EvictorSize=3
 
 #
-# Don't warn about unknown properties.
+# The client reads this property to create the reference to the
+# "phonebook" object in the server.
+#
+PhoneBook.Proxy=phonebook:default -p 10000
+
+#
+# Don't warn about unknown properties. If this is not set we'll get a
+# warning about "PhoneBook.Proxy" since the Ice run time thinks this is
+# an OA property due to the Object Adapter "PhoneBook".
 # 
 Ice.Warn.UnknownProperties=0
 
 #
+# Set the save period for the contacts Freeze evictor
+# to 10 seconds.
+#
+Freeze.Evictor.db.contacts.SavePeriod=10000
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
+Freeze.Trace.Evictor=2
+
+#
+# Freeze Database Environment Tracing.
+#
+# 0 = No database environment activity trace (default).
+# 1 = Trace database open and close.
+# 2 = Also trace checkpoints and the removal of old log files.
+#
+Freeze.Trace.DbEnv=2
+
+#
 # Warn about connection exceptions
 #
 Ice.Warn.Connections=1
@@ -34,4 +73,3 @@ Ice.Warn.Connections=1
 # 1 = trace protocol messages
 #
 #Ice.Trace.Protocol=1
-
diff --git a/cpp/demo/Freeze/phonebook/config.server b/cpp/demo/Freeze/phonebook/config.server
index 55bd3f015ce..cbe3ed8cd70 100644
--- a/cpp/demo/Freeze/phonebook/config.server
+++ b/cpp/demo/Freeze/phonebook/config.server
@@ -1,12 +1,44 @@
-Freeze.Trace.Evictor=2
-Freeze.Trace.DbEnv=2
-Freeze.Evictor.db.contacts.SavePeriod=10000
-Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
-
+#
+# Configure the server endpoints.
+#
 PhoneBook.Endpoints=default -p 10000
+
+#
+# Set the evictor size. The size set here (3) is far too small for
+# real-world applications. However, for the purposes of this demo,
+# setting the size to 3 allows us to see the operation of the evictor
+# with evictor tracing.
+#
 EvictorSize=3
 
 #
+# Set the save period for the contacts Freeze evictor
+# to 10 seconds.
+#
+Freeze.Evictor.db.contacts.SavePeriod=10000
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
+Freeze.Trace.Evictor=2
+
+#
+# Freeze Database Environment Tracing.
+#
+# 0 = No database environment activity trace (default).
+# 1 = Trace database open and close.
+# 2 = Also trace checkpoints and the removal of old log files.
+#
+Freeze.Trace.DbEnv=2
+
+#
 # Warn about connection exceptions
 #
 Ice.Warn.Connections=1
@@ -28,4 +60,3 @@ Ice.Warn.Connections=1
 # 1 = trace protocol messages
 #
 #Ice.Trace.Protocol=1
-
diff --git a/cpp/demo/Glacier2/callback/.depend b/cpp/demo/Glacier2/callback/.depend
index c5cd31e0397..7bb4180bb42 100644
--- a/cpp/demo/Glacier2/callback/.depend
+++ b/cpp/demo/Glacier2/callback/.depend
@@ -1,8 +1,8 @@
-Callback$(OBJEXT): Callback.cpp Callback.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-CallbackI$(OBJEXT): CallbackI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h CallbackI.h Callback.h
-Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/Glacier2/Router.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h CallbackI.h Callback.h
-Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h CallbackI.h Callback.h
-SessionServer$(OBJEXT): SessionServer.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h SessionI.h $(includedir)/Glacier2/PermissionsVerifier.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/Glacier2/Session.h
-SessionI$(OBJEXT): SessionI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h SessionI.h $(includedir)/Glacier2/PermissionsVerifier.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/Glacier2/Session.h
+Callback$(OBJEXT): Callback.cpp Callback.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+CallbackI$(OBJEXT): CallbackI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h CallbackI.h Callback.h
+Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/Glacier2/Router.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h CallbackI.h Callback.h
+Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h CallbackI.h Callback.h
+SessionServer$(OBJEXT): SessionServer.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h SessionI.h $(includedir)/Glacier2/Glacier2.h $(includedir)/Glacier2/Router.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/Glacier2/PermissionsVerifier.h
+SessionI$(OBJEXT): SessionI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h SessionI.h $(includedir)/Glacier2/Glacier2.h $(includedir)/Glacier2/Router.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/Glacier2/PermissionsVerifier.h
 Callback.cpp: Callback.ice
 Callback.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index bc3bfb62a17..34833d4d503 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -18,8 +18,9 @@ class CallbackClient : public Ice::Application
 {
 public:
 
+    CallbackClient();
+
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -45,6 +46,15 @@ menu()
         "?: help\n";
 }
 
+CallbackClient::CallbackClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 CallbackClient::run(int argc, char* argv[])
 {
@@ -54,12 +64,6 @@ CallbackClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     Ice::RouterPrx defaultRouter = communicator()->getDefaultRouter();
     if(!defaultRouter)
     {
@@ -236,21 +240,3 @@ CallbackClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
-
-void
-CallbackClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
diff --git a/cpp/demo/Glacier2/callback/SessionI.h b/cpp/demo/Glacier2/callback/SessionI.h
index c40b8324c95..6f96da6babc 100644
--- a/cpp/demo/Glacier2/callback/SessionI.h
+++ b/cpp/demo/Glacier2/callback/SessionI.h
@@ -11,8 +11,7 @@
 #define SESSION_I_H
 
 #include <Ice/Ice.h>
-#include <Glacier2/PermissionsVerifier.h>
-#include <Glacier2/Session.h>
+#include <Glacier2/Glacier2.h>
 
 class DummyPermissionsVerifierI : public Glacier2::PermissionsVerifier
 {
diff --git a/cpp/demo/Glacier2/callback/config.client b/cpp/demo/Glacier2/callback/config.client
index 6a021819a09..586e7d8d979 100644
--- a/cpp/demo/Glacier2/callback/config.client
+++ b/cpp/demo/Glacier2/callback/config.client
@@ -39,7 +39,7 @@ Ice.RetryIntervals=-1
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp
index 4c7e4d00ada..2595c52b399 100755
--- a/cpp/demo/Glacier2/chat/Client.cpp
+++ b/cpp/demo/Glacier2/chat/Client.cpp
@@ -9,7 +9,7 @@
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <Glacier2/Router.h>
+#include <Glacier2/Glacier2.h>
 #include <Chat.h>
 
 using namespace std;
@@ -91,6 +91,15 @@ class ChatClient : public Ice::Application
 {
 public:
 
+    ChatClient() :
+        //
+        // Since this is an interactive demo we don't want any signal
+        // handling.
+        //
+        Application(Ice::NoSignalHandling)
+    {
+    }
+
     virtual int
     run(int argc, char* argv[])
     {
@@ -100,12 +109,6 @@ public:
             return EXIT_FAILURE;
         }
 
-        //
-        // Since this is an interactive demo we want the custom interrupt
-        // callback to be called when the process is interrupted.
-        //
-        callbackOnInterrupt();
-
         {
             IceUtil::Mutex::Lock sync(_mutex);
             Ice::RouterPrx defaultRouter = communicator()->getDefaultRouter();
@@ -206,24 +209,6 @@ public:
         return EXIT_SUCCESS;
     }
 
-    virtual void
-    interruptCallback(int)
-    {
-        try
-        {
-            communicator()->destroy();
-        }
-        catch(const IceUtil::Exception& ex)
-        {
-            cerr << appName() << ": " << ex << endl;
-        }
-        catch(...)
-        {
-            cerr << appName() << ": unknown exception" << endl;
-        }
-        exit(EXIT_SUCCESS);
-    }
-
 private:
 
     void
diff --git a/cpp/demo/Glacier2/chat/Server.cpp b/cpp/demo/Glacier2/chat/Server.cpp
index 26c8df893d7..8dfbd00f196 100755
--- a/cpp/demo/Glacier2/chat/Server.cpp
+++ b/cpp/demo/Glacier2/chat/Server.cpp
@@ -8,8 +8,8 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <Glacier2/Glacier2.h>
 #include <ChatSessionI.h>
-#include <Glacier2/PermissionsVerifier.h>
 
 using namespace std;
 using namespace Demo;
diff --git a/cpp/demo/Glacier2/chat/config.client b/cpp/demo/Glacier2/chat/config.client
index e7916b6b81f..a91af213da6 100644
--- a/cpp/demo/Glacier2/chat/config.client
+++ b/cpp/demo/Glacier2/chat/config.client
@@ -33,7 +33,7 @@ Ice.RetryIntervals=-1
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cpp/demo/Glacier2/chat/config.glacier2 b/cpp/demo/Glacier2/chat/config.glacier2
index 1a519dc89dc..bbba4299300 100644
--- a/cpp/demo/Glacier2/chat/config.glacier2
+++ b/cpp/demo/Glacier2/chat/config.glacier2
@@ -1,3 +1,6 @@
+#
+# Set the Glacier2 instance name.
+#
 Glacier2.InstanceName=DemoGlacier2
 
 #
diff --git a/cpp/demo/Ice/async/Client.cpp b/cpp/demo/Ice/async/Client.cpp
index a48960ea8df..d7c7b2a430e 100644
--- a/cpp/demo/Ice/async/Client.cpp
+++ b/cpp/demo/Ice/async/Client.cpp
@@ -31,14 +31,24 @@ class AsyncClient : public Ice::Application
 {
 public:
 
+    AsyncClient();
+
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
     void menu();
 };
 
+AsyncClient::AsyncClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 main(int argc, char* argv[])
 {
@@ -55,8 +65,6 @@ AsyncClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    callbackOnInterrupt();
-
     HelloPrx hello = HelloPrx::checkedCast(communicator()->propertyToProxy("Hello.Proxy"));
     if(!hello)
     {
@@ -110,24 +118,6 @@ AsyncClient::run(int argc, char* argv[])
 }
 
 void
-AsyncClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 AsyncClient::menu()
 {
     cout <<
diff --git a/cpp/demo/Ice/bidir/Client.cpp b/cpp/demo/Ice/bidir/Client.cpp
index eb88e4f6259..becfd52ba01 100644
--- a/cpp/demo/Ice/bidir/Client.cpp
+++ b/cpp/demo/Ice/bidir/Client.cpp
@@ -48,8 +48,7 @@ CallbackClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    CallbackSenderPrx server = 
-        CallbackSenderPrx::checkedCast(communicator()->propertyToProxy("Callback.Client.CallbackServer"));
+    CallbackSenderPrx server = CallbackSenderPrx::checkedCast(communicator()->propertyToProxy("CallbackSender.Proxy"));
     if(!server)
     {
         cerr << appName() << ": invalid proxy" << endl;
diff --git a/cpp/demo/Ice/bidir/config.client b/cpp/demo/Ice/bidir/config.client
index c11ffbbb081..a4d87b71056 100644
--- a/cpp/demo/Ice/bidir/config.client
+++ b/cpp/demo/Ice/bidir/config.client
@@ -1,4 +1,8 @@
-Callback.Client.CallbackServer=sender:tcp -p 10000
+#
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=sender:tcp -p 10000
 
 #
 # Warn about connection exceptions
@@ -6,7 +10,7 @@ Callback.Client.CallbackServer=sender:tcp -p 10000
 Ice.Warn.Connections=1
 
 #
-# ACM must be disabled for bidirectional connections
+# Client-side ACM must be disabled for bidirectional connections.
 #
 Ice.ACM.Client=0
 
diff --git a/cpp/demo/Ice/bidir/config.server b/cpp/demo/Ice/bidir/config.server
index ef2745b172b..d951b63be3c 100644
--- a/cpp/demo/Ice/bidir/config.server
+++ b/cpp/demo/Ice/bidir/config.server
@@ -1,3 +1,8 @@
+#
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
+#
 Callback.Server.Endpoints=tcp -p 10000
 
 #
@@ -6,11 +11,6 @@ Callback.Server.Endpoints=tcp -p 10000
 Ice.Warn.Connections=1
 
 #
-# ACM must be disabled for bidirectional connections
-#
-Ice.ACM.Client=0
-
-#
 # Network Tracing
 #
 # 0 = no network tracing
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index 427d6fb291d..bcc4c6f88ca 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -37,8 +37,9 @@ class CallbackClient : public Ice::Application
 {
 public:
 
+    CallbackClient();
+
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -52,6 +53,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+CallbackClient::CallbackClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 CallbackClient::run(int argc, char* argv[])
 {
@@ -61,15 +71,8 @@ CallbackClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     CallbackSenderPrx twoway = CallbackSenderPrx::checkedCast(
-        communicator()->propertyToProxy("Callback.CallbackServer")->
-            ice_twoway()->ice_timeout(-1)->ice_secure(false));
+        communicator()->propertyToProxy("CallbackSender.Proxy")->ice_twoway()->ice_timeout(-1)->ice_secure(false));
     if(!twoway)
     {
         cerr << appName() << ": invalid proxy" << endl;
@@ -192,24 +195,6 @@ CallbackClient::run(int argc, char* argv[])
 }
 
 void
-CallbackClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 CallbackClient::menu()
 {
     cout <<
diff --git a/cpp/demo/Ice/callback/config.client b/cpp/demo/Ice/callback/config.client
index 7a2b3433705..8ff53d14554 100644
--- a/cpp/demo/Ice/callback/config.client
+++ b/cpp/demo/Ice/callback/config.client
@@ -1,8 +1,18 @@
-Callback.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+#
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+
+#
+# The client creates one single object adapter with the name
+# "Callback.Client". The following line sets the endpoints for this
+# adapter.
+#
 Callback.Client.Endpoints=tcp:udp:ssl
 
 #
-# Warn about connection exceptions
+# Warn about connection exceptions.
 #
 Ice.Warn.Connections=1
 
diff --git a/cpp/demo/Ice/callback/config.server b/cpp/demo/Ice/callback/config.server
index 4bc48acf7ae..d45dbd27e46 100644
--- a/cpp/demo/Ice/callback/config.server
+++ b/cpp/demo/Ice/callback/config.server
@@ -1,3 +1,8 @@
+#
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
+#
 Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index 10afd89365d..a9bfb0330a9 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -17,8 +17,9 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
+
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -32,6 +33,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 HelloClient::run(int argc, char* argv[])
 {
@@ -41,12 +51,6 @@ HelloClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     HelloPrx twoway = HelloPrx::checkedCast(
         communicator()->propertyToProxy("Hello.Proxy")->ice_twoway()->ice_timeout(-1)->ice_secure(false));
     if(!twoway)
@@ -202,24 +206,6 @@ HelloClient::run(int argc, char* argv[])
 }
 
 void
-HelloClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 HelloClient::menu()
 {
     cout <<
diff --git a/cpp/demo/Ice/hello/config.client b/cpp/demo/Ice/hello/config.client
index 97a82f711cd..2b86cb75c2e 100644
--- a/cpp/demo/Ice/hello/config.client
+++ b/cpp/demo/Ice/hello/config.client
@@ -7,10 +7,13 @@ Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Client-side ACM is enabled by default, with an interval of 60
+# seconds. For this demo, we want to use a short timeout of 10
+# seconds. By enabling network tracing below, you can see ACM
+# automatically close idle connections.
 #
 Ice.ACM.Client=10
 
diff --git a/cpp/demo/Ice/hello/config.server b/cpp/demo/Ice/hello/config.server
index 45c8ff54d6f..cc4c1de1a5d 100644
--- a/cpp/demo/Ice/hello/config.server
+++ b/cpp/demo/Ice/hello/config.server
@@ -8,10 +8,13 @@ Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Server-side ACM is disabled by default. For this demo, we want it
+# enabled and set to a short timeout of 10 seconds. By enabling
+# network tracing below, you can see ACM automatically close idle
+# connections.
 #
 Ice.ACM.Server=10
 
diff --git a/cpp/demo/Ice/invoke/Client.cpp b/cpp/demo/Ice/invoke/Client.cpp
index 038d09da54a..d209180f66e 100644
--- a/cpp/demo/Ice/invoke/Client.cpp
+++ b/cpp/demo/Ice/invoke/Client.cpp
@@ -17,8 +17,8 @@ class InvokeClient : public Ice::Application
 {
 public:
 
+    InvokeClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -50,6 +50,15 @@ operator<<(ostream& out, Demo::Color c)
     return out;
 }
 
+InvokeClient::InvokeClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 InvokeClient::run(int argc, char* argv[])
 {
@@ -59,12 +68,6 @@ InvokeClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     Ice::ObjectPrx obj = communicator()->propertyToProxy("Printer.Proxy");
 
     menu();
@@ -306,24 +309,6 @@ InvokeClient::run(int argc, char* argv[])
 }
 
 void
-InvokeClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 InvokeClient::menu()
 {
     cout <<
diff --git a/cpp/demo/Ice/invoke/config.client b/cpp/demo/Ice/invoke/config.client
index 8fc715b687d..a4a29daf99e 100644
--- a/cpp/demo/Ice/invoke/config.client
+++ b/cpp/demo/Ice/invoke/config.client
@@ -1 +1,45 @@
-Printer.Proxy=printer:tcp -p 10000
+#
+# The client reads this property to create the reference to the
+# "Printer" object in the server.
+#
+Printer.Proxy=printer:default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# Network Tracing
+#
+# 0 = no network tracing
+# 1 = trace connection establishment and closure
+# 2 = like 1, but more detailed
+# 3 = like 2, but also trace data transfer
+#
+#Ice.Trace.Network=1
+
+#
+# Protocol Tracing
+#
+# 0 = no protocol tracing
+# 1 = trace protocol messages
+#
+#Ice.Trace.Protocol=1
+
+#
+# Security Tracing
+#
+# 0 = no security tracing
+# 1 = trace messages
+#
+#IceSSL.Trace.Security=1
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
+IceSSL.DefaultDir=../../../../certs
+IceSSL.CertAuthFile=cacert.pem
+IceSSL.CertFile=c_rsa1024_pub.pem
+IceSSL.KeyFile=c_rsa1024_priv.pem
diff --git a/cpp/demo/Ice/invoke/config.server b/cpp/demo/Ice/invoke/config.server
index 49e49e0ccd9..dfccb90d6d5 100644
--- a/cpp/demo/Ice/invoke/config.server
+++ b/cpp/demo/Ice/invoke/config.server
@@ -1 +1,46 @@
-Printer.Endpoints=tcp -p 10000
+#
+# The server creates one single object adapter with the name
+# "Printer". The following line sets the endpoints for this
+# adapter.
+#
+Printer.Endpoints=default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# Network Tracing
+#
+# 0 = no network tracing
+# 1 = trace connection establishment and closure
+# 2 = like 1, but more detailed
+# 3 = like 2, but also trace data transfer
+#
+#Ice.Trace.Network=1
+
+#
+# Protocol Tracing
+#
+# 0 = no protocol tracing
+# 1 = trace protocol messages
+#
+#Ice.Trace.Protocol=1
+
+#
+# Security Tracing
+#
+# 0 = no security tracing
+# 1 = trace messages
+#
+#IceSSL.Trace.Security=1
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
+IceSSL.DefaultDir=../../../../certs
+IceSSL.CertAuthFile=cacert.pem
+IceSSL.CertFile=s_rsa1024_pub.pem
+IceSSL.KeyFile=s_rsa1024_priv.pem
diff --git a/cpp/demo/Ice/latency/Client.cpp b/cpp/demo/Ice/latency/Client.cpp
index 1ac3f2ab2c4..8f9d414daa8 100644
--- a/cpp/demo/Ice/latency/Client.cpp
+++ b/cpp/demo/Ice/latency/Client.cpp
@@ -36,8 +36,7 @@ LatencyClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    Ice::ObjectPrx base = communicator()->propertyToProxy("Latency.Ping");
-    PingPrx ping = PingPrx::checkedCast(base);
+    PingPrx ping = PingPrx::checkedCast(communicator()->propertyToProxy("Ping.Proxy"));
     if(!ping)
     {
         cerr << argv[0] << ": invalid proxy" << endl;
diff --git a/cpp/demo/Ice/latency/config.client b/cpp/demo/Ice/latency/config.client
index 368adbf1f30..612a8fe0589 100644
--- a/cpp/demo/Ice/latency/config.client
+++ b/cpp/demo/Ice/latency/config.client
@@ -1,4 +1,13 @@
-Latency.Ping=ping:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the "Ping"
+# object in the server.
+#
+Ping.Proxy=ping:default -p 10000 -h 127.0.0.1
+
+#
+# Disable client-side ACM.
+#
+Ice.ACM.Client=0
 
 #
 # SSL Configuration
@@ -9,7 +18,3 @@ IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=c_rsa1024_pub.pem
 IceSSL.KeyFile=c_rsa1024_priv.pem
 
-#
-# Disable ACM
-#
-Ice.ACM.Client=0
diff --git a/cpp/demo/Ice/latency/config.server b/cpp/demo/Ice/latency/config.server
index 0dde182f1d8..d813671e5c2 100644
--- a/cpp/demo/Ice/latency/config.server
+++ b/cpp/demo/Ice/latency/config.server
@@ -1,6 +1,15 @@
+#
+# 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 127.0.0.1
 
 #
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
 # SSL Configuration
 #
 Ice.Plugin.IceSSL=IceSSL:createIceSSL
diff --git a/cpp/demo/Ice/multicast/.depend b/cpp/demo/Ice/multicast/.depend
index 3056ea989eb..5c103ccabb4 100644
--- a/cpp/demo/Ice/multicast/.depend
+++ b/cpp/demo/Ice/multicast/.depend
@@ -1,7 +1,7 @@
-Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-Discovery$(OBJEXT): Discovery.cpp Discovery.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Hello.h Discovery.h
-Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Discovery.h Hello.h
+Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+Discovery$(OBJEXT): Discovery.cpp Discovery.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/RWRecMutex.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/UUID.h Hello.h Discovery.h
+Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Discovery.h Hello.h
 Discovery.cpp: Discovery.ice
 Hello.cpp: Hello.ice
 Discovery.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/Ice/multicast/Client.cpp b/cpp/demo/Ice/multicast/Client.cpp
index bd91eb6a0a1..7227019b964 100644
--- a/cpp/demo/Ice/multicast/Client.cpp
+++ b/cpp/demo/Ice/multicast/Client.cpp
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <IceUtil/Time.h>
+#include <IceUtil/IceUtil.h>
 
 #include <Hello.h>
 #include <Discovery.h>
diff --git a/cpp/demo/Ice/multicast/Server.cpp b/cpp/demo/Ice/multicast/Server.cpp
index ded1993a5b1..3b016480f66 100644
--- a/cpp/demo/Ice/multicast/Server.cpp
+++ b/cpp/demo/Ice/multicast/Server.cpp
@@ -30,7 +30,8 @@ class DiscoverI : public Discover
 {
 public:
 
-    DiscoverI(const Ice::ObjectPrx& obj) : _obj(obj)
+    DiscoverI(const Ice::ObjectPrx& obj) :
+        _obj(obj)
     {
     }
 
diff --git a/cpp/demo/Ice/multicast/config.client b/cpp/demo/Ice/multicast/config.client
index 1335102bf9a..b68bb269f33 100644
--- a/cpp/demo/Ice/multicast/config.client
+++ b/cpp/demo/Ice/multicast/config.client
@@ -1,6 +1,6 @@
 #
 # The client reads this property to create the reference to the
-# "discovery" object in the server.
+# "Discover" object in the server.
 #
 Discover.Proxy=discover:udp -h 224.0.0.5 -p 10000
 
@@ -20,12 +20,7 @@ DiscoverReply.Endpoints=tcp
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
-
-#
-# We want a faster ACM for this demo.
-#
-Ice.ACM.Client=10
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cpp/demo/Ice/multicast/config.server b/cpp/demo/Ice/multicast/config.server
index b92327ce946..451f9e5d5a5 100644
--- a/cpp/demo/Ice/multicast/config.server
+++ b/cpp/demo/Ice/multicast/config.server
@@ -19,7 +19,7 @@ Hello.Endpoints=tcp
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index fa91add84c2..f3129a8d7f3 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -18,8 +18,8 @@ class NestedClient : public Ice::Application
 {
 public:
 
+    NestedClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -29,6 +29,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+NestedClient::NestedClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 NestedClient::run(int argc, char* argv[])
 {
@@ -38,13 +47,7 @@ NestedClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
-    NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.NestedServer"));
+    NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.Proxy"));
     if(!nested)
     {
         cerr << appName() << ": invalid proxy" << endl;
@@ -84,27 +87,3 @@ NestedClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
-
-void
-NestedClient::interruptCallback(int)
-{
-/*
- * For this demo we won't destroy the communicator since it has to
- * wait for any outstanding invocations to complete which may take
- * some time if the nesting level is exceeded.
- *
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-*/
-    exit(EXIT_SUCCESS);
-}
diff --git a/cpp/demo/Ice/nested/config.client b/cpp/demo/Ice/nested/config.client
index 7463a518e08..8917bfac6fb 100644
--- a/cpp/demo/Ice/nested/config.client
+++ b/cpp/demo/Ice/nested/config.client
@@ -1,6 +1,23 @@
-Nested.NestedServer=nestedServer:default -p 10000 -t 10000
+#
+# The client reads this property to create the reference to the
+# "Nested" object in the server.
+#
+Nested.Proxy=nestedServer:default -p 10000 -t 10000
+
+#
+# The client creates one single object adapter with the name
+# "Nested.Client". The following line sets the endpoints for this
+# adapter.
+#
 Nested.Client.Endpoints=default -t 10000
 
+#
+# The following properties configure the server thread pool. The
+# thread pool initially contains 5 threads, and the Ice run time
+# starts emitting warnings once 5 threads are in use. The Ice run time
+# creates more threads once all 5 are in use, up to a maximum of 10
+# threads.
+#
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
 Ice.ThreadPool.Server.SizeMax=10
@@ -8,7 +25,7 @@ Ice.ThreadPool.Server.SizeMax=10
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cpp/demo/Ice/nested/config.server b/cpp/demo/Ice/nested/config.server
index f7e06bd36a7..e5829d719e1 100644
--- a/cpp/demo/Ice/nested/config.server
+++ b/cpp/demo/Ice/nested/config.server
@@ -1,5 +1,17 @@
+#
+# The server creates one single object adapter with the name
+# "Nested.Server". The following line sets the endpoints for this
+# adapter.
+#
 Nested.Server.Endpoints=default -p 10000 -t 10000
 
+#
+# The following properties configure the server thread pool. The
+# thread pool initially contains 5 threads, and the Ice run time
+# starts emitting warnings once 5 threads are in use. The Ice run time
+# creates more threads once all 5 are in use, up to a maximum of 10
+# threads.
+#
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
 Ice.ThreadPool.Server.SizeMax=10
@@ -7,7 +19,7 @@ Ice.ThreadPool.Server.SizeMax=10
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cpp/demo/Ice/session/Client.cpp b/cpp/demo/Ice/session/Client.cpp
index 7d68813082a..ea11f4a2091 100755
--- a/cpp/demo/Ice/session/Client.cpp
+++ b/cpp/demo/Ice/session/Client.cpp
@@ -77,8 +77,8 @@ class SessionClient : public Ice::Application
 {
 public:
 
+    SessionClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -101,6 +101,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+SessionClient::SessionClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 SessionClient::run(int argc, char* argv[])
 {
@@ -110,12 +119,6 @@ SessionClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     string name;
     cout << "Please enter your name ==> ";
     cin >> name;
@@ -226,42 +229,6 @@ SessionClient::run(int argc, char* argv[])
 }
 
 void
-SessionClient::interruptCallback(int sig)
-{
-    //
-    // Workaround for older Linux platforms where SIGHUP is received
-    // when the process has a controlling terminal (such as under
-    // expect).
-    //
-    if(sig == SIGHUP)
-    {
-        return;
-    }
-
-    //
-    // Terminate the refresh thread, destroy the session and then
-    // destroy the communicator, followed by an exit. We have to call
-    // exit because main may be blocked in a cin >> s call which
-    // cannot be interrupted portably.
-    //
-    cleanup(true);
-
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 SessionClient::cleanup(bool destroy)
 {
     IceUtil::Mutex::Lock sync(_mutex);
diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index 2d6944014cb..1a3264c50ca 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -19,8 +19,8 @@ class ThroughputClient : public Ice::Application
 {
 public:
 
+    ThroughputClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -34,6 +34,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+ThroughputClient::ThroughputClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 ThroughputClient::run(int argc, char* argv[])
 {
@@ -43,14 +52,7 @@ ThroughputClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
-    Ice::ObjectPrx base = communicator()->propertyToProxy("Throughput.Throughput");
-    ThroughputPrx throughput = ThroughputPrx::checkedCast(base);
+    ThroughputPrx throughput = ThroughputPrx::checkedCast(communicator()->propertyToProxy("Throughput.Proxy"));
     if(!throughput)
     {
         cerr << argv[0] << ": invalid proxy" << endl;
@@ -443,24 +445,6 @@ ThroughputClient::run(int argc, char* argv[])
 }
 
 void
-ThroughputClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 ThroughputClient::menu()
 {
     cout <<
diff --git a/cpp/demo/Ice/throughput/config.client b/cpp/demo/Ice/throughput/config.client
index a26fc99fde6..4ad70cb1198 100644
--- a/cpp/demo/Ice/throughput/config.client
+++ b/cpp/demo/Ice/throughput/config.client
@@ -1,4 +1,13 @@
-Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the
+# "Throughput" object in the server.
+#
+Throughput.Proxy=throughput:default -p 10000 -h 127.0.0.1
+
+#
+# Disable client-side ACM.
+#
+Ice.ACM.Client=0
 
 #
 # SSL Configuration
@@ -9,7 +18,3 @@ IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=c_rsa1024_pub.pem
 IceSSL.KeyFile=c_rsa1024_priv.pem
 
-#
-# Disable ACM
-#
-Ice.ACM.Client=0
diff --git a/cpp/demo/Ice/throughput/config.server b/cpp/demo/Ice/throughput/config.server
index 8de55f8102d..72ade87ebba 100644
--- a/cpp/demo/Ice/throughput/config.server
+++ b/cpp/demo/Ice/throughput/config.server
@@ -1,4 +1,14 @@
-Throughput.Endpoints=default -p 10000
+#
+# The server creates one single object adapter with the name
+# "Throughput". The following line sets the endpoints for this
+# adapter.
+#
+Throughput.Endpoints=default -p 10000 -h 127.0.0.1
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
 
 #
 # SSL Configuration
diff --git a/cpp/demo/Ice/value/.depend b/cpp/demo/Ice/value/.depend
index 320a032477f..d79402a1ce3 100644
--- a/cpp/demo/Ice/value/.depend
+++ b/cpp/demo/Ice/value/.depend
@@ -1,7 +1,7 @@
-Value$(OBJEXT): Value.cpp Value.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-ValueI$(OBJEXT): ValueI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h ValueI.h Value.h
-Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Value.h ObjectFactory.h
-ObjectFactory$(OBJEXT): ObjectFactory.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h ObjectFactory.h ValueI.h Value.h
-Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h ValueI.h Value.h
+Value$(OBJEXT): Value.cpp Value.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+ValueI$(OBJEXT): ValueI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h ValueI.h Value.h
+Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Value.h ObjectFactory.h
+ObjectFactory$(OBJEXT): ObjectFactory.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h ObjectFactory.h ValueI.h Value.h
+Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h ValueI.h Value.h
 Value.cpp: Value.ice
 Value.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index 3b0daf52ce1..c30ca2b6d26 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -18,8 +18,8 @@ class ValueClient : public Ice::Application
 {
 public:
 
+    ValueClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -29,6 +29,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+ValueClient::ValueClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 ValueClient::run(int argc, char* argv[])
 {
@@ -38,14 +47,7 @@ ValueClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
-    Ice::ObjectPrx base = communicator()->propertyToProxy("Value.Initial");
-    InitialPrx initial = InitialPrx::checkedCast(base);
+    InitialPrx initial = InitialPrx::checkedCast(communicator()->propertyToProxy("Initial.Proxy"));
     if(!initial)
     {
         cerr << argv[0] << ": invalid object reference" << endl;
@@ -187,21 +189,3 @@ ValueClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
-
-void
-ValueClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
diff --git a/cpp/demo/Ice/value/ObjectFactory.h b/cpp/demo/Ice/value/ObjectFactory.h
index 11f02d44bcd..01f02a7c1b3 100644
--- a/cpp/demo/Ice/value/ObjectFactory.h
+++ b/cpp/demo/Ice/value/ObjectFactory.h
@@ -10,6 +10,8 @@
 #ifndef SERVANT_FACTORY_H
 #define SERVANT_FACTORY_H
 
+#include <Ice/Ice.h>
+
 class ObjectFactory : public Ice::ObjectFactory
 {
 public:
diff --git a/cpp/demo/Ice/value/config.client b/cpp/demo/Ice/value/config.client
index 60e3316a0f9..aa0dc669ca1 100644
--- a/cpp/demo/Ice/value/config.client
+++ b/cpp/demo/Ice/value/config.client
@@ -1,4 +1,10 @@
 #
-# The client's proxy.
+# The client reads this property to create the reference to the
+# "Initial" object in the server.
 #
-Value.Initial=initial:tcp -p 10000
+Initial.Proxy=initial:default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/cpp/demo/Ice/value/config.server b/cpp/demo/Ice/value/config.server
index 8189baed470..4ec2d8b57df 100644
--- a/cpp/demo/Ice/value/config.server
+++ b/cpp/demo/Ice/value/config.server
@@ -1,4 +1,11 @@
 #
-# The server's adapter endpoint.
+# The server creates one single object adapter with the name
+# "Value". The following line sets the endpoints for this
+# adapter.
 #
-Value.Endpoints=tcp -p 10000
+Value.Endpoints=default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp
index a92f79869cd..d736523e1f9 100644
--- a/cpp/demo/IceBox/hello/Client.cpp
+++ b/cpp/demo/IceBox/hello/Client.cpp
@@ -17,8 +17,9 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
+
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -32,20 +33,13 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
-void
-HelloClient::menu()
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
 {
-    cout <<
-        "usage:\n"
-        "t: send greeting as twoway\n"
-        "o: send greeting as oneway\n"
-        "O: send greeting as batch oneway\n"
-        "d: send greeting as datagram\n"
-        "D: send greeting as batch datagram\n"
-        "f: flush all batch requests\n"
-        "S: switch secure mode on/off\n"
-        "x: exit\n"
-        "?: help\n";
 }
 
 int
@@ -57,12 +51,6 @@ HelloClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     HelloPrx twoway = HelloPrx::checkedCast(
         communicator()->propertyToProxy("Hello.Proxy")->ice_twoway()->ice_timeout(-1)->ice_secure(false));
     if(!twoway)
@@ -168,19 +156,17 @@ HelloClient::run(int argc, char* argv[])
 }
 
 void
-HelloClient::interruptCallback(int)
+HelloClient::menu()
 {
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
+    cout <<
+        "usage:\n"
+        "t: send greeting as twoway\n"
+        "o: send greeting as oneway\n"
+        "O: send greeting as batch oneway\n"
+        "d: send greeting as datagram\n"
+        "D: send greeting as batch datagram\n"
+        "f: flush all batch requests\n"
+        "S: switch secure mode on/off\n"
+        "x: exit\n"
+        "?: help\n";
 }
diff --git a/cpp/demo/IceBox/hello/config.client b/cpp/demo/IceBox/hello/config.client
index 81a8410968a..c5cce485e97 100644
--- a/cpp/demo/IceBox/hello/config.client
+++ b/cpp/demo/IceBox/hello/config.client
@@ -28,6 +28,14 @@ Ice.Warn.Connections=1
 #Ice.Trace.Protocol=1
 
 #
+# Security Tracing
+#
+# 0 = no security tracing
+# 1 = trace messages
+#
+#IceSSL.Trace.Security=1
+
+#
 # SSL Configuration
 #
 Ice.Plugin.IceSSL=IceSSL:createIceSSL
@@ -35,4 +43,3 @@ IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=c_rsa1024_pub.pem
 IceSSL.KeyFile=c_rsa1024_priv.pem
-#IceSSL.Trace.Security=1
diff --git a/cpp/demo/IceBox/hello/config.icebox b/cpp/demo/IceBox/hello/config.icebox
index d28f367c194..f43417a8966 100644
--- a/cpp/demo/IceBox/hello/config.icebox
+++ b/cpp/demo/IceBox/hello/config.icebox
@@ -21,7 +21,6 @@
 #
 #IceBox.ServiceManager.Endpoints=tcp -p 9998 -h 127.0.0.1
 
-
 #
 # Ice.Admin configuration
 #
@@ -32,7 +31,6 @@
 Ice.Admin.InstanceName=DemoIceBox
 Ice.Admin.Endpoints=tcp -p 9996 -h 127.0.0.1
 
-
 #
 # The hello service
 #
@@ -60,4 +58,3 @@ Ice.Warn.Connections=1
 # 1 = trace protocol messages
 #
 #Ice.Trace.Protocol=1
-
diff --git a/cpp/demo/IceBox/hello/config.service b/cpp/demo/IceBox/hello/config.service
index 05ef1604b79..260209d18ae 100644
--- a/cpp/demo/IceBox/hello/config.service
+++ b/cpp/demo/IceBox/hello/config.service
@@ -28,6 +28,14 @@ Ice.Warn.Connections=1
 #Ice.Trace.Protocol=1
 
 #
+# Security Tracing
+#
+# 0 = no security tracing
+# 1 = trace messages
+#
+#IceSSL.Trace.Security=1
+
+#
 # SSL Configuration
 #
 Ice.Plugin.IceSSL=IceSSL:createIceSSL
@@ -35,4 +43,3 @@ IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=s_rsa1024_pub.pem
 IceSSL.KeyFile=s_rsa1024_priv.pem
-#IceSSL.Trace.Security=2
diff --git a/cpp/demo/IceGrid/allocate/.depend b/cpp/demo/IceGrid/allocate/.depend
index 7fd22207832..ae1f5aa9ddd 100644
--- a/cpp/demo/IceGrid/allocate/.depend
+++ b/cpp/demo/IceGrid/allocate/.depend
@@ -1,6 +1,6 @@
-Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-Client$(OBJEXT): Client.cpp $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/RWRecMutex.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceGrid/Registry.h $(includedir)/IceGrid/Exception.h $(includedir)/IceGrid/Session.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/IceGrid/Admin.h $(includedir)/Ice/SliceChecksumDict.h $(includedir)/IceGrid/Descriptor.h Hello.h
-HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
-Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+Client$(OBJEXT): Client.cpp $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/RWRecMutex.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceGrid/IceGrid.h $(includedir)/IceGrid/Admin.h $(includedir)/Ice/SliceChecksumDict.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/IceGrid/Exception.h $(includedir)/IceGrid/Descriptor.h $(includedir)/IceGrid/FileParser.h $(includedir)/IceGrid/Locator.h $(includedir)/IceGrid/Observer.h $(includedir)/IceGrid/Query.h $(includedir)/IceGrid/Registry.h $(includedir)/IceGrid/Session.h $(includedir)/IceGrid/UserAccountMapper.h Hello.h
+HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
 Hello.cpp: Hello.ice
 Hello.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/IceGrid/allocate/Client.cpp b/cpp/demo/IceGrid/allocate/Client.cpp
index 3a0587e8b1a..6ac664ce5b7 100644
--- a/cpp/demo/IceGrid/allocate/Client.cpp
+++ b/cpp/demo/IceGrid/allocate/Client.cpp
@@ -9,7 +9,7 @@
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <IceGrid/Registry.h>
+#include <IceGrid/IceGrid.h>
 #include <Hello.h>
 
 using namespace std;
@@ -69,18 +69,14 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
     void cleanup();
     void menu();
     string trim(const string&);
-
-    IceUtil::Mutex _mutex;
-    IceGrid::SessionPrx _session;
-    SessionKeepAliveThreadPtr _keepAlive;
 };
 
 int
@@ -90,6 +86,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 HelloClient::run(int argc, char* argv[])
 {
@@ -101,12 +106,6 @@ HelloClient::run(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast(
         communicator()->stringToProxy("DemoIceGrid/Registry"));
     if(!registry)
@@ -115,6 +114,8 @@ HelloClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
+    IceGrid::SessionPrx session;
+
     while(true)
     {
         cout << "This demo accepts any user-id / password combination.\n";
@@ -131,8 +132,7 @@ HelloClient::run(int argc, char* argv[])
 
         try
         {
-            IceUtil::Mutex::Lock sync(_mutex);
-            _session = registry->createSession(id, password);
+            session = registry->createSession(id, password);
             break;
         }
         catch(const IceGrid::PermissionDeniedException& ex)
@@ -141,11 +141,8 @@ HelloClient::run(int argc, char* argv[])
         }
     }
 
-    {
-        IceUtil::Mutex::Lock sync(_mutex);
-        _keepAlive = new SessionKeepAliveThread(_session, registry->getSessionTimeout() / 2);
-        _keepAlive->start();
-    }
+    SessionKeepAliveThreadPtr keepAlive = new SessionKeepAliveThread(session, registry->getSessionTimeout() / 2);
+    keepAlive->start();
 
     try
     {
@@ -158,11 +155,11 @@ HelloClient::run(int argc, char* argv[])
         HelloPrx hello;
         try
         {
-            hello = HelloPrx::checkedCast(_session->allocateObjectById(communicator()->stringToIdentity("hello")));
+            hello = HelloPrx::checkedCast(session->allocateObjectById(communicator()->stringToIdentity("hello")));
         }
         catch(const IceGrid::ObjectNotRegisteredException&)
         {
-            hello = HelloPrx::checkedCast(_session->allocateObjectByType("::Demo::Hello"));
+            hello = HelloPrx::checkedCast(session->allocateObjectByType("::Demo::Hello"));
         }
         
         menu();
@@ -214,50 +211,17 @@ HelloClient::run(int argc, char* argv[])
         status = EXIT_FAILURE;
     }
 
-    cleanup();
-    return status;
-}
-
-void
-HelloClient::interruptCallback(int)
-{
-    cleanup();
-
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
-HelloClient::cleanup()
-{
-    IceUtil::Mutex::Lock sync(_mutex);
     //
     // Destroy the keepAlive thread and the sesion object otherwise
     // the session will be kept allocated until the timeout occurs.
     // Destroying the session will release all allocated objects.
     //
-    if(_keepAlive)
-    {
-        _keepAlive->destroy();
-        _keepAlive->getThreadControl().join();
-        _keepAlive = 0;
-    }
-    if(_session)
-    {
-        _session->destroy();
-        _session = 0;
-    }
+    keepAlive->destroy();
+    keepAlive->getThreadControl().join();
+
+    session->destroy();
+        
+    return status;
 }
 
 void
diff --git a/cpp/demo/IceGrid/allocate/config.grid b/cpp/demo/IceGrid/allocate/config.grid
index 9b915423d00..913b68efb68 100644
--- a/cpp/demo/IceGrid/allocate/config.grid
+++ b/cpp/demo/IceGrid/allocate/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
diff --git a/cpp/demo/IceGrid/icebox/.depend b/cpp/demo/IceGrid/icebox/.depend
index 4005dae7011..a982233e8f5 100644
--- a/cpp/demo/IceGrid/icebox/.depend
+++ b/cpp/demo/IceGrid/icebox/.depend
@@ -1,6 +1,6 @@
-Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Hello.h
-HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
-HelloServiceI$(OBJEXT): HelloServiceI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloServiceI.h $(includedir)/IceBox/IceBox.h $(includedir)/Ice/SliceChecksumDict.h HelloI.h Hello.h
+Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Hello.h
+HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+HelloServiceI$(OBJEXT): HelloServiceI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloServiceI.h $(includedir)/IceBox/IceBox.h $(includedir)/Ice/SliceChecksumDict.h HelloI.h Hello.h
 Hello.cpp: Hello.ice
 Hello.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/IceGrid/icebox/config.client b/cpp/demo/IceGrid/icebox/config.client
index 98bd1ac6b22..ee39e6ad994 100644
--- a/cpp/demo/IceGrid/icebox/config.client
+++ b/cpp/demo/IceGrid/icebox/config.client
@@ -1,3 +1,7 @@
+#
+# The client reads this property to create the reference to the
+# "hello" object in the server.
+#
 Hello.Proxy=hello
 
 #
diff --git a/cpp/demo/IceGrid/icebox/config.grid b/cpp/demo/IceGrid/icebox/config.grid
index a65c2b9ee61..7515bf57725 100644
--- a/cpp/demo/IceGrid/icebox/config.grid
+++ b/cpp/demo/IceGrid/icebox/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
@@ -12,6 +15,10 @@ IceGrid.Registry.Client.Endpoints=default -p 4061
 IceGrid.Registry.Server.Endpoints=default
 IceGrid.Registry.Internal.Endpoints=default
 IceGrid.Registry.AdminCallbackRouter.Endpoints=default
+
+#
+# Enable the admin session manager for use with Glacier2.
+#
 IceGrid.Registry.AdminSessionManager.Endpoints=default
 
 IceGrid.Registry.Data=db/registry
@@ -34,7 +41,6 @@ IceGrid.Node.CollocateRegistry=1
 # Trace properties.
 #
 IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
 #IceGrid.Node.Trace.Adapter=2
 #IceGrid.Node.Trace.Server=3
 
diff --git a/cpp/demo/IceGrid/replication/.depend b/cpp/demo/IceGrid/replication/.depend
index 78033c6981b..ae1f5aa9ddd 100644
--- a/cpp/demo/IceGrid/replication/.depend
+++ b/cpp/demo/IceGrid/replication/.depend
@@ -1,6 +1,6 @@
-Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-Client$(OBJEXT): Client.cpp $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/RWRecMutex.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceGrid/Query.h $(includedir)/IceGrid/Exception.h Hello.h
-HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
-Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+Client$(OBJEXT): Client.cpp $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/RWRecMutex.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceGrid/IceGrid.h $(includedir)/IceGrid/Admin.h $(includedir)/Ice/SliceChecksumDict.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/IceGrid/Exception.h $(includedir)/IceGrid/Descriptor.h $(includedir)/IceGrid/FileParser.h $(includedir)/IceGrid/Locator.h $(includedir)/IceGrid/Observer.h $(includedir)/IceGrid/Query.h $(includedir)/IceGrid/Registry.h $(includedir)/IceGrid/Session.h $(includedir)/IceGrid/UserAccountMapper.h Hello.h
+HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
 Hello.cpp: Hello.ice
 Hello.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/IceGrid/replication/Client.cpp b/cpp/demo/IceGrid/replication/Client.cpp
index 882bf9eebfe..bba0c55ceb8 100644
--- a/cpp/demo/IceGrid/replication/Client.cpp
+++ b/cpp/demo/IceGrid/replication/Client.cpp
@@ -9,7 +9,7 @@
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/IceGrid.h>
 #include <Hello.h>
 
 using namespace std;
@@ -19,8 +19,8 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -34,6 +34,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 HelloClient::run(int argc, char* argv[])
 {
@@ -44,12 +53,6 @@ HelloClient::run(int argc, char* argv[])
     }
 
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
-    //
     // Get the hello proxy. We configure the proxy to not cache the
     // server connection with the proxy and to disable the locator
     // cache. With this configuration, the IceGrid locator will be
@@ -92,21 +95,3 @@ HelloClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
-
-void
-HelloClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
diff --git a/cpp/demo/IceGrid/replication/config.master b/cpp/demo/IceGrid/replication/config.master
index 04d2053b5ab..a77c11f6271 100644
--- a/cpp/demo/IceGrid/replication/config.master
+++ b/cpp/demo/IceGrid/replication/config.master
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
diff --git a/cpp/demo/IceGrid/replication/config.node1 b/cpp/demo/IceGrid/replication/config.node1
index af6210aa273..3ee49e7517c 100644
--- a/cpp/demo/IceGrid/replication/config.node1
+++ b/cpp/demo/IceGrid/replication/config.node1
@@ -1,3 +1,6 @@
+#
+# The IceGrid locator proxy.
+#
 Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 -t 10000:default -p 12001 -t 10000:default -p 12002 -t 10000
 
 #
diff --git a/cpp/demo/IceGrid/replication/config.node2 b/cpp/demo/IceGrid/replication/config.node2
index f0a4d586dc3..743000ce864 100644
--- a/cpp/demo/IceGrid/replication/config.node2
+++ b/cpp/demo/IceGrid/replication/config.node2
@@ -1,3 +1,6 @@
+#
+# The IceGrid locator proxy.
+#
 Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 -t 10000:default -p 12001 -t 10000:default -p 12002 -t 10000
 
 #
diff --git a/cpp/demo/IceGrid/replication/config.replica1 b/cpp/demo/IceGrid/replication/config.replica1
index 98c9d2ea2ca..2459c824bd7 100644
--- a/cpp/demo/IceGrid/replication/config.replica1
+++ b/cpp/demo/IceGrid/replication/config.replica1
@@ -1,3 +1,6 @@
+#
+# The IceGrid locator proxy.
+#
 Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 -t 10000:default -p 12002 -t 10000
 
 #
diff --git a/cpp/demo/IceGrid/replication/config.replica2 b/cpp/demo/IceGrid/replication/config.replica2
index 1f1499d2112..8ad63aa0c6f 100644
--- a/cpp/demo/IceGrid/replication/config.replica2
+++ b/cpp/demo/IceGrid/replication/config.replica2
@@ -1,3 +1,6 @@
+#
+# The IceGrid locator proxy.
+#
 Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 -t 10000:default -p 12001 -t 10000
 
 #
diff --git a/cpp/demo/IceGrid/sessionActivation/.depend b/cpp/demo/IceGrid/sessionActivation/.depend
index 7fd22207832..ae1f5aa9ddd 100644
--- a/cpp/demo/IceGrid/sessionActivation/.depend
+++ b/cpp/demo/IceGrid/sessionActivation/.depend
@@ -1,6 +1,6 @@
-Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-Client$(OBJEXT): Client.cpp $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/RWRecMutex.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceGrid/Registry.h $(includedir)/IceGrid/Exception.h $(includedir)/IceGrid/Session.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/IceGrid/Admin.h $(includedir)/Ice/SliceChecksumDict.h $(includedir)/IceGrid/Descriptor.h Hello.h
-HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
-Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+Client$(OBJEXT): Client.cpp $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/RWRecMutex.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceGrid/IceGrid.h $(includedir)/IceGrid/Admin.h $(includedir)/Ice/SliceChecksumDict.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/IceGrid/Exception.h $(includedir)/IceGrid/Descriptor.h $(includedir)/IceGrid/FileParser.h $(includedir)/IceGrid/Locator.h $(includedir)/IceGrid/Observer.h $(includedir)/IceGrid/Query.h $(includedir)/IceGrid/Registry.h $(includedir)/IceGrid/Session.h $(includedir)/IceGrid/UserAccountMapper.h Hello.h
+HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
 Hello.cpp: Hello.ice
 Hello.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/IceGrid/sessionActivation/Client.cpp b/cpp/demo/IceGrid/sessionActivation/Client.cpp
index 0592df04ccd..fe3648d795a 100644
--- a/cpp/demo/IceGrid/sessionActivation/Client.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Client.cpp
@@ -9,7 +9,7 @@
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <IceGrid/Registry.h>
+#include <IceGrid/IceGrid.h>
 #include <Hello.h>
 
 using namespace std;
@@ -69,18 +69,14 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
     void cleanup();
     void menu();
     string trim(const string&);
-
-    IceUtil::Mutex _mutex;
-    IceGrid::SessionPrx _session;
-    SessionKeepAliveThreadPtr _keepAlive;
 };
 
 int
@@ -90,6 +86,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 HelloClient::run(int argc, char* argv[])
 {
@@ -101,12 +106,6 @@ HelloClient::run(int argc, char* argv[])
 
     int status = EXIT_SUCCESS;
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     IceGrid::RegistryPrx registry = 
         IceGrid::RegistryPrx::checkedCast(communicator()->stringToProxy("DemoIceGrid/Registry"));
     if(!registry)
@@ -115,6 +114,7 @@ HelloClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
+    IceGrid::SessionPrx session;
     while(true)
     {
         cout << "This demo accepts any user-id / password combination.\n";
@@ -131,8 +131,7 @@ HelloClient::run(int argc, char* argv[])
 
         try
         {
-            IceUtil::Mutex::Lock sync(_mutex);
-            _session = registry->createSession(id, password);
+            session = registry->createSession(id, password);
             break;
         }
         catch(const IceGrid::PermissionDeniedException& ex)
@@ -141,15 +140,12 @@ HelloClient::run(int argc, char* argv[])
         }
     }
 
-    {
-        IceUtil::Mutex::Lock sync(_mutex);
-        _keepAlive = new SessionKeepAliveThread(_session, registry->getSessionTimeout() / 2);
-        _keepAlive->start();
-    }
+    SessionKeepAliveThreadPtr keepAlive = new SessionKeepAliveThread(session, registry->getSessionTimeout() / 2);
+    keepAlive->start();
 
     try
     {
-        HelloPrx hello = HelloPrx::checkedCast(_session->allocateObjectById(communicator()->stringToIdentity("hello")));
+        HelloPrx hello = HelloPrx::checkedCast(session->allocateObjectById(communicator()->stringToIdentity("hello")));
 
         menu();
 
@@ -206,51 +202,17 @@ HelloClient::run(int argc, char* argv[])
         status = EXIT_FAILURE;
     }
 
-    cleanup();
-
-    return status;
-}
-
-void
-HelloClient::interruptCallback(int)
-{
-    cleanup();
-
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
-HelloClient::cleanup()
-{
-    IceUtil::Mutex::Lock sync(_mutex);
     //
     // Destroy the keepAlive thread and the sesion object otherwise
     // the session will be kept allocated until the timeout occurs.
     // Destroying the session will release all allocated objects.
     //
-    if(_keepAlive)
-    {
-        _keepAlive->destroy();
-        _keepAlive->getThreadControl().join();
-        _keepAlive = 0;
-    }
-    if(_session)
-    {
-        _session->destroy();
-        _session = 0;
-    }
+    keepAlive->destroy();
+    keepAlive->getThreadControl().join();
+
+    session->destroy();
+
+    return status;
 }
 
 void
diff --git a/cpp/demo/IceGrid/sessionActivation/config.grid b/cpp/demo/IceGrid/sessionActivation/config.grid
index 9b915423d00..913b68efb68 100644
--- a/cpp/demo/IceGrid/sessionActivation/config.grid
+++ b/cpp/demo/IceGrid/sessionActivation/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
diff --git a/cpp/demo/IceGrid/simple/.depend b/cpp/demo/IceGrid/simple/.depend
index 1b52d194484..847e4c08cc1 100644
--- a/cpp/demo/IceGrid/simple/.depend
+++ b/cpp/demo/IceGrid/simple/.depend
@@ -1,6 +1,6 @@
-Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
-Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceGrid/Query.h $(includedir)/IceGrid/Exception.h Hello.h
-HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
-Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+Hello$(OBJEXT): Hello.cpp Hello.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StringConverter.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/ScopedArray.h
+Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h $(includedir)/IceGrid/IceGrid.h $(includedir)/IceGrid/Admin.h $(includedir)/Ice/SliceChecksumDict.h $(includedir)/Glacier2/Session.h $(includedir)/Glacier2/SSLInfo.h $(includedir)/IceGrid/Exception.h $(includedir)/IceGrid/Descriptor.h $(includedir)/IceGrid/FileParser.h $(includedir)/IceGrid/Locator.h $(includedir)/IceGrid/Observer.h $(includedir)/IceGrid/Query.h $(includedir)/IceGrid/Registry.h $(includedir)/IceGrid/Session.h $(includedir)/IceGrid/UserAccountMapper.h Hello.h
+HelloI$(OBJEXT): HelloI.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
+Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/FactoryTableDef.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactoryF.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h HelloI.h Hello.h
 Hello.cpp: Hello.ice
 Hello.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp
index ac910630af7..f8b3b52e059 100644
--- a/cpp/demo/IceGrid/simple/Client.cpp
+++ b/cpp/demo/IceGrid/simple/Client.cpp
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/IceGrid.h>
 #include <Hello.h>
 
 using namespace std;
@@ -18,8 +18,8 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -33,15 +33,13 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
-void
-HelloClient::menu()
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
 {
-    cout <<
-        "usage:\n"
-        "t: send greeting\n"
-        "s: shutdown server\n"
-        "x: exit\n"
-        "?: help\n";
 }
 
 int
@@ -54,12 +52,6 @@ HelloClient::run(int argc, char* argv[])
     }
 
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
-    //
     // First we try to connect to the object with the `hello'
     // identity. If it's not registered with the registry, we 
     // search for an object with the ::Demo::Hello type.
@@ -122,19 +114,13 @@ HelloClient::run(int argc, char* argv[])
 }
 
 void
-HelloClient::interruptCallback(int)
+HelloClient::menu()
 {
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
+    cout <<
+        "usage:\n"
+        "t: send greeting\n"
+        "s: shutdown server\n"
+        "x: exit\n"
+        "?: help\n";
 }
+
diff --git a/cpp/demo/IceGrid/simple/config.client b/cpp/demo/IceGrid/simple/config.client
index 7d71d7f1714..0ac23f279c9 100644
--- a/cpp/demo/IceGrid/simple/config.client
+++ b/cpp/demo/IceGrid/simple/config.client
@@ -2,9 +2,3 @@
 # The IceGrid locator proxy.
 #
 Ice.Default.Locator=DemoIceGrid/Locator:default -p 4061
-
-#
-# Dummy username and password for icegridadmin.
-#
-IceGridAdmin.Username=benoit
-IceGridAdmin.Password=dummy
diff --git a/cpp/demo/IceGrid/simple/config.grid b/cpp/demo/IceGrid/simple/config.grid
index 9b915423d00..913b68efb68 100644
--- a/cpp/demo/IceGrid/simple/config.grid
+++ b/cpp/demo/IceGrid/simple/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
diff --git a/cpp/demo/IceStorm/clock/config.service b/cpp/demo/IceStorm/clock/config.service
index 514a3ff35aa..b7c9e56a58c 100644
--- a/cpp/demo/IceStorm/clock/config.service
+++ b/cpp/demo/IceStorm/clock/config.service
@@ -1,16 +1,13 @@
 #
-# This property defines the endpoints on which the IceStorm
-# TopicManager listens.
+# The IceStorm service instance name.
 #
-IceStorm.TopicManager.Endpoints=default -p 10000
-
-IceStorm.Publish.ThreadPool.Size=2
-IceStorm.Publish.ThreadPool.SizeWarn=0
+IceStorm.InstanceName=DemoIceStorm
 
 #
-# The IceStorm service instance name.
+# This property defines the endpoints on which the IceStorm
+# TopicManager listens.
 #
-IceStorm.InstanceName=DemoIceStorm
+IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
 # This property defines the endpoints on which the topic
diff --git a/cpp/demo/IceStorm/counter/config.service b/cpp/demo/IceStorm/counter/config.service
index d27cb93ce31..4af437d48fa 100644
--- a/cpp/demo/IceStorm/counter/config.service
+++ b/cpp/demo/IceStorm/counter/config.service
@@ -1,15 +1,14 @@
 #
-# This property defines the endpoints on which the IceStorm
-# TopicManager listens.
-#
-IceStorm.TopicManager.Endpoints=default -p 10000
-
-#
 # The IceStorm service instance name.
 #
 IceStorm.InstanceName=DemoIceStorm
 
 #
+# This property defines the endpoints on which the IceStorm
+# TopicManager listens.
+#
+IceStorm.TopicManager.Endpoints=default -p 10000
+#
 # This property defines the endpoints on which the topic
 # publisher objects listen.
 #
diff --git a/cpp/demo/IceStorm/replicated/config.grid b/cpp/demo/IceStorm/replicated/config.grid
index 610b9e5d3f3..30b8c75c8e3 100644
--- a/cpp/demo/IceStorm/replicated/config.grid
+++ b/cpp/demo/IceStorm/replicated/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
diff --git a/cpp/demo/book/freeze_filesystem/Client.cpp b/cpp/demo/book/freeze_filesystem/Client.cpp
index e73351b6777..f0d94260522 100644
--- a/cpp/demo/book/freeze_filesystem/Client.cpp
+++ b/cpp/demo/book/freeze_filesystem/Client.cpp
@@ -15,8 +15,10 @@ using namespace Filesystem;
 
 class FilesystemClient : public Ice::Application
 {
+public:
+
+    FilesystemClient();
     virtual int run(int argc, char* argv[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -26,15 +28,18 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
-int
-FilesystemClient::run(int argc, char* argv[])
-{
+FilesystemClient::FilesystemClient() :
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
+    // Since this is an interactive demo we don't want any signal
+    // handling.
     //
-    callbackOnInterrupt();
+    Application(Ice::NoSignalHandling)
+{
+}
 
+int
+FilesystemClient::run(int argc, char* argv[])
+{
     //
     // Create a proxy for the root directory.
     //
@@ -131,21 +136,3 @@ FilesystemClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
-
-void
-FilesystemClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
diff --git a/cpp/demo/book/freeze_filesystem/config.client b/cpp/demo/book/freeze_filesystem/config.client
index 4bd7574216d..6f0ba50b98f 100644
--- a/cpp/demo/book/freeze_filesystem/config.client
+++ b/cpp/demo/book/freeze_filesystem/config.client
@@ -1,6 +1,6 @@
 #
-# The client reads this property to create the reference to the
-# "library" object in the server.
+# The client reads this property to create the reference to the root
+# "directory" object in the server.
 #
 RootDir.Proxy=RootDir:default -p 10000
 
diff --git a/cpp/demo/book/freeze_filesystem/config.server b/cpp/demo/book/freeze_filesystem/config.server
index 2370acc99a5..8ee5723e944 100644
--- a/cpp/demo/book/freeze_filesystem/config.server
+++ b/cpp/demo/book/freeze_filesystem/config.server
@@ -1,6 +1,28 @@
+#
+# Configure the server endpoints.
+#
 FreezeFilesystem.Endpoints=default -p 10000
 
+#
+# Freeze Map Tracing.
+#
+# 0 = No map activity trace (default). 
+# 1 = Trace database open and close. 
+# 2 = Also trace iterator and transaction operations, and reference
+# counting of the underlying database.
+#
 Freeze.Trace.Map=1
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
 Freeze.Trace.Evictor=2
 
 #
diff --git a/cpp/demo/book/lifecycle/Client.cpp b/cpp/demo/book/lifecycle/Client.cpp
index c2671146bf8..0f2352cf176 100644
--- a/cpp/demo/book/lifecycle/Client.cpp
+++ b/cpp/demo/book/lifecycle/Client.cpp
@@ -17,12 +17,16 @@ using namespace Filesystem;
 class FilesystemClient : virtual public Ice::Application
 {
 public:
-    virtual int run(int, char * []) {
-        // Since this is an interactive demo we want the custom
-        // interrupt callback to be called when the process is
-        // interrupted.
+    FilesystemClient() :
+        //
+        // Since this is an interactive demo we don't want any signal
+        // handling.
         //
-        callbackOnInterrupt();
+        Application(Ice::NoSignalHandling)
+    {
+    }
+
+    virtual int run(int, char * []) {
 
         // Create a proxy for the root directory
         //
@@ -43,22 +47,6 @@ public:
         ParserPtr p = new Parser(rootDir);
         return p->parse();
     }
-
-    virtual void interruptCallback(int) {
-        try
-        {
-            communicator()->destroy();
-        }
-        catch(const IceUtil::Exception& ex)
-        {
-            cerr << appName() << ": " << ex << endl;
-        }
-        catch(...)
-        {
-            cerr << appName() << ": unknown exception" << endl;
-        }
-        exit(EXIT_SUCCESS);
-    }
 };
 
 int
diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h
new file mode 100644
index 00000000000..aa84a0f066f
--- /dev/null
+++ b/cpp/include/IceGrid/IceGrid.h
@@ -0,0 +1,24 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2008 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.
+//
+// **********************************************************************
+
+#ifndef ICEGRID_H
+#define ICEGRID_H
+
+#include <IceGrid/Admin.h>
+#include <IceGrid/Descriptor.h>
+#include <IceGrid/Exception.h>
+#include <IceGrid/FileParser.h>
+#include <IceGrid/Locator.h>
+#include <IceGrid/Observer.h>
+#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
+#include <IceGrid/Session.h>
+#include <IceGrid/UserAccountMapper.h>
+
+#endif
diff --git a/cs/demo/Glacier2/Makefile.mak b/cs/demo/Glacier2/Makefile.mak
index d48051606fa..d48051606fa 100755..100644
--- a/cs/demo/Glacier2/Makefile.mak
+++ b/cs/demo/Glacier2/Makefile.mak
diff --git a/cs/demo/Glacier2/callback/glacier2callbackC.csproj b/cs/demo/Glacier2/callback/glacier2callbackC.csproj
index 77416b6a185..77416b6a185 100755..100644
--- a/cs/demo/Glacier2/callback/glacier2callbackC.csproj
+++ b/cs/demo/Glacier2/callback/glacier2callbackC.csproj
diff --git a/cs/demo/Glacier2/callback/glacier2callbackS.csproj b/cs/demo/Glacier2/callback/glacier2callbackS.csproj
index 66cb4371aa6..66cb4371aa6 100755..100644
--- a/cs/demo/Glacier2/callback/glacier2callbackS.csproj
+++ b/cs/demo/Glacier2/callback/glacier2callbackS.csproj
diff --git a/cs/demo/Glacier2/callback/glacier2callbackSS.csproj b/cs/demo/Glacier2/callback/glacier2callbackSS.csproj
index 165f0544f44..165f0544f44 100755..100644
--- a/cs/demo/Glacier2/callback/glacier2callbackSS.csproj
+++ b/cs/demo/Glacier2/callback/glacier2callbackSS.csproj
diff --git a/cs/demo/Ice/Makefile.mak b/cs/demo/Ice/Makefile.mak
index c97844cd8b8..c97844cd8b8 100755..100644
--- a/cs/demo/Ice/Makefile.mak
+++ b/cs/demo/Ice/Makefile.mak
diff --git a/cs/demo/Ice/async/asyncC.csproj b/cs/demo/Ice/async/asyncC.csproj
index 312aa62d6a1..312aa62d6a1 100755..100644
--- a/cs/demo/Ice/async/asyncC.csproj
+++ b/cs/demo/Ice/async/asyncC.csproj
diff --git a/cs/demo/Ice/async/asyncS.csproj b/cs/demo/Ice/async/asyncS.csproj
index 5bd9ec559c1..5bd9ec559c1 100755..100644
--- a/cs/demo/Ice/async/asyncS.csproj
+++ b/cs/demo/Ice/async/asyncS.csproj
diff --git a/cs/demo/Ice/bidir/Callback.ice b/cs/demo/Ice/bidir/Callback.ice
index 27946b05bf5..27946b05bf5 100755..100644
--- a/cs/demo/Ice/bidir/Callback.ice
+++ b/cs/demo/Ice/bidir/Callback.ice
diff --git a/cs/demo/Ice/bidir/Client.cs b/cs/demo/Ice/bidir/Client.cs
index 872fde959ce..3785cdb0f5d 100644
--- a/cs/demo/Ice/bidir/Client.cs
+++ b/cs/demo/Ice/bidir/Client.cs
@@ -29,8 +29,8 @@ public class Client
                 return 1;
             }
 
-            CallbackSenderPrx server =
-                CallbackSenderPrxHelper.checkedCast(communicator().propertyToProxy("Callback.Client.CallbackServer"));
+            CallbackSenderPrx server = CallbackSenderPrxHelper.checkedCast(
+                communicator().propertyToProxy("CallbackSender.Proxy"));
             if(server == null)
             {
                 System.Console.Error.WriteLine("invalid proxy");
diff --git a/cs/demo/Ice/bidir/bidirC.csproj b/cs/demo/Ice/bidir/bidirC.csproj
index b441fed23c3..b441fed23c3 100755..100644
--- a/cs/demo/Ice/bidir/bidirC.csproj
+++ b/cs/demo/Ice/bidir/bidirC.csproj
diff --git a/cs/demo/Ice/bidir/bidirS.csproj b/cs/demo/Ice/bidir/bidirS.csproj
index 9db60884bb1..9db60884bb1 100755..100644
--- a/cs/demo/Ice/bidir/bidirS.csproj
+++ b/cs/demo/Ice/bidir/bidirS.csproj
diff --git a/cs/demo/Ice/bidir/config.client b/cs/demo/Ice/bidir/config.client
index 94a4a87b561..d336e250178 100755..100644
--- a/cs/demo/Ice/bidir/config.client
+++ b/cs/demo/Ice/bidir/config.client
@@ -1,30 +1,33 @@
-Callback.Client.CallbackServer=sender:tcp -p 10000
-
-#
-# Warn about connection exceptions
-#
-Ice.Warn.Connections=1
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
-
-#
-# Active connection management must be disabled when using
-# bidirectional connections.
-#
-Ice.ACM.Client=0
+#
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=sender:tcp -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# Client-side ACM must be disabled for bidirectional connections.
+#
+Ice.ACM.Client=0
+
+#
+# Network Tracing
+#
+# 0 = no network tracing
+# 1 = trace connection establishment and closure
+# 2 = like 1, but more detailed
+# 3 = like 2, but also trace data transfer
+#
+#Ice.Trace.Network=1
+
+#
+# Protocol Tracing
+#
+# 0 = no protocol tracing
+# 1 = trace protocol messages
+#
+#Ice.Trace.Protocol=1
diff --git a/cs/demo/Ice/bidir/config.server b/cs/demo/Ice/bidir/config.server
index 95b5cc10bb9..d9c7154678a 100755..100644
--- a/cs/demo/Ice/bidir/config.server
+++ b/cs/demo/Ice/bidir/config.server
@@ -1,30 +1,29 @@
-Callback.Server.Endpoints=tcp -p 10000
-
-#
-# Warn about connection exceptions
-#
-Ice.Warn.Connections=1
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
-
-#
-# Active connection management must be disabled when using
-# bidirectional connections.
-#
-Ice.ACM.Client=0
+#
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
+#
+Callback.Server.Endpoints=tcp -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# Network Tracing
+#
+# 0 = no network tracing
+# 1 = trace connection establishment and closure
+# 2 = like 1, but more detailed
+# 3 = like 2, but also trace data transfer
+#
+#Ice.Trace.Network=1
+
+#
+# Protocol Tracing
+#
+# 0 = no protocol tracing
+# 1 = trace protocol messages
+#
+#Ice.Trace.Protocol=1
diff --git a/cs/demo/Ice/callback/Client.cs b/cs/demo/Ice/callback/Client.cs
index 3ec6ec8a570..cba3d729b23 100644
--- a/cs/demo/Ice/callback/Client.cs
+++ b/cs/demo/Ice/callback/Client.cs
@@ -57,7 +57,7 @@ public class Client
             }
 
             CallbackSenderPrx twoway = CallbackSenderPrxHelper.checkedCast(
-                communicator().propertyToProxy("Callback.CallbackServer").
+                communicator().propertyToProxy("CallbackSender.Proxy").
                     ice_twoway().ice_timeout(-1).ice_secure(false));
             if(twoway == null)
             {
diff --git a/cs/demo/Ice/callback/callbackC.csproj b/cs/demo/Ice/callback/callbackC.csproj
index 23e63d6c4aa..23e63d6c4aa 100755..100644
--- a/cs/demo/Ice/callback/callbackC.csproj
+++ b/cs/demo/Ice/callback/callbackC.csproj
diff --git a/cs/demo/Ice/callback/callbackS.csproj b/cs/demo/Ice/callback/callbackS.csproj
index 10285fc9ef3..10285fc9ef3 100755..100644
--- a/cs/demo/Ice/callback/callbackS.csproj
+++ b/cs/demo/Ice/callback/callbackS.csproj
diff --git a/cs/demo/Ice/callback/config.client b/cs/demo/Ice/callback/config.client
index 2ae8cc7f5a3..c3415d18838 100644
--- a/cs/demo/Ice/callback/config.client
+++ b/cs/demo/Ice/callback/config.client
@@ -1,8 +1,14 @@
 #
-# The client contacts the server using the proxy specified by the CallbackServer
-# property, and provides the endpoints specified by the Endpoints property.
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+
+#
+# The client creates one single object adapter with the name
+# "Callback.Client". The following line sets the endpoints for this
+# adapter.
 #
-Callback.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
 Callback.Client.Endpoints=tcp:udp:ssl
 
 #
diff --git a/cs/demo/Ice/callback/config.server b/cs/demo/Ice/callback/config.server
index dba291a1408..f14189c05f8 100644
--- a/cs/demo/Ice/callback/config.server
+++ b/cs/demo/Ice/callback/config.server
@@ -1,5 +1,7 @@
 #
-# The server listens at the following endpoints.
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
 #
 Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
diff --git a/cs/demo/Ice/hello/config.client b/cs/demo/Ice/hello/config.client
index 224641d6693..2619f50adee 100644
--- a/cs/demo/Ice/hello/config.client
+++ b/cs/demo/Ice/hello/config.client
@@ -7,10 +7,13 @@ Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
 #
 # Warn about connection exceptions.
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Client-side ACM is enabled by default, with an interval of 60
+# seconds. For this demo, we want to use a short timeout of 10
+# seconds. By enabling network tracing below, you can see ACM
+# automatically close idle connections.
 #
 Ice.ACM.Client=10
 
diff --git a/cs/demo/Ice/hello/config.server b/cs/demo/Ice/hello/config.server
index 60814210485..6b3c8eb81cd 100644
--- a/cs/demo/Ice/hello/config.server
+++ b/cs/demo/Ice/hello/config.server
@@ -8,10 +8,13 @@ Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 #
 # Warn about connection exceptions.
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Server-side ACM is disabled by default. For this demo, we want it
+# enabled and set to a short timeout of 10 seconds. By enabling
+# network tracing below, you can see ACM automatically close idle
+# connections.
 #
 Ice.ACM.Server=10
 
diff --git a/cs/demo/Ice/hello/helloC.csproj b/cs/demo/Ice/hello/helloC.csproj
index 7ee0044c592..7ee0044c592 100755..100644
--- a/cs/demo/Ice/hello/helloC.csproj
+++ b/cs/demo/Ice/hello/helloC.csproj
diff --git a/cs/demo/Ice/hello/helloS.csproj b/cs/demo/Ice/hello/helloS.csproj
index cd63d5b8411..cd63d5b8411 100755..100644
--- a/cs/demo/Ice/hello/helloS.csproj
+++ b/cs/demo/Ice/hello/helloS.csproj
diff --git a/cs/demo/Ice/invoke/config.client b/cs/demo/Ice/invoke/config.client
index 2fa5b51b51c..5ca467e762e 100644
--- a/cs/demo/Ice/invoke/config.client
+++ b/cs/demo/Ice/invoke/config.client
@@ -1,8 +1,8 @@
 #
 # The client reads this property to create the reference to the
-# "hello" object in the server.
+# "Printer" object in the server.
 #
-Printer.Proxy=printer:tcp -p 10000:udp -p 10000
+Printer.Proxy=printer:default -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/cs/demo/Ice/invoke/config.server b/cs/demo/Ice/invoke/config.server
index 693d0c89d21..28a7cadc4ec 100644
--- a/cs/demo/Ice/invoke/config.server
+++ b/cs/demo/Ice/invoke/config.server
@@ -1,9 +1,9 @@
 #
 # The server creates one single object adapter with the name
-# "helloadapater". The following line sets the endpoints for this
-# adapter
+# "Printer". The following line sets the endpoints for this
+# adapter.
 #
-Printer.Endpoints=tcp -p 10000:udp -p 10000
+Printer.Endpoints=default -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/cs/demo/Ice/invoke/invokeC.csproj b/cs/demo/Ice/invoke/invokeC.csproj
index 5a3ae0ff756..5a3ae0ff756 100755..100644
--- a/cs/demo/Ice/invoke/invokeC.csproj
+++ b/cs/demo/Ice/invoke/invokeC.csproj
diff --git a/cs/demo/Ice/invoke/invokeS.csproj b/cs/demo/Ice/invoke/invokeS.csproj
index d9088af22f6..d9088af22f6 100755..100644
--- a/cs/demo/Ice/invoke/invokeS.csproj
+++ b/cs/demo/Ice/invoke/invokeS.csproj
diff --git a/cs/demo/Ice/latency/Client.cs b/cs/demo/Ice/latency/Client.cs
index 9ebf5fb863a..93c82db2a11 100644
--- a/cs/demo/Ice/latency/Client.cs
+++ b/cs/demo/Ice/latency/Client.cs
@@ -29,7 +29,7 @@ public class Client
                 return 1;
             }
 
-            PingPrx ping = PingPrxHelper.checkedCast(communicator().propertyToProxy("Latency.Ping"));
+            PingPrx ping = PingPrxHelper.checkedCast(communicator().propertyToProxy("Ping.Proxy"));
             if(ping == null)
             {
                 Console.Error.WriteLine("invalid proxy");
diff --git a/cs/demo/Ice/latency/config.client b/cs/demo/Ice/latency/config.client
index 2faeb27a191..ae1a2e4e066 100644
--- a/cs/demo/Ice/latency/config.client
+++ b/cs/demo/Ice/latency/config.client
@@ -1,3 +1,10 @@
-Latency.Ping=ping:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the "Ping"
+# object in the server.
+#
+Ping.Proxy=ping:default -p 10000 -h 127.0.0.1
 
+#
+# Disable client-side ACM.
+#
 Ice.ACM.Client=0
diff --git a/cs/demo/Ice/latency/config.server b/cs/demo/Ice/latency/config.server
index 6d82f1a7f2e..75e3479d6fe 100644
--- a/cs/demo/Ice/latency/config.server
+++ b/cs/demo/Ice/latency/config.server
@@ -1 +1,10 @@
+#
+# 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 127.0.0.1
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/cs/demo/Ice/latency/latencyC.csproj b/cs/demo/Ice/latency/latencyC.csproj
index 0886fcfb854..0886fcfb854 100755..100644
--- a/cs/demo/Ice/latency/latencyC.csproj
+++ b/cs/demo/Ice/latency/latencyC.csproj
diff --git a/cs/demo/Ice/latency/latencyS.csproj b/cs/demo/Ice/latency/latencyS.csproj
index e2de1fb83d7..e2de1fb83d7 100755..100644
--- a/cs/demo/Ice/latency/latencyS.csproj
+++ b/cs/demo/Ice/latency/latencyS.csproj
diff --git a/cs/demo/Ice/minimal/minimalC.csproj b/cs/demo/Ice/minimal/minimalC.csproj
index 0b0d0cbb933..0b0d0cbb933 100755..100644
--- a/cs/demo/Ice/minimal/minimalC.csproj
+++ b/cs/demo/Ice/minimal/minimalC.csproj
diff --git a/cs/demo/Ice/minimal/minimalS.csproj b/cs/demo/Ice/minimal/minimalS.csproj
index 797b5e826c1..797b5e826c1 100755..100644
--- a/cs/demo/Ice/minimal/minimalS.csproj
+++ b/cs/demo/Ice/minimal/minimalS.csproj
diff --git a/cs/demo/Ice/multicast/config.client b/cs/demo/Ice/multicast/config.client
index 74b1224284b..b68bb269f33 100644
--- a/cs/demo/Ice/multicast/config.client
+++ b/cs/demo/Ice/multicast/config.client
@@ -1,6 +1,6 @@
 #
 # The client reads this property to create the reference to the
-# "discovery" object in the server.
+# "Discover" object in the server.
 #
 Discover.Proxy=discover:udp -h 224.0.0.5 -p 10000
 
@@ -8,7 +8,7 @@ Discover.Proxy=discover:udp -h 224.0.0.5 -p 10000
 # Alternative IPv6 configuration
 #
 #Ice.IPv6=1
-#Discover.Proxy=discover:udp -h "ff01::1:1" --ttl 5 -p 10000
+#Discover.Proxy=discover:udp -h "ff01::1:1" -p 10000
 
 #
 # The client creates an object adapter with the name
@@ -20,12 +20,7 @@ DiscoverReply.Endpoints=tcp
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
-
-#
-# We want a faster ACM for this demo.
-#
-Ice.ACM.Client=10
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cs/demo/Ice/multicast/config.server b/cs/demo/Ice/multicast/config.server
index b92327ce946..451f9e5d5a5 100644
--- a/cs/demo/Ice/multicast/config.server
+++ b/cs/demo/Ice/multicast/config.server
@@ -19,7 +19,7 @@ Hello.Endpoints=tcp
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cs/demo/Ice/multicast/multicastC.csproj b/cs/demo/Ice/multicast/multicastC.csproj
index 63af6924fa5..63af6924fa5 100755..100644
--- a/cs/demo/Ice/multicast/multicastC.csproj
+++ b/cs/demo/Ice/multicast/multicastC.csproj
diff --git a/cs/demo/Ice/multicast/multicastS.csproj b/cs/demo/Ice/multicast/multicastS.csproj
index b189f45ff78..b189f45ff78 100755..100644
--- a/cs/demo/Ice/multicast/multicastS.csproj
+++ b/cs/demo/Ice/multicast/multicastS.csproj
diff --git a/cs/demo/Ice/nested/Client.cs b/cs/demo/Ice/nested/Client.cs
index 88ee6eacad0..2618b5925a8 100644
--- a/cs/demo/Ice/nested/Client.cs
+++ b/cs/demo/Ice/nested/Client.cs
@@ -29,7 +29,7 @@ public class Client
                 return 1;
             }
 
-            NestedPrx nested = NestedPrxHelper.checkedCast(communicator().propertyToProxy("Nested.NestedServer"));
+            NestedPrx nested = NestedPrxHelper.checkedCast(communicator().propertyToProxy("Nested.Proxy"));
             if(nested == null)
             {
                 Console.Error.WriteLine("invalid proxy");
diff --git a/cs/demo/Ice/nested/config.client b/cs/demo/Ice/nested/config.client
index 741856b4b3b..066f1dc8fd8 100644
--- a/cs/demo/Ice/nested/config.client
+++ b/cs/demo/Ice/nested/config.client
@@ -1,6 +1,23 @@
-Nested.NestedServer=nestedServer:default -p 10000 -t 10000
+#
+# The client reads this property to create the reference to the
+# "Nested" object in the server.
+#
+Nested.Proxy=nestedServer:default -p 10000 -t 10000
+
+#
+# The client creates one single object adapter with the name
+# "Nested.Client". The following line sets the endpoints for this
+# adapter.
+#
 Nested.Client.Endpoints=default -t 10000
 
+#
+# The following properties configure the server thread pool. The
+# thread pool initially contains 5 threads, and the Ice run time
+# starts emitting warnings once 5 threads are in use. The Ice run time
+# creates more threads once all 5 are in use, up to a maximum of 10
+# threads.
+#
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
 Ice.ThreadPool.Server.SizeMax=10
@@ -8,7 +25,7 @@ Ice.ThreadPool.Server.SizeMax=10
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cs/demo/Ice/nested/config.server b/cs/demo/Ice/nested/config.server
index e0073284155..94d3ca82be4 100644
--- a/cs/demo/Ice/nested/config.server
+++ b/cs/demo/Ice/nested/config.server
@@ -1,5 +1,17 @@
+#
+# The server creates one single object adapter with the name
+# "Nested.Server". The following line sets the endpoints for this
+# adapter.
+#
 Nested.Server.Endpoints=default -p 10000 -t 10000
 
+#
+# The following properties configure the server thread pool. The
+# thread pool initially contains 5 threads, and the Ice run time
+# starts emitting warnings once 5 threads are in use. The Ice run time
+# creates more threads once all 5 are in use, up to a maximum of 10
+# threads.
+#
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
 Ice.ThreadPool.Server.SizeMax=10
@@ -7,7 +19,7 @@ Ice.ThreadPool.Server.SizeMax=10
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/cs/demo/Ice/nested/nestedC.csproj b/cs/demo/Ice/nested/nestedC.csproj
index 19799a304fc..19799a304fc 100755..100644
--- a/cs/demo/Ice/nested/nestedC.csproj
+++ b/cs/demo/Ice/nested/nestedC.csproj
diff --git a/cs/demo/Ice/nested/nestedS.csproj b/cs/demo/Ice/nested/nestedS.csproj
index 0bb47237ab4..0bb47237ab4 100755..100644
--- a/cs/demo/Ice/nested/nestedS.csproj
+++ b/cs/demo/Ice/nested/nestedS.csproj
diff --git a/cs/demo/Ice/session/config.client b/cs/demo/Ice/session/config.client
index 3a0133d0a30..3a0133d0a30 100755..100644
--- a/cs/demo/Ice/session/config.client
+++ b/cs/demo/Ice/session/config.client
diff --git a/cs/demo/Ice/session/config.server b/cs/demo/Ice/session/config.server
index 8aa8dfac36f..8aa8dfac36f 100755..100644
--- a/cs/demo/Ice/session/config.server
+++ b/cs/demo/Ice/session/config.server
diff --git a/cs/demo/Ice/session/sessionC.csproj b/cs/demo/Ice/session/sessionC.csproj
index f425752ac13..f425752ac13 100755..100644
--- a/cs/demo/Ice/session/sessionC.csproj
+++ b/cs/demo/Ice/session/sessionC.csproj
diff --git a/cs/demo/Ice/session/sessionS.csproj b/cs/demo/Ice/session/sessionS.csproj
index 03145afa47b..03145afa47b 100755..100644
--- a/cs/demo/Ice/session/sessionS.csproj
+++ b/cs/demo/Ice/session/sessionS.csproj
diff --git a/cs/demo/Ice/throughput/Client.cs b/cs/demo/Ice/throughput/Client.cs
index 32c8fd7bbde..d80de5d2d6a 100644
--- a/cs/demo/Ice/throughput/Client.cs
+++ b/cs/demo/Ice/throughput/Client.cs
@@ -51,8 +51,8 @@ public class Client
                 return 1;
             }
 
-            Ice.ObjectPrx b = communicator().propertyToProxy("Throughput.Throughput");
-            ThroughputPrx throughput = ThroughputPrxHelper.checkedCast(b);
+            ThroughputPrx throughput = ThroughputPrxHelper.checkedCast(
+                communicator().propertyToProxy("Throughput.Proxy"));
             if(throughput == null)
             {
                 Console.Error.WriteLine("invalid proxy");
diff --git a/cs/demo/Ice/throughput/config.client b/cs/demo/Ice/throughput/config.client
index 28788961146..0f763b09d20 100644
--- a/cs/demo/Ice/throughput/config.client
+++ b/cs/demo/Ice/throughput/config.client
@@ -1,3 +1,10 @@
-Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the
+# "Throughput" object in the server.
+#
+Throughput.Proxy=throughput:default -p 10000 -h 127.0.0.1
 
+#
+# Disable client-side ACM.
+#
 Ice.ACM.Client=0
diff --git a/cs/demo/Ice/throughput/config.server b/cs/demo/Ice/throughput/config.server
index dec5cfe8eb9..1a301bb3ed6 100644
--- a/cs/demo/Ice/throughput/config.server
+++ b/cs/demo/Ice/throughput/config.server
@@ -1 +1,11 @@
+#
+# The server creates one single object adapter with the name
+# "Throughput". The following line sets the endpoints for this
+# adapter.
+#
 Throughput.Endpoints=default -p 10000 -h 127.0.0.1
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/cs/demo/Ice/throughput/throughputC.csproj b/cs/demo/Ice/throughput/throughputC.csproj
index 8baa5318031..8baa5318031 100755..100644
--- a/cs/demo/Ice/throughput/throughputC.csproj
+++ b/cs/demo/Ice/throughput/throughputC.csproj
diff --git a/cs/demo/Ice/throughput/throughputS.csproj b/cs/demo/Ice/throughput/throughputS.csproj
index 497bc329e46..497bc329e46 100755..100644
--- a/cs/demo/Ice/throughput/throughputS.csproj
+++ b/cs/demo/Ice/throughput/throughputS.csproj
diff --git a/cs/demo/Ice/value/Client.cs b/cs/demo/Ice/value/Client.cs
index 24d486ced8c..7ed8f13dd8b 100644
--- a/cs/demo/Ice/value/Client.cs
+++ b/cs/demo/Ice/value/Client.cs
@@ -30,8 +30,7 @@ public class Client
                 return 1;
             }
 
-            Ice.ObjectPrx @base = communicator().propertyToProxy("Value.Initial");
-            InitialPrx initial = InitialPrxHelper.checkedCast(@base);
+            InitialPrx initial = InitialPrxHelper.checkedCast(communicator().propertyToProxy("Initial.Proxy"));
             if(initial == null)
             {
                 Console.Error.WriteLine("invalid object reference");
diff --git a/cs/demo/Ice/value/config.client b/cs/demo/Ice/value/config.client
index 48356dd5c43..aa0dc669ca1 100644
--- a/cs/demo/Ice/value/config.client
+++ b/cs/demo/Ice/value/config.client
@@ -1 +1,10 @@
-Value.Initial=initial:default -p 10000
+#
+# The client reads this property to create the reference to the
+# "Initial" object in the server.
+#
+Initial.Proxy=initial:default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/cs/demo/Ice/value/config.server b/cs/demo/Ice/value/config.server
index 8f2cf355ffc..4ec2d8b57df 100644
--- a/cs/demo/Ice/value/config.server
+++ b/cs/demo/Ice/value/config.server
@@ -1 +1,11 @@
+#
+# The server creates one single object adapter with the name
+# "Value". The following line sets the endpoints for this
+# adapter.
+#
 Value.Endpoints=default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/cs/demo/Ice/value/valueC.csproj b/cs/demo/Ice/value/valueC.csproj
index fbf650049e4..fbf650049e4 100755..100644
--- a/cs/demo/Ice/value/valueC.csproj
+++ b/cs/demo/Ice/value/valueC.csproj
diff --git a/cs/demo/Ice/value/valueS.csproj b/cs/demo/Ice/value/valueS.csproj
index 704fa2a2a8a..704fa2a2a8a 100755..100644
--- a/cs/demo/Ice/value/valueS.csproj
+++ b/cs/demo/Ice/value/valueS.csproj
diff --git a/cs/demo/IceBox/Makefile.mak b/cs/demo/IceBox/Makefile.mak
index f8508c0a9c2..f8508c0a9c2 100755..100644
--- a/cs/demo/IceBox/Makefile.mak
+++ b/cs/demo/IceBox/Makefile.mak
diff --git a/cs/demo/IceBox/hello/config.admin b/cs/demo/IceBox/hello/config.admin
index a5c17db1204..a5c17db1204 100755..100644
--- a/cs/demo/IceBox/hello/config.admin
+++ b/cs/demo/IceBox/hello/config.admin
diff --git a/cs/demo/IceBox/hello/config.service b/cs/demo/IceBox/hello/config.service
index 5c87be8351b..1467934c8cf 100644
--- a/cs/demo/IceBox/hello/config.service
+++ b/cs/demo/IceBox/hello/config.service
@@ -1,7 +1,6 @@
 #
-# The server creates one single object adapter with the name of
-# the service. The following line sets the endpoints for this
-# adapter.
+# The server creates one single object adapter with the name of the
+# service. The following line sets the endpoints for this adapter.
 #
 Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
diff --git a/cs/demo/IceBox/hello/helloIceBoxC.csproj b/cs/demo/IceBox/hello/helloIceBoxC.csproj
index 53cb879169b..53cb879169b 100755..100644
--- a/cs/demo/IceBox/hello/helloIceBoxC.csproj
+++ b/cs/demo/IceBox/hello/helloIceBoxC.csproj
diff --git a/cs/demo/IceBox/hello/helloIceBoxS.csproj b/cs/demo/IceBox/hello/helloIceBoxS.csproj
index 5d6d3b6ce7c..5d6d3b6ce7c 100755..100644
--- a/cs/demo/IceBox/hello/helloIceBoxS.csproj
+++ b/cs/demo/IceBox/hello/helloIceBoxS.csproj
diff --git a/cs/demo/IceGrid/Makefile.mak b/cs/demo/IceGrid/Makefile.mak
index 1ccbdf61e58..1ccbdf61e58 100755..100644
--- a/cs/demo/IceGrid/Makefile.mak
+++ b/cs/demo/IceGrid/Makefile.mak
diff --git a/cs/demo/IceGrid/icebox/config.client b/cs/demo/IceGrid/icebox/config.client
index 98bd1ac6b22..ee39e6ad994 100644
--- a/cs/demo/IceGrid/icebox/config.client
+++ b/cs/demo/IceGrid/icebox/config.client
@@ -1,3 +1,7 @@
+#
+# The client reads this property to create the reference to the
+# "hello" object in the server.
+#
 Hello.Proxy=hello
 
 #
diff --git a/cs/demo/IceGrid/icebox/config.grid b/cs/demo/IceGrid/icebox/config.grid
index 4766cfe7a6a..30b8c75c8e3 100644
--- a/cs/demo/IceGrid/icebox/config.grid
+++ b/cs/demo/IceGrid/icebox/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
@@ -32,7 +35,6 @@ IceGrid.Node.CollocateRegistry=1
 # Trace properties.
 #
 IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
 #IceGrid.Node.Trace.Adapter=2
 #IceGrid.Node.Trace.Server=3
 
diff --git a/cs/demo/IceGrid/simple/config.grid b/cs/demo/IceGrid/simple/config.grid
index 88358da8862..913b68efb68 100644
--- a/cs/demo/IceGrid/simple/config.grid
+++ b/cs/demo/IceGrid/simple/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
@@ -31,7 +34,6 @@ IceGrid.Node.CollocateRegistry=1
 # Trace properties.
 #
 IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
 #IceGrid.Node.Trace.Adapter=2
 #IceGrid.Node.Trace.Server=3
 
diff --git a/cs/demo/IceGrid/simple/simpleIceGridC.csproj b/cs/demo/IceGrid/simple/simpleIceGridC.csproj
index e9c55b6dd73..e9c55b6dd73 100755..100644
--- a/cs/demo/IceGrid/simple/simpleIceGridC.csproj
+++ b/cs/demo/IceGrid/simple/simpleIceGridC.csproj
diff --git a/cs/demo/IceGrid/simple/simpleIceGridS.csproj b/cs/demo/IceGrid/simple/simpleIceGridS.csproj
index 523e27dd7d2..523e27dd7d2 100755..100644
--- a/cs/demo/IceGrid/simple/simpleIceGridS.csproj
+++ b/cs/demo/IceGrid/simple/simpleIceGridS.csproj
diff --git a/cs/demo/IceStorm/clock/clockC.csproj b/cs/demo/IceStorm/clock/clockC.csproj
index 4436e9569b6..4436e9569b6 100755..100644
--- a/cs/demo/IceStorm/clock/clockC.csproj
+++ b/cs/demo/IceStorm/clock/clockC.csproj
diff --git a/cs/demo/IceStorm/clock/clockS.csproj b/cs/demo/IceStorm/clock/clockS.csproj
index ce1ab2e458a..ce1ab2e458a 100755..100644
--- a/cs/demo/IceStorm/clock/clockS.csproj
+++ b/cs/demo/IceStorm/clock/clockS.csproj
diff --git a/cs/demo/IceStorm/clock/config.service b/cs/demo/IceStorm/clock/config.service
index 1cabb0820d3..b7c9e56a58c 100644
--- a/cs/demo/IceStorm/clock/config.service
+++ b/cs/demo/IceStorm/clock/config.service
@@ -1,13 +1,13 @@
 #
-# This property defines the endpoints on which the IceStorm
-# TopicManager listens.
+# The IceStorm service instance name.
 #
-IceStorm.TopicManager.Endpoints=default -p 10000
+IceStorm.InstanceName=DemoIceStorm
 
 #
-# The IceStorm service instance name.
+# This property defines the endpoints on which the IceStorm
+# TopicManager listens.
 #
-IceStorm.InstanceName=DemoIceStorm
+IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
 # This property defines the endpoints on which the topic
@@ -15,7 +15,7 @@ IceStorm.InstanceName=DemoIceStorm
 # IceStorm instances this must run on a fixed port (or use
 # IceGrid).
 #
-IceStorm.Publish.Endpoints=default -p 10001:udp -p 10001
+IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
 
 #
 # TopicManager Tracing
@@ -44,14 +44,6 @@ IceStorm.Trace.Topic=1
 IceStorm.Trace.Subscriber=1
 
 #
-# Flush Tracing (for batch mode transfer flushing)
-#
-# 0 = no tracing
-# 1 = trace activity of flusher thread
-#
-IceStorm.Trace.Flush=1
-
-#
 # Amount of time in milliseconds between flushes for batch mode
 # transfer. The minimum allowable value is 100ms.
 #
diff --git a/cs/demo/Makefile.mak b/cs/demo/Makefile.mak
index 43417c5f8b5..43417c5f8b5 100755..100644
--- a/cs/demo/Makefile.mak
+++ b/cs/demo/Makefile.mak
diff --git a/cs/demo/book/Makefile.mak b/cs/demo/book/Makefile.mak
index f7f482b71c7..f7f482b71c7 100755..100644
--- a/cs/demo/book/Makefile.mak
+++ b/cs/demo/book/Makefile.mak
diff --git a/cs/demo/book/lifecycle/lifecycleFSC.csproj b/cs/demo/book/lifecycle/lifecycleFSC.csproj
index 28272940b3b..28272940b3b 100755..100644
--- a/cs/demo/book/lifecycle/lifecycleFSC.csproj
+++ b/cs/demo/book/lifecycle/lifecycleFSC.csproj
diff --git a/cs/demo/book/lifecycle/lifecycleFSS.csproj b/cs/demo/book/lifecycle/lifecycleFSS.csproj
index 4b2b705df2f..4b2b705df2f 100755..100644
--- a/cs/demo/book/lifecycle/lifecycleFSS.csproj
+++ b/cs/demo/book/lifecycle/lifecycleFSS.csproj
diff --git a/cs/demo/book/printer/printerC.csproj b/cs/demo/book/printer/printerC.csproj
index db47a692a76..db47a692a76 100755..100644
--- a/cs/demo/book/printer/printerC.csproj
+++ b/cs/demo/book/printer/printerC.csproj
diff --git a/cs/demo/book/printer/printerS.csproj b/cs/demo/book/printer/printerS.csproj
index 1aba3b367b4..1aba3b367b4 100755..100644
--- a/cs/demo/book/printer/printerS.csproj
+++ b/cs/demo/book/printer/printerS.csproj
diff --git a/cs/demo/book/simple_filesystem/simpleFSC.csproj b/cs/demo/book/simple_filesystem/simpleFSC.csproj
index 94c20cf1ce8..94c20cf1ce8 100755..100644
--- a/cs/demo/book/simple_filesystem/simpleFSC.csproj
+++ b/cs/demo/book/simple_filesystem/simpleFSC.csproj
diff --git a/cs/demo/book/simple_filesystem/simpleFSS.csproj b/cs/demo/book/simple_filesystem/simpleFSS.csproj
index 03a012c285f..03a012c285f 100755..100644
--- a/cs/demo/book/simple_filesystem/simpleFSS.csproj
+++ b/cs/demo/book/simple_filesystem/simpleFSS.csproj
diff --git a/cs/test/Glacier2/Makefile.mak b/cs/test/Glacier2/Makefile.mak
index 17bc77aedff..17bc77aedff 100755..100644
--- a/cs/test/Glacier2/Makefile.mak
+++ b/cs/test/Glacier2/Makefile.mak
diff --git a/cs/test/Ice/Makefile.mak b/cs/test/Ice/Makefile.mak
index 32fd57143f4..32fd57143f4 100755..100644
--- a/cs/test/Ice/Makefile.mak
+++ b/cs/test/Ice/Makefile.mak
diff --git a/cs/test/Ice/checksum/Makefile.mak b/cs/test/Ice/checksum/Makefile.mak
index e8d9fe0f787..e8d9fe0f787 100755..100644
--- a/cs/test/Ice/checksum/Makefile.mak
+++ b/cs/test/Ice/checksum/Makefile.mak
diff --git a/cs/test/Ice/checksum/client/Makefile.mak b/cs/test/Ice/checksum/client/Makefile.mak
index c6bebe3921f..c6bebe3921f 100755..100644
--- a/cs/test/Ice/checksum/client/Makefile.mak
+++ b/cs/test/Ice/checksum/client/Makefile.mak
diff --git a/cs/test/Ice/checksum/server/Makefile.mak b/cs/test/Ice/checksum/server/Makefile.mak
index 3f370ff6c50..3f370ff6c50 100755..100644
--- a/cs/test/Ice/checksum/server/Makefile.mak
+++ b/cs/test/Ice/checksum/server/Makefile.mak
diff --git a/cs/test/Ice/interceptor/Makefile.mak b/cs/test/Ice/interceptor/Makefile.mak
index e4b9317e6a3..e4b9317e6a3 100755..100644
--- a/cs/test/Ice/interceptor/Makefile.mak
+++ b/cs/test/Ice/interceptor/Makefile.mak
diff --git a/cs/test/Ice/slicing/Makefile.mak b/cs/test/Ice/slicing/Makefile.mak
index ce4ea56e1ba..ce4ea56e1ba 100755..100644
--- a/cs/test/Ice/slicing/Makefile.mak
+++ b/cs/test/Ice/slicing/Makefile.mak
diff --git a/cs/test/Ice/stream/Makefile.mak b/cs/test/Ice/stream/Makefile.mak
index 0af70afa769..0af70afa769 100755..100644
--- a/cs/test/Ice/stream/Makefile.mak
+++ b/cs/test/Ice/stream/Makefile.mak
diff --git a/cs/test/IceBox/Makefile.mak b/cs/test/IceBox/Makefile.mak
index 93b9949bdca..93b9949bdca 100755..100644
--- a/cs/test/IceBox/Makefile.mak
+++ b/cs/test/IceBox/Makefile.mak
diff --git a/cs/test/IceGrid/Makefile.mak b/cs/test/IceGrid/Makefile.mak
index 446285dea84..446285dea84 100755..100644
--- a/cs/test/IceGrid/Makefile.mak
+++ b/cs/test/IceGrid/Makefile.mak
diff --git a/cs/test/IceSSL/Makefile.mak b/cs/test/IceSSL/Makefile.mak
index 287b4953a69..287b4953a69 100755..100644
--- a/cs/test/IceSSL/Makefile.mak
+++ b/cs/test/IceSSL/Makefile.mak
diff --git a/cs/test/IceUtil/Makefile.mak b/cs/test/IceUtil/Makefile.mak
index 3b3e89ed77c..3b3e89ed77c 100755..100644
--- a/cs/test/IceUtil/Makefile.mak
+++ b/cs/test/IceUtil/Makefile.mak
diff --git a/cs/test/Makefile.mak b/cs/test/Makefile.mak
index 668f90208bd..668f90208bd 100755..100644
--- a/cs/test/Makefile.mak
+++ b/cs/test/Makefile.mak
diff --git a/cs/test/Slice/Makefile.mak b/cs/test/Slice/Makefile.mak
index 1a6abffe402..1a6abffe402 100755..100644
--- a/cs/test/Slice/Makefile.mak
+++ b/cs/test/Slice/Makefile.mak
diff --git a/demoscript/Ice/multicast.py b/demoscript/Ice/multicast.py
index 4945521141e..d443b07ca9e 100644
--- a/demoscript/Ice/multicast.py
+++ b/demoscript/Ice/multicast.py
@@ -31,6 +31,7 @@ def run(clientCmd, serverCmd):
     server.expect('Hello World!')
     client.waitTestSuccess()
 
-    server.kill(signal.SIGQUIT)
+    server.kill(signal.SIGINT)
+    server.waitTestSuccess()
     
     print "ok"
diff --git a/java/demo/Freeze/casino/config.client b/java/demo/Freeze/casino/config.client
index 8169fbeb95f..98eb6324dd0 100644
--- a/java/demo/Freeze/casino/config.client
+++ b/java/demo/Freeze/casino/config.client
@@ -1 +1,5 @@
+#
+# The client reads this property to create the reference to the
+# "bank" object in the server.
+#
 Bank.Proxy=bank/Montecito:default -p 10000
diff --git a/java/demo/Freeze/casino/config.server b/java/demo/Freeze/casino/config.server
index b2493b916f9..3faf56e8050 100644
--- a/java/demo/Freeze/casino/config.server
+++ b/java/demo/Freeze/casino/config.server
@@ -1,19 +1,53 @@
+#
+# Configure the server endpoints.
+#
 Casino.Endpoints=default -p 10000
 
+#
+# The bank can have more chances of winning than regular players.
+# must be >= 1
+# 1 : like 1 players
+# 2 : like 2 players
+# etc
+#
+Bank.Edge=2
+
+#
+# Configure the ice server thread pool with 10 threads.
+#
 Ice.ThreadPool.Server.Size=10
 
+#
+# Disable Freeze deadlock warnings.
+#
 Freeze.Warn.Deadlocks=1
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
 #Freeze.Trace.Evictor=1
 
+#
+# Configure the bank/bet and player evictors to rollback the
+# transaction on any user exception. The default is to commit the
+# transaction.
+#
 Freeze.Evictor.db.bank.RollbackOnUserException=1
 Freeze.Evictor.db.bet.RollbackOnUserException=1
 Freeze.Evictor.db.player.RollbackOnUserException=1
 
 #
-# The bank can have more chances of winning than regular players.
-# must be >= 1
-# 1 : like 1 players
-# 2 : like 2 players
-# etc
+# Freeze Transaction Tracing.
 #
-Bank.Edge=2
+# 0 = No transaction activity trace (default). 
+# 1 = Trace transaction IDs and commit and rollback activity.
+#
+#Freeze.Trace.Transaction=1
+
diff --git a/java/demo/Freeze/library/config.client b/java/demo/Freeze/library/config.client
index 0d5936b1788..52314741f5d 100644
--- a/java/demo/Freeze/library/config.client
+++ b/java/demo/Freeze/library/config.client
@@ -1,3 +1,7 @@
+#
+# The client reads this property to create the reference to the
+# "library" object in the server.
+#
 Library.Proxy=library:default -p 10000
 
 #
diff --git a/java/demo/Freeze/library/config.collocated b/java/demo/Freeze/library/config.collocated
index 9f1e360c5ec..b6ad3d16c2c 100644
--- a/java/demo/Freeze/library/config.collocated
+++ b/java/demo/Freeze/library/config.collocated
@@ -1,16 +1,52 @@
-Library.Proxy=library:default -p 10000
+#
+# Configure the server endpoints.
+#
 Library.Endpoints=default -p 10000
+
+#
+# Set the evictor size. The size set here (3) is far too small for
+# real-world applications. However, for the purposes of this demo,
+# setting the size to 3 allows us to see the operation of the evictor
+# with evictor tracing.
+#
 EvictorSize=3
 
-Freeze.Trace.Map=1
-Freeze.Trace.Evictor=2
+#
+# The client reads this property to create the reference to the
+# "library" object in the server.
+#
+Library.Proxy=library:default -p 10000
 
 #
-# Don't warn about unknown properties.
+# Don't warn about unknown properties. If this is not set we'll get a
+# warning about "Library.Proxy" since the Ice run time thinks this is
+# an OA property due to the Object Adapter "Library".
 # 
 Ice.Warn.UnknownProperties=0
 
 #
+# Freeze Map Tracing.
+#
+# 0 = No map activity trace (default). 
+# 1 = Trace database open and close. 
+# 2 = Also trace iterator and transaction operations, and reference
+# counting of the underlying database.
+#
+Freeze.Trace.Map=1
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
+Freeze.Trace.Evictor=2
+
+#
 # Warn about connection exceptions
 #
 Ice.Warn.Connections=1
diff --git a/java/demo/Freeze/library/config.server b/java/demo/Freeze/library/config.server
index e239f6e3583..b8c1a05fbbd 100644
--- a/java/demo/Freeze/library/config.server
+++ b/java/demo/Freeze/library/config.server
@@ -1,7 +1,36 @@
+#
+# Configure the server endpoints.
+#
 Library.Endpoints=default -p 10000
+
+#
+# Set the evictor size. The size set here (3) is far too small for
+# real-world applications. However, for the purposes of this demo,
+# setting the size to 3 allows us to see the operation of the evictor
+# with evictor tracing.
+#
 EvictorSize=3
 
+#
+# Freeze Map Tracing.
+#
+# 0 = No map activity trace (default). 
+# 1 = Trace database open and close. 
+# 2 = Also trace iterator and transaction operations, and reference
+# counting of the underlying database.
+#
 Freeze.Trace.Map=1
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
 Freeze.Trace.Evictor=2
 
 #
diff --git a/java/demo/Freeze/phonebook/config.client b/java/demo/Freeze/phonebook/config.client
index 52a03d740c8..4173a2bc068 100644
--- a/java/demo/Freeze/phonebook/config.client
+++ b/java/demo/Freeze/phonebook/config.client
@@ -1,3 +1,7 @@
+#
+# The client reads this property to create the reference to the
+# "phonebook" object in the server.
+#
 PhoneBook.Proxy=phonebook:default -p 10000
 
 #
@@ -22,3 +26,4 @@ Ice.Warn.Connections=1
 # 1 = trace protocol messages
 #
 #Ice.Trace.Protocol=1
+
diff --git a/java/demo/Freeze/phonebook/config.collocated b/java/demo/Freeze/phonebook/config.collocated
index 21ad905fdc1..74a333f5ca5 100644
--- a/java/demo/Freeze/phonebook/config.collocated
+++ b/java/demo/Freeze/phonebook/config.collocated
@@ -1,18 +1,57 @@
-Freeze.Trace.Evictor=1
-Freeze.Trace.DbEnv=1
-Freeze.Evictor.db.contacts.SavePeriod=10000
-Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
-
+#
+# Configure the server endpoints.
+#
 PhoneBook.Endpoints=default -p 10000
-PhoneBook.Proxy=phonebook:default -p 10000
+
+#
+# Set the evictor size. The size set here (3) is far too small for
+# real-world applications. However, for the purposes of this demo,
+# setting the size to 3 allows us to see the operation of the evictor
+# with evictor tracing.
+#
 EvictorSize=3
 
 #
-# Don't warn about unknown properties.
+# The client reads this property to create the reference to the
+# "phonebook" object in the server.
+#
+PhoneBook.Proxy=phonebook:default -p 10000
+
+#
+# Don't warn about unknown properties. If this is not set we'll get a
+# warning about "PhoneBook.Proxy" since the Ice run time thinks this is
+# an OA property due to the Object Adapter "PhoneBook".
 # 
 Ice.Warn.UnknownProperties=0
 
 #
+# Set the save period for the contacts Freeze evictor
+# to 10 seconds.
+#
+Freeze.Evictor.db.contacts.SavePeriod=10000
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
+Freeze.Trace.Evictor=2
+
+#
+# Freeze Database Environment Tracing.
+#
+# 0 = No database environment activity trace (default).
+# 1 = Trace database open and close.
+# 2 = Also trace checkpoints and the removal of old log files.
+#
+Freeze.Trace.DbEnv=2
+
+#
 # Warn about connection exceptions
 #
 Ice.Warn.Connections=1
diff --git a/java/demo/Freeze/phonebook/config.server b/java/demo/Freeze/phonebook/config.server
index 908e8be4c6e..cbe3ed8cd70 100644
--- a/java/demo/Freeze/phonebook/config.server
+++ b/java/demo/Freeze/phonebook/config.server
@@ -1,12 +1,44 @@
-Freeze.Trace.Evictor=1
-Freeze.Trace.DbEnv=1
-Freeze.Evictor.db.contacts.SavePeriod=10000
-Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
-
+#
+# Configure the server endpoints.
+#
 PhoneBook.Endpoints=default -p 10000
+
+#
+# Set the evictor size. The size set here (3) is far too small for
+# real-world applications. However, for the purposes of this demo,
+# setting the size to 3 allows us to see the operation of the evictor
+# with evictor tracing.
+#
 EvictorSize=3
 
 #
+# Set the save period for the contacts Freeze evictor
+# to 10 seconds.
+#
+Freeze.Evictor.db.contacts.SavePeriod=10000
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
+Freeze.Trace.Evictor=2
+
+#
+# Freeze Database Environment Tracing.
+#
+# 0 = No database environment activity trace (default).
+# 1 = Trace database open and close.
+# 2 = Also trace checkpoints and the removal of old log files.
+#
+Freeze.Trace.DbEnv=2
+
+#
 # Warn about connection exceptions
 #
 Ice.Warn.Connections=1
diff --git a/java/demo/Ice/bidir/Callback.ice b/java/demo/Ice/bidir/Callback.ice
index 27946b05bf5..27946b05bf5 100755..100644
--- a/java/demo/Ice/bidir/Callback.ice
+++ b/java/demo/Ice/bidir/Callback.ice
diff --git a/java/demo/Ice/bidir/CallbackReceiverI.java b/java/demo/Ice/bidir/CallbackReceiverI.java
index aa45e98e016..aa45e98e016 100755..100644
--- a/java/demo/Ice/bidir/CallbackReceiverI.java
+++ b/java/demo/Ice/bidir/CallbackReceiverI.java
diff --git a/java/demo/Ice/bidir/CallbackSenderI.java b/java/demo/Ice/bidir/CallbackSenderI.java
index 332c1c75614..332c1c75614 100755..100644
--- a/java/demo/Ice/bidir/CallbackSenderI.java
+++ b/java/demo/Ice/bidir/CallbackSenderI.java
diff --git a/java/demo/Ice/bidir/Client.java b/java/demo/Ice/bidir/Client.java
index 8afbafee5bb..de4f69f6c2b 100755..100644
--- a/java/demo/Ice/bidir/Client.java
+++ b/java/demo/Ice/bidir/Client.java
@@ -20,8 +20,8 @@ public class Client extends Ice.Application
             return 1;
         }
 
-        CallbackSenderPrx server = 
-            CallbackSenderPrxHelper.checkedCast(communicator().propertyToProxy("Callback.Client.CallbackServer"));
+        CallbackSenderPrx server = CallbackSenderPrxHelper.checkedCast(
+            communicator().propertyToProxy("CallbackSender.Proxy"));
         if(server == null)
         {
             System.err.println("invalid proxy");
diff --git a/java/demo/Ice/bidir/Server.java b/java/demo/Ice/bidir/Server.java
index a07555d003a..a07555d003a 100755..100644
--- a/java/demo/Ice/bidir/Server.java
+++ b/java/demo/Ice/bidir/Server.java
diff --git a/java/demo/Ice/bidir/build.xml b/java/demo/Ice/bidir/build.xml
index ca217abe522..ca217abe522 100755..100644
--- a/java/demo/Ice/bidir/build.xml
+++ b/java/demo/Ice/bidir/build.xml
diff --git a/java/demo/Ice/bidir/config.client b/java/demo/Ice/bidir/config.client
index edb912f2db7..d336e250178 100755..100644
--- a/java/demo/Ice/bidir/config.client
+++ b/java/demo/Ice/bidir/config.client
@@ -1,28 +1,33 @@
-Callback.Client.CallbackServer=sender:tcp -p 10000
-
-# Active connection management must be disabled when using
-# bidirectional connections.
-Ice.ACM.Client=0
-
-#
-# Warn about connection exceptions
-#
-Ice.Warn.Connections=1
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
+#
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=sender:tcp -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# Client-side ACM must be disabled for bidirectional connections.
+#
+Ice.ACM.Client=0
+
+#
+# Network Tracing
+#
+# 0 = no network tracing
+# 1 = trace connection establishment and closure
+# 2 = like 1, but more detailed
+# 3 = like 2, but also trace data transfer
+#
+#Ice.Trace.Network=1
+
+#
+# Protocol Tracing
+#
+# 0 = no protocol tracing
+# 1 = trace protocol messages
+#
+#Ice.Trace.Protocol=1
diff --git a/java/demo/Ice/bidir/config.server b/java/demo/Ice/bidir/config.server
index 1e6ffd5e484..d9c7154678a 100755..100644
--- a/java/demo/Ice/bidir/config.server
+++ b/java/demo/Ice/bidir/config.server
@@ -1,28 +1,29 @@
-Callback.Server.Endpoints=tcp -p 10000
-
-# Active connection management must be disabled when using
-# bidirectional connections.
-Ice.ACM.Client=0
-
-#
-# Warn about connection exceptions
-#
-Ice.Warn.Connections=1
-
-#
-# Network Tracing
-#
-# 0 = no network tracing
-# 1 = trace connection establishment and closure
-# 2 = like 1, but more detailed
-# 3 = like 2, but also trace data transfer
-#
-#Ice.Trace.Network=1
-
-#
-# Protocol Tracing
-#
-# 0 = no protocol tracing
-# 1 = trace protocol messages
-#
-#Ice.Trace.Protocol=1
+#
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
+#
+Callback.Server.Endpoints=tcp -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# Network Tracing
+#
+# 0 = no network tracing
+# 1 = trace connection establishment and closure
+# 2 = like 1, but more detailed
+# 3 = like 2, but also trace data transfer
+#
+#Ice.Trace.Network=1
+
+#
+# Protocol Tracing
+#
+# 0 = no protocol tracing
+# 1 = trace protocol messages
+#
+#Ice.Trace.Protocol=1
diff --git a/java/demo/Ice/callback/Client.java b/java/demo/Ice/callback/Client.java
index a2a81d4c5af..8785f1bb44c 100644
--- a/java/demo/Ice/callback/Client.java
+++ b/java/demo/Ice/callback/Client.java
@@ -61,7 +61,7 @@ public class Client extends Ice.Application
         setInterruptHook(new ShutdownHook());
 
         CallbackSenderPrx twoway = CallbackSenderPrxHelper.checkedCast(
-            communicator().propertyToProxy("Callback.CallbackServer").
+            communicator().propertyToProxy("CallbackSender.Proxy").
                 ice_twoway().ice_timeout(-1).ice_secure(false));
         if(twoway == null)
         {
diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client
index b53d5737c4b..242366bb84f 100644
--- a/java/demo/Ice/callback/config.client
+++ b/java/demo/Ice/callback/config.client
@@ -1,4 +1,14 @@
-Callback.CallbackServer=callback:tcp -p 12000:udp -p 10000:ssl -p 10001
+#
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+
+#
+# The client creates one single object adapter with the name
+# "Callback.Client". The following line sets the endpoints for this
+# adapter.
+#
 Callback.Client.Endpoints=tcp:udp:ssl
 
 #
diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server
index c1b58bd8e45..72ea2cf0425 100644
--- a/java/demo/Ice/callback/config.server
+++ b/java/demo/Ice/callback/config.server
@@ -1,4 +1,9 @@
-Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001
+#
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
+#
+Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/java/demo/Ice/hello/config.client b/java/demo/Ice/hello/config.client
index cc90296023a..0848342c1e0 100644
--- a/java/demo/Ice/hello/config.client
+++ b/java/demo/Ice/hello/config.client
@@ -5,12 +5,15 @@
 Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
-# Warn about connection exceptions
+# Warn about connection exceptions.
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Client-side ACM is enabled by default, with an interval of 60
+# seconds. For this demo, we want to use a short timeout of 10
+# seconds. By enabling network tracing below, you can see ACM
+# automatically close idle connections.
 #
 Ice.ACM.Client=10
 
diff --git a/java/demo/Ice/hello/config.server b/java/demo/Ice/hello/config.server
index ff82b6b45d1..0e7b9b199fc 100644
--- a/java/demo/Ice/hello/config.server
+++ b/java/demo/Ice/hello/config.server
@@ -1,17 +1,20 @@
 #
 # The server creates one single object adapter with the name
-# "helloadapater". The following line sets the endpoints for this
-# adapter
+# "Hello". The following line sets the endpoints for this
+# adapter.
 #
 Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Server-side ACM is disabled by default. For this demo, we want it
+# enabled and set to a short timeout of 10 seconds. By enabling
+# network tracing below, you can see ACM automatically close idle
+# connections.
 #
 Ice.ACM.Server=10
 
diff --git a/java/demo/Ice/invoke/config.client b/java/demo/Ice/invoke/config.client
index 936a2f30fcc..f7e66d46fd0 100644
--- a/java/demo/Ice/invoke/config.client
+++ b/java/demo/Ice/invoke/config.client
@@ -1,6 +1,6 @@
 #
 # The client reads this property to create the reference to the
-# "hello" object in the server.
+# "Printer" object in the server.
 #
 Printer.Proxy=printer:default -p 10000
 
diff --git a/java/demo/Ice/invoke/config.server b/java/demo/Ice/invoke/config.server
index 21ec8851e14..0c4b1af77b7 100644
--- a/java/demo/Ice/invoke/config.server
+++ b/java/demo/Ice/invoke/config.server
@@ -1,7 +1,7 @@
 #
 # The server creates one single object adapter with the name
-# "helloadapater". The following line sets the endpoints for this
-# adapter
+# "Printer". The following line sets the endpoints for this
+# adapter.
 #
 Printer.Endpoints=default -p 10000
 
diff --git a/java/demo/Ice/latency/Client.java b/java/demo/Ice/latency/Client.java
index a11f1804913..4f591420581 100644
--- a/java/demo/Ice/latency/Client.java
+++ b/java/demo/Ice/latency/Client.java
@@ -20,7 +20,7 @@ class Client extends Ice.Application
             return 1;
         }
 
-        PingPrx ping = PingPrxHelper.checkedCast(communicator().propertyToProxy("Latency.Ping"));
+        PingPrx ping = PingPrxHelper.checkedCast(communicator().propertyToProxy("Ping.Proxy"));
         if(ping == null)
         {
             System.err.println("invalid proxy");
diff --git a/java/demo/Ice/latency/config.client b/java/demo/Ice/latency/config.client
index 2faeb27a191..ae1a2e4e066 100644
--- a/java/demo/Ice/latency/config.client
+++ b/java/demo/Ice/latency/config.client
@@ -1,3 +1,10 @@
-Latency.Ping=ping:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the "Ping"
+# object in the server.
+#
+Ping.Proxy=ping:default -p 10000 -h 127.0.0.1
 
+#
+# Disable client-side ACM.
+#
 Ice.ACM.Client=0
diff --git a/java/demo/Ice/latency/config.server b/java/demo/Ice/latency/config.server
index 6d82f1a7f2e..75e3479d6fe 100644
--- a/java/demo/Ice/latency/config.server
+++ b/java/demo/Ice/latency/config.server
@@ -1 +1,10 @@
+#
+# 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 127.0.0.1
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/java/demo/Ice/multicast/Client.java b/java/demo/Ice/multicast/Client.java
index 14afa06d235..a4f137a2616 100644
--- a/java/demo/Ice/multicast/Client.java
+++ b/java/demo/Ice/multicast/Client.java
@@ -30,7 +30,6 @@ public class Client extends Ice.Application
         discover.lookup(reply);
         Ice.ObjectPrx base = replyI.waitReply(2000);
 
-
         if(base == null)
         {
             System.err.println(appName() + ": no replies");
diff --git a/java/demo/Ice/multicast/config.client b/java/demo/Ice/multicast/config.client
index 1335102bf9a..b68bb269f33 100644
--- a/java/demo/Ice/multicast/config.client
+++ b/java/demo/Ice/multicast/config.client
@@ -1,6 +1,6 @@
 #
 # The client reads this property to create the reference to the
-# "discovery" object in the server.
+# "Discover" object in the server.
 #
 Discover.Proxy=discover:udp -h 224.0.0.5 -p 10000
 
@@ -20,12 +20,7 @@ DiscoverReply.Endpoints=tcp
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
-
-#
-# We want a faster ACM for this demo.
-#
-Ice.ACM.Client=10
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/java/demo/Ice/multicast/config.server b/java/demo/Ice/multicast/config.server
index b92327ce946..451f9e5d5a5 100644
--- a/java/demo/Ice/multicast/config.server
+++ b/java/demo/Ice/multicast/config.server
@@ -19,7 +19,7 @@ Hello.Endpoints=tcp
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/java/demo/Ice/nested/Client.java b/java/demo/Ice/nested/Client.java
index c67036d149e..3fb455eeb5c 100644
--- a/java/demo/Ice/nested/Client.java
+++ b/java/demo/Ice/nested/Client.java
@@ -49,8 +49,7 @@ public class Client extends Ice.Application
         //
         setInterruptHook(new ShutdownHook());
 
-        NestedPrx nested = NestedPrxHelper.checkedCast(
-            communicator().propertyToProxy("Nested.NestedServer"));
+        NestedPrx nested = NestedPrxHelper.checkedCast(communicator().propertyToProxy("Nested.Proxy"));
         if(nested == null)
         {
             System.err.println("invalid proxy");
diff --git a/java/demo/Ice/nested/config.client b/java/demo/Ice/nested/config.client
index 741856b4b3b..066f1dc8fd8 100644
--- a/java/demo/Ice/nested/config.client
+++ b/java/demo/Ice/nested/config.client
@@ -1,6 +1,23 @@
-Nested.NestedServer=nestedServer:default -p 10000 -t 10000
+#
+# The client reads this property to create the reference to the
+# "Nested" object in the server.
+#
+Nested.Proxy=nestedServer:default -p 10000 -t 10000
+
+#
+# The client creates one single object adapter with the name
+# "Nested.Client". The following line sets the endpoints for this
+# adapter.
+#
 Nested.Client.Endpoints=default -t 10000
 
+#
+# The following properties configure the server thread pool. The
+# thread pool initially contains 5 threads, and the Ice run time
+# starts emitting warnings once 5 threads are in use. The Ice run time
+# creates more threads once all 5 are in use, up to a maximum of 10
+# threads.
+#
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
 Ice.ThreadPool.Server.SizeMax=10
@@ -8,7 +25,7 @@ Ice.ThreadPool.Server.SizeMax=10
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server
index e0073284155..94d3ca82be4 100644
--- a/java/demo/Ice/nested/config.server
+++ b/java/demo/Ice/nested/config.server
@@ -1,5 +1,17 @@
+#
+# The server creates one single object adapter with the name
+# "Nested.Server". The following line sets the endpoints for this
+# adapter.
+#
 Nested.Server.Endpoints=default -p 10000 -t 10000
 
+#
+# The following properties configure the server thread pool. The
+# thread pool initially contains 5 threads, and the Ice run time
+# starts emitting warnings once 5 threads are in use. The Ice run time
+# creates more threads once all 5 are in use, up to a maximum of 10
+# threads.
+#
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
 Ice.ThreadPool.Server.SizeMax=10
@@ -7,7 +19,7 @@ Ice.ThreadPool.Server.SizeMax=10
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
 # Network Tracing
diff --git a/java/demo/Ice/throughput/Client.java b/java/demo/Ice/throughput/Client.java
index 1f5dcb32018..8f6a4176705 100644
--- a/java/demo/Ice/throughput/Client.java
+++ b/java/demo/Ice/throughput/Client.java
@@ -67,8 +67,7 @@ public class Client extends Ice.Application
         //
         setInterruptHook(new ShutdownHook());
 
-        Ice.ObjectPrx base = communicator().propertyToProxy("Throughput.Throughput");
-        ThroughputPrx throughput = ThroughputPrxHelper.checkedCast(base);
+        ThroughputPrx throughput = ThroughputPrxHelper.checkedCast(communicator().propertyToProxy("Throughput.Proxy"));
         if(throughput == null)
         {
             System.err.println("invalid proxy");
diff --git a/java/demo/Ice/throughput/config.client b/java/demo/Ice/throughput/config.client
index 137aced2558..0f763b09d20 100644
--- a/java/demo/Ice/throughput/config.client
+++ b/java/demo/Ice/throughput/config.client
@@ -1,4 +1,10 @@
-Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the
+# "Throughput" object in the server.
+#
+Throughput.Proxy=throughput:default -p 10000 -h 127.0.0.1
 
+#
+# Disable client-side ACM.
+#
 Ice.ACM.Client=0
-Ice.ACM.Server=0
diff --git a/java/demo/Ice/throughput/config.server b/java/demo/Ice/throughput/config.server
index ab09821b6b0..1a301bb3ed6 100644
--- a/java/demo/Ice/throughput/config.server
+++ b/java/demo/Ice/throughput/config.server
@@ -1,4 +1,11 @@
-Throughput.Endpoints=default -p 10000
+#
+# The server creates one single object adapter with the name
+# "Throughput". The following line sets the endpoints for this
+# adapter.
+#
+Throughput.Endpoints=default -p 10000 -h 127.0.0.1
 
-Ice.ACM.Client=0
-Ice.ACM.Server=0
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index b1a6feaeaa4..dfd8ca53e07 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -56,8 +56,7 @@ public class Client extends Ice.Application
         //
         setInterruptHook(new ShutdownHook());
 
-        Ice.ObjectPrx base = communicator().propertyToProxy("Value.Initial");
-        InitialPrx initial = InitialPrxHelper.checkedCast(base);
+        InitialPrx initial = InitialPrxHelper.checkedCast(communicator().propertyToProxy("Initial.Proxy"));
         if(initial == null)
         {
             System.err.println("invalid object reference");
diff --git a/java/demo/Ice/value/config.client b/java/demo/Ice/value/config.client
index 1ffc432a7b9..cf32f52ca5d 100644
--- a/java/demo/Ice/value/config.client
+++ b/java/demo/Ice/value/config.client
@@ -1,4 +1,13 @@
-Value.Initial=initial:default -p 10000
+#
+# The client reads this property to create the reference to the
+# "Initial" object in the server.
+#
+Initial.Proxy=initial:default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
 
 #
 # SSL Configuration
diff --git a/java/demo/Ice/value/config.server b/java/demo/Ice/value/config.server
index cd32b9979cc..32fbaca603d 100644
--- a/java/demo/Ice/value/config.server
+++ b/java/demo/Ice/value/config.server
@@ -1,6 +1,16 @@
+#
+# The server creates one single object adapter with the name
+# "Value". The following line sets the endpoints for this
+# adapter.
+#
 Value.Endpoints=default -p 10000
 
 #
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
 # SSL Configuration
 #
 Ice.Plugin.IceSSL=IceSSL.PluginFactory
diff --git a/java/demo/IceGrid/icebox/config.client b/java/demo/IceGrid/icebox/config.client
index 98bd1ac6b22..ee39e6ad994 100644
--- a/java/demo/IceGrid/icebox/config.client
+++ b/java/demo/IceGrid/icebox/config.client
@@ -1,3 +1,7 @@
+#
+# The client reads this property to create the reference to the
+# "hello" object in the server.
+#
 Hello.Proxy=hello
 
 #
diff --git a/java/demo/IceGrid/icebox/config.grid b/java/demo/IceGrid/icebox/config.grid
index aa3cec8ca2e..e7ba5f45a0f 100644
--- a/java/demo/IceGrid/icebox/config.grid
+++ b/java/demo/IceGrid/icebox/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
@@ -33,7 +36,6 @@ IceGrid.Node.CollocateRegistry=1
 # Trace properties.
 #
 IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
 #IceGrid.Node.Trace.Adapter=2
 #IceGrid.Node.Trace.Server=3
 
diff --git a/java/demo/IceGrid/simple/config.grid b/java/demo/IceGrid/simple/config.grid
index 88358da8862..913b68efb68 100644
--- a/java/demo/IceGrid/simple/config.grid
+++ b/java/demo/IceGrid/simple/config.grid
@@ -1,3 +1,6 @@
+#
+# The IceGrid instance name.
+#
 IceGrid.InstanceName=DemoIceGrid
 
 #
@@ -31,7 +34,6 @@ IceGrid.Node.CollocateRegistry=1
 # Trace properties.
 #
 IceGrid.Node.Trace.Activator=1
-IceGrid.Node.Trace.Patch=1
 #IceGrid.Node.Trace.Adapter=2
 #IceGrid.Node.Trace.Server=3
 
diff --git a/java/demo/IceStorm/clock/config.service b/java/demo/IceStorm/clock/config.service
index 1cabb0820d3..b7c9e56a58c 100644
--- a/java/demo/IceStorm/clock/config.service
+++ b/java/demo/IceStorm/clock/config.service
@@ -1,13 +1,13 @@
 #
-# This property defines the endpoints on which the IceStorm
-# TopicManager listens.
+# The IceStorm service instance name.
 #
-IceStorm.TopicManager.Endpoints=default -p 10000
+IceStorm.InstanceName=DemoIceStorm
 
 #
-# The IceStorm service instance name.
+# This property defines the endpoints on which the IceStorm
+# TopicManager listens.
 #
-IceStorm.InstanceName=DemoIceStorm
+IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
 # This property defines the endpoints on which the topic
@@ -15,7 +15,7 @@ IceStorm.InstanceName=DemoIceStorm
 # IceStorm instances this must run on a fixed port (or use
 # IceGrid).
 #
-IceStorm.Publish.Endpoints=default -p 10001:udp -p 10001
+IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
 
 #
 # TopicManager Tracing
@@ -44,14 +44,6 @@ IceStorm.Trace.Topic=1
 IceStorm.Trace.Subscriber=1
 
 #
-# Flush Tracing (for batch mode transfer flushing)
-#
-# 0 = no tracing
-# 1 = trace activity of flusher thread
-#
-IceStorm.Trace.Flush=1
-
-#
 # Amount of time in milliseconds between flushes for batch mode
 # transfer. The minimum allowable value is 100ms.
 #
diff --git a/java/demo/book/freeze_filesystem/config.client b/java/demo/book/freeze_filesystem/config.client
index 4bd7574216d..6f0ba50b98f 100644
--- a/java/demo/book/freeze_filesystem/config.client
+++ b/java/demo/book/freeze_filesystem/config.client
@@ -1,6 +1,6 @@
 #
-# The client reads this property to create the reference to the
-# "library" object in the server.
+# The client reads this property to create the reference to the root
+# "directory" object in the server.
 #
 RootDir.Proxy=RootDir:default -p 10000
 
diff --git a/java/demo/book/freeze_filesystem/config.server b/java/demo/book/freeze_filesystem/config.server
index 2370acc99a5..8ee5723e944 100644
--- a/java/demo/book/freeze_filesystem/config.server
+++ b/java/demo/book/freeze_filesystem/config.server
@@ -1,6 +1,28 @@
+#
+# Configure the server endpoints.
+#
 FreezeFilesystem.Endpoints=default -p 10000
 
+#
+# Freeze Map Tracing.
+#
+# 0 = No map activity trace (default). 
+# 1 = Trace database open and close. 
+# 2 = Also trace iterator and transaction operations, and reference
+# counting of the underlying database.
+#
 Freeze.Trace.Map=1
+
+#
+# Freeze Evictor Tracing.
+#
+# 0 = No evictor activity trace (default). 
+# 1 = Trace Ice object and facet creation and destruction, facet
+#     streaming time, facet saving time, object eviction (every 50
+#     objects) and evictor deactivation.
+# 2 = Also trace object lookups, and all object evictions. 
+# 3 = Also trace object retrieval from the database.
+#
 Freeze.Trace.Evictor=2
 
 #
diff --git a/py/demo/Ice/bidir/Client.py b/py/demo/Ice/bidir/Client.py
index ac620ceb10c..47bf69f18d8 100644
--- a/py/demo/Ice/bidir/Client.py
+++ b/py/demo/Ice/bidir/Client.py
@@ -35,7 +35,7 @@ class Client(Ice.Application):
             print self.appName() + ": too many arguments"
             return 1
 
-        server = Demo.CallbackSenderPrx.checkedCast(self.communicator().propertyToProxy('Callback.Client.CallbackServer'))
+        server = Demo.CallbackSenderPrx.checkedCast(self.communicator().propertyToProxy('CallbackSender.Proxy'))
         if not server:
             print self.appName() + ": invalid proxy"
             return 1
diff --git a/py/demo/Ice/bidir/config.client b/py/demo/Ice/bidir/config.client
index af6c776e466..d336e250178 100644
--- a/py/demo/Ice/bidir/config.client
+++ b/py/demo/Ice/bidir/config.client
@@ -1,4 +1,8 @@
-Callback.Client.CallbackServer=sender:tcp -p 10000
+#
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=sender:tcp -p 10000
 
 #
 # Warn about connection exceptions
@@ -6,6 +10,11 @@ Callback.Client.CallbackServer=sender:tcp -p 10000
 Ice.Warn.Connections=1
 
 #
+# Client-side ACM must be disabled for bidirectional connections.
+#
+Ice.ACM.Client=0
+
+#
 # Network Tracing
 #
 # 0 = no network tracing
@@ -22,7 +31,3 @@ Ice.Warn.Connections=1
 # 1 = trace protocol messages
 #
 #Ice.Trace.Protocol=1
-
-# Active connection management must be disabled when using
-# bidirectional connections.
-Ice.ACM.Client=0
diff --git a/py/demo/Ice/bidir/config.server b/py/demo/Ice/bidir/config.server
index c36f2405d66..d9c7154678a 100644
--- a/py/demo/Ice/bidir/config.server
+++ b/py/demo/Ice/bidir/config.server
@@ -1,3 +1,8 @@
+#
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
+#
 Callback.Server.Endpoints=tcp -p 10000
 
 #
diff --git a/py/demo/Ice/callback/Client.py b/py/demo/Ice/callback/Client.py
index 865f51ff36f..ec81b51ce5f 100644
--- a/py/demo/Ice/callback/Client.py
+++ b/py/demo/Ice/callback/Client.py
@@ -38,8 +38,9 @@ class Client(Ice.Application):
             print self.appName() + ": too many arguments"
             return 1
 
-        base = self.communicator().propertyToProxy('Callback.CallbackServer')
-        twoway = Demo.CallbackSenderPrx.checkedCast(base.ice_twoway().ice_timeout(-1).ice_secure(False))
+        twoway = Demo.CallbackSenderPrx.checkedCast(
+            self.communicator().propertyToProxy('CallbackSender.Proxy').
+            ice_twoway().ice_timeout(-1).ice_secure(False))
         if not twoway:
             print self.appName() + ": invalid proxy"
             return 1
diff --git a/py/demo/Ice/callback/config.client b/py/demo/Ice/callback/config.client
index 7a2b3433705..9906a3191f3 100644
--- a/py/demo/Ice/callback/config.client
+++ b/py/demo/Ice/callback/config.client
@@ -1,4 +1,14 @@
-Callback.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+#
+# The client reads this property to create the reference to the
+# "CallbackSender" object in the server.
+#
+CallbackSender.Proxy=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+
+#
+# The client creates one single object adapter with the name
+# "Callback.Client". The following line sets the endpoints for this
+# adapter.
+#
 Callback.Client.Endpoints=tcp:udp:ssl
 
 #
diff --git a/py/demo/Ice/callback/config.server b/py/demo/Ice/callback/config.server
index 4bc48acf7ae..d45dbd27e46 100644
--- a/py/demo/Ice/callback/config.server
+++ b/py/demo/Ice/callback/config.server
@@ -1,3 +1,8 @@
+#
+# The server creates one single object adapter with the name
+# "Callback.Server". The following line sets the endpoints for this
+# adapter.
+#
 Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
diff --git a/py/demo/Ice/hello/config.client b/py/demo/Ice/hello/config.client
index 97a82f711cd..2b86cb75c2e 100644
--- a/py/demo/Ice/hello/config.client
+++ b/py/demo/Ice/hello/config.client
@@ -7,10 +7,13 @@ Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Client-side ACM is enabled by default, with an interval of 60
+# seconds. For this demo, we want to use a short timeout of 10
+# seconds. By enabling network tracing below, you can see ACM
+# automatically close idle connections.
 #
 Ice.ACM.Client=10
 
diff --git a/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server
index 45c8ff54d6f..cc4c1de1a5d 100644
--- a/py/demo/Ice/hello/config.server
+++ b/py/demo/Ice/hello/config.server
@@ -8,10 +8,13 @@ Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Server-side ACM is disabled by default. For this demo, we want it
+# enabled and set to a short timeout of 10 seconds. By enabling
+# network tracing below, you can see ACM automatically close idle
+# connections.
 #
 Ice.ACM.Server=10
 
diff --git a/py/demo/Ice/latency/Client.py b/py/demo/Ice/latency/Client.py
index edb35c177a7..070ae035460 100644
--- a/py/demo/Ice/latency/Client.py
+++ b/py/demo/Ice/latency/Client.py
@@ -19,7 +19,7 @@ class Client(Ice.Application):
             print self.appName() + ": too many arguments"
             return 1
 
-        ping = Demo.PingPrx.checkedCast(self.communicator().propertyToProxy('Latency.Ping'))
+        ping = Demo.PingPrx.checkedCast(self.communicator().propertyToProxy('Ping.Proxy'))
         if not ping:
             print "invalid proxy"
             return 1
diff --git a/py/demo/Ice/latency/config.client b/py/demo/Ice/latency/config.client
index 77bf54529ba..623184c970c 100644
--- a/py/demo/Ice/latency/config.client
+++ b/py/demo/Ice/latency/config.client
@@ -1,9 +1,19 @@
-Latency.Ping=ping:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the "Ping"
+# object in the server.
+#
+Ping.Proxy=ping:default -p 10000 -h 127.0.0.1
 
-#Ice.Plugin.IceSSL=IceSSL:createIceSSL
+#
+# Disable client-side ACM.
+#
+Ice.ACM.Client=0
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
 IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=c_rsa1024_pub.pem
 IceSSL.KeyFile=c_rsa1024_priv.pem
-
-Ice.ACM.Client=0
diff --git a/py/demo/Ice/latency/config.server b/py/demo/Ice/latency/config.server
index f6843bb8e2d..874f621add1 100644
--- a/py/demo/Ice/latency/config.server
+++ b/py/demo/Ice/latency/config.server
@@ -1,6 +1,18 @@
+#
+# 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 127.0.0.1
 
-#Ice.Plugin.IceSSL=IceSSL:createIceSSL
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
 IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=s_rsa1024_pub.pem
diff --git a/py/demo/Ice/throughput/Client.py b/py/demo/Ice/throughput/Client.py
index aa039de58a3..9a557757b40 100644
--- a/py/demo/Ice/throughput/Client.py
+++ b/py/demo/Ice/throughput/Client.py
@@ -41,7 +41,7 @@ class Client(Ice.Application):
             print self.appName() + ": too many arguments"
             return 1
 
-        throughput = Demo.ThroughputPrx.checkedCast(self.communicator().propertyToProxy('Throughput.Throughput'))
+        throughput = Demo.ThroughputPrx.checkedCast(self.communicator().propertyToProxy('Throughput.Proxy'))
         if not throughput:
             print args[0] + ": invalid proxy"
             return 1
diff --git a/py/demo/Ice/throughput/config.client b/py/demo/Ice/throughput/config.client
index 32b6bc17747..4ad70cb1198 100644
--- a/py/demo/Ice/throughput/config.client
+++ b/py/demo/Ice/throughput/config.client
@@ -1,9 +1,20 @@
-Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the
+# "Throughput" object in the server.
+#
+Throughput.Proxy=throughput:default -p 10000 -h 127.0.0.1
 
-#Ice.Plugin.IceSSL=IceSSL:createIceSSL
+#
+# Disable client-side ACM.
+#
+Ice.ACM.Client=0
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
 IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=c_rsa1024_pub.pem
 IceSSL.KeyFile=c_rsa1024_priv.pem
 
-Ice.ACM.Client=0
diff --git a/py/demo/Ice/throughput/config.server b/py/demo/Ice/throughput/config.server
index 3b19925623a..1f433a3b421 100644
--- a/py/demo/Ice/throughput/config.server
+++ b/py/demo/Ice/throughput/config.server
@@ -1,6 +1,19 @@
+#
+# The server creates one single object adapter with the name
+# "Throughput". The following line sets the endpoints for this
+# adapter.
+#
 Throughput.Endpoints=default -p 10000 -h 127.0.0.1
 
-#Ice.Plugin.IceSSL=IceSSL:createIceSSL
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
 IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=s_rsa1024_pub.pem
diff --git a/py/demo/Ice/value/Client.py b/py/demo/Ice/value/Client.py
index 4ba97e67e7a..94ac920ac85 100644
--- a/py/demo/Ice/value/Client.py
+++ b/py/demo/Ice/value/Client.py
@@ -33,8 +33,7 @@ class Client(Ice.Application):
             print self.appName() + ": too many arguments"
             return 1
 
-        base = self.communicator().propertyToProxy('Value.Initial')
-        initial = Demo.InitialPrx.checkedCast(base)
+        initial = Demo.InitialPrx.checkedCast(self.communicator().propertyToProxy('Initial.Proxy'))
         if not initial:
             print args[0] + ": invalid proxy"
             return 1
diff --git a/py/demo/Ice/value/config.client b/py/demo/Ice/value/config.client
index 48356dd5c43..aa0dc669ca1 100644
--- a/py/demo/Ice/value/config.client
+++ b/py/demo/Ice/value/config.client
@@ -1 +1,10 @@
-Value.Initial=initial:default -p 10000
+#
+# The client reads this property to create the reference to the
+# "Initial" object in the server.
+#
+Initial.Proxy=initial:default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/py/demo/Ice/value/config.server b/py/demo/Ice/value/config.server
index 8f2cf355ffc..4ec2d8b57df 100644
--- a/py/demo/Ice/value/config.server
+++ b/py/demo/Ice/value/config.server
@@ -1 +1,11 @@
+#
+# The server creates one single object adapter with the name
+# "Value". The following line sets the endpoints for this
+# adapter.
+#
 Value.Endpoints=default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
diff --git a/py/demo/IceStorm/clock/Publisher.py b/py/demo/IceStorm/clock/Publisher.py
index c89217a8651..131476c52e2 100644
--- a/py/demo/IceStorm/clock/Publisher.py
+++ b/py/demo/IceStorm/clock/Publisher.py
@@ -45,8 +45,7 @@ class Publisher(Ice.Application):
         if len(args) > 0:
             topicName = args[0]
 
-        manager = IceStorm.TopicManagerPrx.checkedCast(\
-            self.communicator().propertyToProxy('IceStorm.TopicManager.Proxy'))
+        manager = IceStorm.TopicManagerPrx.checkedCast(self.communicator().propertyToProxy('TopicManager.Proxy'))
         if not manager:
             print args[0] + ": invalid proxy"
             return 1
diff --git a/py/demo/IceStorm/clock/Subscriber.py b/py/demo/IceStorm/clock/Subscriber.py
index e1fd12bc9a6..3822c85ef3f 100644
--- a/py/demo/IceStorm/clock/Subscriber.py
+++ b/py/demo/IceStorm/clock/Subscriber.py
@@ -60,8 +60,7 @@ class Subscriber(Ice.Application):
         if len(args) > 0:
             topicName = args[0]
 
-        manager = IceStorm.TopicManagerPrx.checkedCast(\
-            self.communicator().propertyToProxy('IceStorm.TopicManager.Proxy'))
+        manager = IceStorm.TopicManagerPrx.checkedCast(self.communicator().propertyToProxy('TopicManager.Proxy'))
         if not manager:
             print args[0] + ": invalid proxy"
             return 1
diff --git a/py/demo/IceStorm/clock/config.pub b/py/demo/IceStorm/clock/config.pub
index c6de9cb84b1..e7d497f8f52 100644
--- a/py/demo/IceStorm/clock/config.pub
+++ b/py/demo/IceStorm/clock/config.pub
@@ -1,7 +1,7 @@
 #
 # This property is used by the clients to connect to IceStorm.
 #
-IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 
 #
 # Network Tracing
diff --git a/py/demo/IceStorm/clock/config.service b/py/demo/IceStorm/clock/config.service
index 818ad2f761b..6f7ad9c39e9 100644
--- a/py/demo/IceStorm/clock/config.service
+++ b/py/demo/IceStorm/clock/config.service
@@ -1,4 +1,9 @@
 #
+# The IceStorm service instance name.
+#
+IceStorm.InstanceName=DemoIceStorm
+
+#
 # This property is used by the administrative client to connect to IceStorm.
 #
 IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
@@ -10,17 +15,12 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
-# The IceStorm service instance name.
-#
-IceStorm.InstanceName=DemoIceStorm
-
-#
 # This property defines the endpoints on which the topic
 # publisher objects listen. If you want to federate
 # IceStorm instances this must run on a fixed port (or use
 # IceGrid).
 #
-IceStorm.Publish.Endpoints=default -p 10001:udp -p 10001
+IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
 
 #
 # TopicManager Tracing
diff --git a/py/demo/IceStorm/clock/config.sub b/py/demo/IceStorm/clock/config.sub
index ad2ac555de8..cefadaeb6e5 100644
--- a/py/demo/IceStorm/clock/config.sub
+++ b/py/demo/IceStorm/clock/config.sub
@@ -7,7 +7,7 @@ Clock.Subscriber.Endpoints=tcp:udp
 #
 # This property is used by the clients to connect to IceStorm.
 #
-IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 
 #
 # Network Tracing
diff --git a/rb/demo/Ice/hello/config.client b/rb/demo/Ice/hello/config.client
index 97a82f711cd..2b86cb75c2e 100644
--- a/rb/demo/Ice/hello/config.client
+++ b/rb/demo/Ice/hello/config.client
@@ -7,10 +7,13 @@ Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
 #
 # Warn about connection exceptions
 #
-#Ice.Warn.Connections=1
+Ice.Warn.Connections=1
 
 #
-# We want a faster ACM for this demo.
+# Client-side ACM is enabled by default, with an interval of 60
+# seconds. For this demo, we want to use a short timeout of 10
+# seconds. By enabling network tracing below, you can see ACM
+# automatically close idle connections.
 #
 Ice.ACM.Client=10
 
diff --git a/rb/demo/Ice/latency/Client.rb b/rb/demo/Ice/latency/Client.rb
index fe86da3f3e3..ac2e69be9cd 100644
--- a/rb/demo/Ice/latency/Client.rb
+++ b/rb/demo/Ice/latency/Client.rb
@@ -19,7 +19,7 @@ class Client < Ice::Application
             return 1
         end
 
-        ping = Demo::PingPrx::checkedCast(Ice::Application::communicator().propertyToProxy('Latency.Ping'))
+        ping = Demo::PingPrx::checkedCast(Ice::Application::communicator().propertyToProxy('Ping.Proxy'))
         if not ping
             puts "invalid proxy"
             return 1
diff --git a/rb/demo/Ice/latency/config.client b/rb/demo/Ice/latency/config.client
index 368adbf1f30..623184c970c 100644
--- a/rb/demo/Ice/latency/config.client
+++ b/rb/demo/Ice/latency/config.client
@@ -1,4 +1,13 @@
-Latency.Ping=ping:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the "Ping"
+# object in the server.
+#
+Ping.Proxy=ping:default -p 10000 -h 127.0.0.1
+
+#
+# Disable client-side ACM.
+#
+Ice.ACM.Client=0
 
 #
 # SSL Configuration
@@ -8,8 +17,3 @@ IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=c_rsa1024_pub.pem
 IceSSL.KeyFile=c_rsa1024_priv.pem
-
-#
-# Disable ACM
-#
-Ice.ACM.Client=0
diff --git a/rb/demo/Ice/throughput/Client.rb b/rb/demo/Ice/throughput/Client.rb
index 64ea45a635e..a7de5e0bb68 100644
--- a/rb/demo/Ice/throughput/Client.rb
+++ b/rb/demo/Ice/throughput/Client.rb
@@ -58,7 +58,7 @@ class Client < Ice::Application
         Ice::Application::callbackOnInterrupt
 
         throughput = Demo::ThroughputPrx::checkedCast(
-            Ice::Application::communicator().propertyToProxy('Throughput.Throughput'))
+            Ice::Application::communicator().propertyToProxy('Throughput.Proxy'))
         if not throughput
             puts $0 + ": invalid proxy"
             return 1
diff --git a/rb/demo/Ice/throughput/config.client b/rb/demo/Ice/throughput/config.client
index a26fc99fde6..4ad70cb1198 100644
--- a/rb/demo/Ice/throughput/config.client
+++ b/rb/demo/Ice/throughput/config.client
@@ -1,4 +1,13 @@
-Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1
+#
+# The client reads this property to create the reference to the
+# "Throughput" object in the server.
+#
+Throughput.Proxy=throughput:default -p 10000 -h 127.0.0.1
+
+#
+# Disable client-side ACM.
+#
+Ice.ACM.Client=0
 
 #
 # SSL Configuration
@@ -9,7 +18,3 @@ IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=c_rsa1024_pub.pem
 IceSSL.KeyFile=c_rsa1024_priv.pem
 
-#
-# Disable ACM
-#
-Ice.ACM.Client=0
diff --git a/rb/demo/Ice/value/Client.rb b/rb/demo/Ice/value/Client.rb
index 08cb2fd8ec3..6984a965001 100644
--- a/rb/demo/Ice/value/Client.rb
+++ b/rb/demo/Ice/value/Client.rb
@@ -67,8 +67,7 @@ class Ice::Application
         #
         Ice::Application::callbackOnInterrupt
 
-        base = Ice::Application::communicator().propertyToProxy('Value.Initial')
-        initial = Demo::InitialPrx::checkedCast(base)
+        initial = Demo::InitialPrx::checkedCast(Ice::Application::communicator().propertyToProxy('Initial.Proxy'))
         if not initial
             puts $0 + ": invalid proxy"
             return 1
diff --git a/rb/demo/Ice/value/config.client b/rb/demo/Ice/value/config.client
index 48356dd5c43..aa0dc669ca1 100644
--- a/rb/demo/Ice/value/config.client
+++ b/rb/demo/Ice/value/config.client
@@ -1 +1,10 @@
-Value.Initial=initial:default -p 10000
+#
+# The client reads this property to create the reference to the
+# "Initial" object in the server.
+#
+Initial.Proxy=initial:default -p 10000
+
+#
+# Warn about connection exceptions
+#
+Ice.Warn.Connections=1
author	Matthew Newhook <matthew@zeroc.com>	2008-03-06 14:26:07 +0800
committer	Matthew Newhook <matthew@zeroc.com>	2008-03-06 14:26:07 +0800
commit	bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6 (patch)
tree	dc10cb41cd1280cf115c6bf5a1302481a969e15d
parent	Fix to fix for 2395. Backed out Dwayne's previous change because we both work... (diff)
download	ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.tar.bz2 ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.tar.xz ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.zip