Object adapter properties now prefixed by "Ice.OA."

14 files changed, 14 insertions, 14 deletions

diff --git a/cpp/demo/Ice/MFC/server/config b/cpp/demo/Ice/MFC/server/config
index db8ff60a07f..d8cd4497f42 100644
--- a/cpp/demo/Ice/MFC/server/config
+++ b/cpp/demo/Ice/MFC/server/config
@@ -3,7 +3,7 @@
 # "Hello". The following line sets the endpoints for this
 # adapter.
 #
-Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/async/config.server b/cpp/demo/Ice/async/config.server
index fd72066f5a5..c7d7b368b1b 100644
--- a/cpp/demo/Ice/async/config.server
+++ b/cpp/demo/Ice/async/config.server
@@ -3,7 +3,7 @@
 # "Queue". The following line sets the endpoints for this
 # adapter.
 #
-Queue.Endpoints=tcp -p 10000
+Ice.OA.Queue.Endpoints=tcp -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/bidir/config.server b/cpp/demo/Ice/bidir/config.server
index ef2745b172b..f1409ce60a8 100644
--- a/cpp/demo/Ice/bidir/config.server
+++ b/cpp/demo/Ice/bidir/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/callback/config.client b/cpp/demo/Ice/callback/config.client
index a4b00fb2984..95caf8d3eae 100644
--- a/cpp/demo/Ice/callback/config.client
+++ b/cpp/demo/Ice/callback/config.client
@@ -1,5 +1,5 @@
 Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
-Callback.Client.Endpoints=tcp:udp:ssl
+Ice.OA.Callback.Client.Endpoints=tcp:udp:ssl
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/callback/config.server b/cpp/demo/Ice/callback/config.server
index deaef3f87de..795a07e8f27 100644
--- a/cpp/demo/Ice/callback/config.server
+++ b/cpp/demo/Ice/callback/config.server
@@ -1,4 +1,4 @@
-Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/converter/config.server b/cpp/demo/Ice/converter/config.server
index d8d8d5800af..66f7d41e76b 100644
--- a/cpp/demo/Ice/converter/config.server
+++ b/cpp/demo/Ice/converter/config.server
@@ -3,7 +3,7 @@
 # "Echo". The following line sets the endpoints for this
 # adapter.
 #
-Echo.Endpoints=tcp -p 10000
+Ice.OA.Echo.Endpoints=tcp -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/hello/config.server b/cpp/demo/Ice/hello/config.server
index bb2040f2cdc..aeff24452ac 100644
--- a/cpp/demo/Ice/hello/config.server
+++ b/cpp/demo/Ice/hello/config.server
@@ -3,7 +3,7 @@
 # "Hello". The following line sets the endpoints for this
 # adapter.
 #
-Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/invoke/config.server b/cpp/demo/Ice/invoke/config.server
index 49e49e0ccd9..09fd8616e19 100644
--- a/cpp/demo/Ice/invoke/config.server
+++ b/cpp/demo/Ice/invoke/config.server
@@ -1 +1 @@
-Printer.Endpoints=tcp -p 10000
+Ice.OA.Printer.Endpoints=tcp -p 10000
diff --git a/cpp/demo/Ice/latency/config.server b/cpp/demo/Ice/latency/config.server
index 7df795b4165..66310cc399c 100644
--- a/cpp/demo/Ice/latency/config.server
+++ b/cpp/demo/Ice/latency/config.server
@@ -1,4 +1,4 @@
-Latency.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1
 
 #
 # SSL Configuration
diff --git a/cpp/demo/Ice/nested/config.client b/cpp/demo/Ice/nested/config.client
index a88b1564997..d9034373aab 100644
--- a/cpp/demo/Ice/nested/config.client
+++ b/cpp/demo/Ice/nested/config.client
@@ -1,5 +1,5 @@
 Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000
-Nested.Client.Endpoints=default -t 10000
+Ice.OA.Nested.Client.Endpoints=default -t 10000
 
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
diff --git a/cpp/demo/Ice/nested/config.server b/cpp/demo/Ice/nested/config.server
index d694e9de848..897e00f9832 100644
--- a/cpp/demo/Ice/nested/config.server
+++ b/cpp/demo/Ice/nested/config.server
@@ -1,4 +1,4 @@
-Nested.Server.Endpoints=default -p 10000 -t 10000
+Ice.OA.Nested.Server.Endpoints=default -p 10000 -t 10000
 
 Ice.ThreadPool.Server.Size=5
 Ice.ThreadPool.Server.SizeWarn=5
diff --git a/cpp/demo/Ice/session/config.server b/cpp/demo/Ice/session/config.server
index 8aa8dfac36f..2731a988e56 100644
--- a/cpp/demo/Ice/session/config.server
+++ b/cpp/demo/Ice/session/config.server
@@ -3,7 +3,7 @@
 # "SessionFactory". The following line sets the endpoints for this
 # adapter.
 #
-SessionFactory.Endpoints=default -p 10000
+Ice.OA.SessionFactory.Endpoints=default -p 10000
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/Ice/throughput/config.server b/cpp/demo/Ice/throughput/config.server
index 9a13a908f00..2323af329a9 100644
--- a/cpp/demo/Ice/throughput/config.server
+++ b/cpp/demo/Ice/throughput/config.server
@@ -1,4 +1,4 @@
-Throughput.Endpoints=default -p 10000
+Ice.OA.Throughput.Endpoints=default -p 10000
 
 #
 # SSL Configuration
diff --git a/cpp/demo/Ice/value/config.server b/cpp/demo/Ice/value/config.server
index 8189baed470..175aeea84cc 100644
--- a/cpp/demo/Ice/value/config.server
+++ b/cpp/demo/Ice/value/config.server
@@ -1,4 +1,4 @@
 #
 # The server's adapter endpoint.
 #
-Value.Endpoints=tcp -p 10000
+Ice.OA.Value.Endpoints=tcp -p 10000