Fixed unknown property warnings

10 files changed, 10 insertions, 10 deletions

diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp
index fda90db0811..c476d1c6eb6 100644
--- a/cpp/demo/Freeze/library/Server.cpp
+++ b/cpp/demo/Freeze/library/Server.cpp
@@ -50,7 +50,7 @@ LibraryServer::run(int argc, char* argv[])
     // Create an evictor for books.
     //
     Freeze::EvictorPtr evictor = Freeze::createEvictor(adapter, _envName, "books");
-    Ice::Int evictorSize = properties->getPropertyAsInt("Library.EvictorSize");
+    Ice::Int evictorSize = properties->getPropertyAsInt("EvictorSize");
     if(evictorSize > 0)
     {
         evictor->setSize(evictorSize);
diff --git a/cpp/demo/Freeze/library/config.server b/cpp/demo/Freeze/library/config.server
index 2a0e997bbf6..e239f6e3583 100644
--- a/cpp/demo/Freeze/library/config.server
+++ b/cpp/demo/Freeze/library/config.server
@@ -1,5 +1,5 @@
 Library.Endpoints=default -p 10000
-Library.EvictorSize=3
+EvictorSize=3
 
 Freeze.Trace.Map=1
 Freeze.Trace.Evictor=2
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index 13f49990880..7d0d96c7f37 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -71,7 +71,7 @@ PhoneBookServer::run(int argc, char* argv[])
     Freeze::EvictorPtr evictor = Freeze::createEvictor(adapter, _envName, "contacts", 0, indices);
     adapter->addServantLocator(evictor, "contact");
 
-    Ice::Int evictorSize = properties->getPropertyAsInt("PhoneBook.EvictorSize");
+    Ice::Int evictorSize = properties->getPropertyAsInt("EvictorSize");
     if(evictorSize > 0)
     {
         evictor->setSize(evictorSize);
diff --git a/cpp/demo/Freeze/phonebook/config.server b/cpp/demo/Freeze/phonebook/config.server
index 3edf516c354..55bd3f015ce 100644
--- a/cpp/demo/Freeze/phonebook/config.server
+++ b/cpp/demo/Freeze/phonebook/config.server
@@ -4,7 +4,7 @@ Freeze.Evictor.db.contacts.SavePeriod=10000
 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1
 
 PhoneBook.Endpoints=default -p 10000
-PhoneBook.EvictorSize=3
+EvictorSize=3
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index a68bed47b99..93b058046d3 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -62,7 +62,7 @@ CallbackClient::run(int argc, char* argv[])
     callbackOnInterrupt();
 
     CallbackSenderPrx twoway = CallbackSenderPrx::checkedCast(
-        communicator()->propertyToProxy("Callback.Client.CallbackServer")->
+        communicator()->propertyToProxy("Callback.CallbackServer")->
             ice_twoway()->ice_timeout(-1)->ice_secure(false));
     if(!twoway)
     {
diff --git a/cpp/demo/Ice/callback/config.client b/cpp/demo/Ice/callback/config.client
index a4b00fb2984..3376a17a47b 100644
--- a/cpp/demo/Ice/callback/config.client
+++ b/cpp/demo/Ice/callback/config.client
@@ -1,4 +1,4 @@
-Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+Callback.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
 Callback.Client.Endpoints=tcp:udp:ssl
 
 #
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index 30c6edc42f2..3317bc61265 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -38,7 +38,7 @@ NestedClient::run(int argc, char* argv[])
     //
     callbackOnInterrupt();
 
-    NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.Client.NestedServer"));
+    NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.NestedServer"));
     if(!nested)
     {
         cerr << appName() << ": invalid proxy" << endl;
diff --git a/cpp/demo/Ice/nested/config.client b/cpp/demo/Ice/nested/config.client
index a88b1564997..ce80eeeca56 100644
--- a/cpp/demo/Ice/nested/config.client
+++ b/cpp/demo/Ice/nested/config.client
@@ -1,4 +1,4 @@
-Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000
+Nested.NestedServer=nestedServer:default -p 10000 -t 10000
 Nested.Client.Endpoints=default -t 10000
 
 Ice.ThreadPool.Server.Size=5
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 6dd36c95cec..42039e5ab4c 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -764,7 +764,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
     if(unknownProps.size() != 0 && properties->getPropertyAsIntWithDefault("Ice.Warn.UnknownProperties", 1) > 0)
     {
         Warning out(_instance->initializationData().logger);
-        out << "Found unknown properties for object adapter '" << _name << "':";
+        out << "found unknown properties for object adapter '" << _name << "':";
         for(unsigned int i = 0; i < unknownProps.size(); ++i)
         {
             out << "\n    " << unknownProps[i];
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index 06094811a70..646d9bf0196 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -818,7 +818,7 @@ IceInternal::ReferenceFactory::checkForUnknownProperties(const string& prefix)
     if(unknownProps.size())
     {
         Warning out(_instance->initializationData().logger);
-        out << "Found unknown properties for proxy '" << prefix << "':";
+        out << "found unknown properties for proxy '" << prefix << "':";
         for(unsigned int i = 0; i < unknownProps.size(); ++i)
         {
             out << "\n    " << unknownProps[i];