fix

3 files changed, 17 insertions, 18 deletions

diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index b510b39c218..8cc660233f8 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -96,7 +96,7 @@ CallbackClient::run(int argc, char* argv[])
     callbackReceiverFakeIdent.category = "fake";
 
     PropertiesPtr properties = communicator()->getProperties();
-    const char* proxyProperty = "Callback.Client.Callback";
+    const char* proxyProperty = "Callback.Proxy";
     std::string proxy = properties->getProperty(proxyProperty);
     if(proxy.empty())
     {
diff --git a/cpp/demo/Glacier2/callback/config b/cpp/demo/Glacier2/callback/config
index e06772ea9b0..7fe2d700a58 100644
--- a/cpp/demo/Glacier2/callback/config
+++ b/cpp/demo/Glacier2/callback/config
@@ -1,8 +1,15 @@
 #
-# This must correspond to Callback.Server.Endpoints in the server
-# configuration.
+# The proxy to the Glacier2 router for all outgoing connections. This
+# must correspond to Glacier2.Client.Endpoints.
 #
-Callback.Client.Callback=callback:tcp -h 127.0.0.1 -p 10000
+Ice.Default.Router=Glacier2/router:ssl -p 10005
+
+#
+# The proxy for the Glacier2 router, installed with the client's
+# object adapter with the name Callback.Client. This router proxy must
+# correspond to Glacier2.Client.Endpoints.
+#
+Callback.Client.Router=Glacier2/router:ssl -p 10005
 
 #
 # We don't need any endpoints for the client if we use a
@@ -12,18 +19,10 @@ Callback.Client.Callback=callback:tcp -h 127.0.0.1 -p 10000
 Callback.Client.Endpoints=
 
 #
-# The proxy to Glacier2 router for the client's object adapter with
-# the name Callback.Client. This must correspond to
-# Glacier2.Client.Endpoints. Glacier2 only supports one connection per
-# client, and no UDP. Therefore we have only one single SSL endpoint.
-#
-Callback.Client.Router=Glacier2/router:ssl -p 10005
-
-#
-# The proxy to the Glacier2 router for all outgoing connections. This
-# must correspond to Glacier2.Client.Endpoints.
+# This must correspond to Callback.Server.Endpoints in the server
+# configuration.
 #
-Ice.Default.Router=Glacier2/router:ssl -p 10005
+Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000
 
 #
 # No active connection management is permitted with
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index 30a0fe50a42..fbae3b1974f 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -10,8 +10,8 @@
 #ifndef GLACIER2_H
 #define GLACIER2_H
 
-#include <Glacier/Router.h>
-#include <Glacier/Session.h>
-#include <Glacier/PermissionVerifier.h>
+#include <Glacier2/Router.h>
+#include <Glacier2/Session.h>
+#include <Glacier2/PermissionsVerifier.h>
 
 #endif