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

8 files changed, 13 insertions, 13 deletions

diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox
index 07fb2e3cb6c..cd05e35ff37 100644
--- a/cpp/demo/IceStorm/clock/config.icebox
+++ b/cpp/demo/IceStorm/clock/config.icebox
@@ -1,7 +1,7 @@
 #
 # The IceBox server endpoint configuration
 #
-IceBox.ServiceManager.Endpoints=tcp -p 9998
+Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998
 
 #
 # The IceStorm service
diff --git a/cpp/demo/IceStorm/clock/config.service b/cpp/demo/IceStorm/clock/config.service
index 539369861b0..4f1edc9ad3f 100644
--- a/cpp/demo/IceStorm/clock/config.service
+++ b/cpp/demo/IceStorm/clock/config.service
@@ -7,7 +7,7 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 # This property defines the endpoints on which the IceStorm
 # TopicManager listens.
 #
-IceStorm.TopicManager.Endpoints=default -p 10000
+Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
 # The IceStorm service instance name.
@@ -20,7 +20,7 @@ IceStorm.InstanceName=DemoIceStorm
 # IceStorm instances this must run on a fixed port (or use
 # IceGrid).
 #
-IceStorm.Publish.Endpoints=default -p 10001
+Ice.OA.IceStorm.Publish.Endpoints=default -p 10001
 
 #
 # TopicManager Tracing
diff --git a/cpp/demo/IceStorm/clock/config.sub b/cpp/demo/IceStorm/clock/config.sub
index d383e34e641..cb6b50d94f0 100644
--- a/cpp/demo/IceStorm/clock/config.sub
+++ b/cpp/demo/IceStorm/clock/config.sub
@@ -2,7 +2,7 @@
 # This property is used to configure the endpoints of the clock
 # subscriber adapter.
 #
-Clock.Subscriber.Endpoints=tcp
+Ice.OA.Clock.Subscriber.Endpoints=tcp
 
 #
 # This property is used by the clients to connect to IceStorm.
diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox
index 07fb2e3cb6c..cd05e35ff37 100644
--- a/cpp/demo/IceStorm/counter/config.icebox
+++ b/cpp/demo/IceStorm/counter/config.icebox
@@ -1,7 +1,7 @@
 #
 # The IceBox server endpoint configuration
 #
-IceBox.ServiceManager.Endpoints=tcp -p 9998
+Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998
 
 #
 # The IceStorm service
diff --git a/cpp/demo/IceStorm/counter/config.server b/cpp/demo/IceStorm/counter/config.server
index be119f2b1da..f027f8534ad 100644
--- a/cpp/demo/IceStorm/counter/config.server
+++ b/cpp/demo/IceStorm/counter/config.server
@@ -1,7 +1,7 @@
 #
 # The endpoints for the counter object.
 #
-Counter.Endpoints=tcp -p 12000
+Ice.OA.Counter.Endpoints=tcp -p 12000
 
 #
 # This property is used by the counter server to connect with IceStorm.
diff --git a/cpp/demo/IceStorm/counter/config.service b/cpp/demo/IceStorm/counter/config.service
index f6deda26be5..15cd03ffd1f 100644
--- a/cpp/demo/IceStorm/counter/config.service
+++ b/cpp/demo/IceStorm/counter/config.service
@@ -7,7 +7,7 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000
 # This property defines the endpoints on which the IceStorm
 # TopicManager listens.
 #
-IceStorm.TopicManager.Endpoints=default -p 10000
+Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000
 
 #
 # The IceStorm service instance name.
@@ -18,7 +18,7 @@ IceStorm.InstanceName=DemoIceStorm
 # This property defines the endpoints on which the topic
 # publisher objects listen.
 #
-IceStorm.Publish.Endpoints=default
+Ice.OA.IceStorm.Publish.Endpoints=default
 
 #
 # TopicManager Tracing
diff --git a/cpp/demo/IceStorm/replicated/config.grid b/cpp/demo/IceStorm/replicated/config.grid
index 7cfe6ad3c2b..87fe8ba0988 100644
--- a/cpp/demo/IceStorm/replicated/config.grid
+++ b/cpp/demo/IceStorm/replicated/config.grid
@@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
 #
 # IceGrid registry configuration.
 #
-IceGrid.Registry.Client.Endpoints=default -p 12000
-IceGrid.Registry.Server.Endpoints=default
-IceGrid.Registry.Internal.Endpoints=default
+Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000
+Ice.OA.IceGrid.Registry.Server.Endpoints=default
+Ice.OA.IceGrid.Registry.Internal.Endpoints=default
 IceGrid.Registry.Data=db/registry
 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
 IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
@@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=localhost
-IceGrid.Node.Endpoints=default
+Ice.OA.IceGrid.Node.Endpoints=default
 IceGrid.Node.Data=db/node
 IceGrid.Node.CollocateRegistry=1
 #IceGrid.Node.Output=db
diff --git a/cpp/demo/IceStorm/replicated/config.sub b/cpp/demo/IceStorm/replicated/config.sub
index 681d31eaca5..64601d0cb6f 100644
--- a/cpp/demo/IceStorm/replicated/config.sub
+++ b/cpp/demo/IceStorm/replicated/config.sub
@@ -7,7 +7,7 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000
 # This property is used to configure the endpoints of the clock
 # subscriber adapter.
 #
-Clock.Subscriber.Endpoints=tcp
+Ice.OA.Clock.Subscriber.Endpoints=tcp
 
 #
 # Network Tracing