summaryrefslogtreecommitdiff
path: root/cs/demo
diff options
context:
space:
mode:
Diffstat (limited to 'cs/demo')
-rw-r--r--cs/demo/Glacier2/callback/config.client4
-rw-r--r--cs/demo/Glacier2/callback/config.glacier24
-rw-r--r--cs/demo/Glacier2/callback/config.server2
-rw-r--r--cs/demo/Glacier2/callback/config.sessionserver2
-rw-r--r--cs/demo/Ice/async/config.server2
-rwxr-xr-xcs/demo/Ice/bidir/config.server2
-rw-r--r--cs/demo/Ice/callback/config.client2
-rw-r--r--cs/demo/Ice/callback/config.server2
-rw-r--r--cs/demo/Ice/hello/config.server2
-rw-r--r--cs/demo/Ice/invoke/config.server2
-rw-r--r--cs/demo/Ice/latency/config.server2
-rw-r--r--cs/demo/Ice/nested/config.client2
-rw-r--r--cs/demo/Ice/nested/config.server2
-rwxr-xr-xcs/demo/Ice/session/config.server2
-rw-r--r--cs/demo/Ice/throughput/config.server2
-rw-r--r--cs/demo/Ice/value/config.server2
-rw-r--r--cs/demo/IceBox/hello/config.icebox4
-rw-r--r--cs/demo/IceGrid/allocate/config.grid8
-rw-r--r--cs/demo/IceGrid/sessionActivation/config.grid8
-rw-r--r--cs/demo/IceGrid/simple/config.grid8
-rw-r--r--cs/demo/IceStorm/clock/config.icebox2
-rw-r--r--cs/demo/IceStorm/clock/config.service4
-rw-r--r--cs/demo/IceStorm/clock/config.sub2
23 files changed, 36 insertions, 36 deletions
diff --git a/cs/demo/Glacier2/callback/config.client b/cs/demo/Glacier2/callback/config.client
index 3a5f413680b..4bb252f4066 100644
--- a/cs/demo/Glacier2/callback/config.client
+++ b/cs/demo/Glacier2/callback/config.client
@@ -15,14 +15,14 @@ Ice.Default.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h
# match the value of Glacier2.Client.Endpoints.
# (The SSL endpoint is ignored with .NET 1.1.)
#
-Callback.Client.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1: ssl -p 10005 -h 127.0.0.1
+Ice.OA.Callback.Client.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1: ssl -p 10005 -h 127.0.0.1
#
# We don't need any endpoints for the client if we use a
# router. Incoming requests are received through connections
# established from the client to the router.
#
-Callback.Client.Endpoints=
+Ice.OA.Callback.Client.Endpoints=
#
# This must match the value of Callback.Server.Endpoints in
diff --git a/cs/demo/Glacier2/callback/config.glacier2 b/cs/demo/Glacier2/callback/config.glacier2
index 1d3527e8445..0971540187f 100644
--- a/cs/demo/Glacier2/callback/config.glacier2
+++ b/cs/demo/Glacier2/callback/config.glacier2
@@ -15,7 +15,7 @@ Ice.ThreadPerConnection.StackSize=262144
# The client-visible endpoint of Glacier2. This should be an endpoint
# visible from the public Internet, and it should be secure.
#
-Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1
+Ice.OA.Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1
#
# The server-visible endpoint of Glacier2. This endpoint is only
@@ -24,7 +24,7 @@ Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1
# on the loopback, so that the server is not directly accessible from
# the Internet.
#
-Glacier2.Server.Endpoints=tcp -h 127.0.0.1
+Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1
#
# The configures the session manager. If no external session manager
diff --git a/cs/demo/Glacier2/callback/config.server b/cs/demo/Glacier2/callback/config.server
index 78e95043136..033b969d997 100644
--- a/cs/demo/Glacier2/callback/config.server
+++ b/cs/demo/Glacier2/callback/config.server
@@ -4,7 +4,7 @@
# loopback, so that the server is not directly accessible from the
# Internet.
#
-Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000
#
# Warn about connection exceptions
diff --git a/cs/demo/Glacier2/callback/config.sessionserver b/cs/demo/Glacier2/callback/config.sessionserver
index d5329e88926..8bfd51c9b3f 100644
--- a/cs/demo/Glacier2/callback/config.sessionserver
+++ b/cs/demo/Glacier2/callback/config.sessionserver
@@ -4,7 +4,7 @@
# loopback, so that the session server is not directly accessible from
# the Internet.
#
-SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001
+Ice.OA.SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001
#
# Warn about connection exceptions
diff --git a/cs/demo/Ice/async/config.server b/cs/demo/Ice/async/config.server
index fd72066f5a5..c7d7b368b1b 100644
--- a/cs/demo/Ice/async/config.server
+++ b/cs/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/cs/demo/Ice/bidir/config.server b/cs/demo/Ice/bidir/config.server
index 95b5cc10bb9..f71ed60c03c 100755
--- a/cs/demo/Ice/bidir/config.server
+++ b/cs/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/cs/demo/Ice/callback/config.client b/cs/demo/Ice/callback/config.client
index 40f54c6a767..936c2b0ffd3 100644
--- a/cs/demo/Ice/callback/config.client
+++ b/cs/demo/Ice/callback/config.client
@@ -4,7 +4,7 @@
# (The ssl endpoints are ignored with .NET 1.1.)
#
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/cs/demo/Ice/callback/config.server b/cs/demo/Ice/callback/config.server
index 3987f9ac249..58ba6cb10fc 100644
--- a/cs/demo/Ice/callback/config.server
+++ b/cs/demo/Ice/callback/config.server
@@ -2,7 +2,7 @@
# The server listens at the following endpoints. (The SSL
# endpoint is ignored with .NET 1.1.)
#
-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/cs/demo/Ice/hello/config.server b/cs/demo/Ice/hello/config.server
index 9662f9db910..4bf1d1b584d 100644
--- a/cs/demo/Ice/hello/config.server
+++ b/cs/demo/Ice/hello/config.server
@@ -3,7 +3,7 @@
# "Hello". The following line sets the endpoints for this
# adapter. (The SSL endpoint is ignored with .NET 1.1.)
#
-Hello.Endpoints=tcp -p 10000:udp -c -p 10000:ssl -p 10001
+Ice.OA.Hello.Endpoints=tcp -p 10000:udp -c -p 10000:ssl -p 10001
#
# Warn about connection exceptions.
diff --git a/cs/demo/Ice/invoke/config.server b/cs/demo/Ice/invoke/config.server
index 693d0c89d21..a44665f4cad 100644
--- a/cs/demo/Ice/invoke/config.server
+++ b/cs/demo/Ice/invoke/config.server
@@ -3,7 +3,7 @@
# "helloadapater". The following line sets the endpoints for this
# adapter
#
-Printer.Endpoints=tcp -p 10000:udp -p 10000
+Ice.OA.Printer.Endpoints=tcp -p 10000:udp -p 10000
#
# Warn about connection exceptions
diff --git a/cs/demo/Ice/latency/config.server b/cs/demo/Ice/latency/config.server
index 6d82f1a7f2e..33cbd33492e 100644
--- a/cs/demo/Ice/latency/config.server
+++ b/cs/demo/Ice/latency/config.server
@@ -1 +1 @@
-Latency.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1
diff --git a/cs/demo/Ice/nested/config.client b/cs/demo/Ice/nested/config.client
index a895324d0b5..cc7b8c0a0fb 100644
--- a/cs/demo/Ice/nested/config.client
+++ b/cs/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/cs/demo/Ice/nested/config.server b/cs/demo/Ice/nested/config.server
index e0073284155..87c9057ed0d 100644
--- a/cs/demo/Ice/nested/config.server
+++ b/cs/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/cs/demo/Ice/session/config.server b/cs/demo/Ice/session/config.server
index 8aa8dfac36f..2731a988e56 100755
--- a/cs/demo/Ice/session/config.server
+++ b/cs/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/cs/demo/Ice/throughput/config.server b/cs/demo/Ice/throughput/config.server
index dec5cfe8eb9..70da150f767 100644
--- a/cs/demo/Ice/throughput/config.server
+++ b/cs/demo/Ice/throughput/config.server
@@ -1 +1 @@
-Throughput.Endpoints=default -p 10000 -h 127.0.0.1
+Ice.OA.Throughput.Endpoints=default -p 10000 -h 127.0.0.1
diff --git a/cs/demo/Ice/value/config.server b/cs/demo/Ice/value/config.server
index 8f2cf355ffc..52e81b9e331 100644
--- a/cs/demo/Ice/value/config.server
+++ b/cs/demo/Ice/value/config.server
@@ -1 +1 @@
-Value.Endpoints=default -p 10000
+Ice.OA.Value.Endpoints=default -p 10000
diff --git a/cs/demo/IceBox/hello/config.icebox b/cs/demo/IceBox/hello/config.icebox
index 2fb767f56fb..484c25d8947 100644
--- a/cs/demo/IceBox/hello/config.icebox
+++ b/cs/demo/IceBox/hello/config.icebox
@@ -4,7 +4,7 @@ IceBox.InstanceName=DemoIceBox
# The IceBox server endpoint configuration. (The SSL
# endpoint is ignored with .NET 1.1.)
#
-IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999
+Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999
#
# The hello service
@@ -16,7 +16,7 @@ IceBox.Service.Hello=helloservice.dll:HelloServiceI
# the service. The following line sets the endpoints for this
# adapter. (The SSL endpoint is ignored with .NET 1.1.)
#
-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/cs/demo/IceGrid/allocate/config.grid b/cs/demo/IceGrid/allocate/config.grid
index 3ca2082ddfb..1da5a23446c 100644
--- a/cs/demo/IceGrid/allocate/config.grid
+++ b/cs/demo/IceGrid/allocate/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/cs/demo/IceGrid/sessionActivation/config.grid b/cs/demo/IceGrid/sessionActivation/config.grid
index 3ca2082ddfb..1da5a23446c 100644
--- a/cs/demo/IceGrid/sessionActivation/config.grid
+++ b/cs/demo/IceGrid/sessionActivation/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/cs/demo/IceGrid/simple/config.grid b/cs/demo/IceGrid/simple/config.grid
index 3ca2082ddfb..1da5a23446c 100644
--- a/cs/demo/IceGrid/simple/config.grid
+++ b/cs/demo/IceGrid/simple/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/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox
index 07fb2e3cb6c..cd05e35ff37 100644
--- a/cs/demo/IceStorm/clock/config.icebox
+++ b/cs/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/cs/demo/IceStorm/clock/config.service b/cs/demo/IceStorm/clock/config.service
index 539369861b0..4f1edc9ad3f 100644
--- a/cs/demo/IceStorm/clock/config.service
+++ b/cs/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/cs/demo/IceStorm/clock/config.sub b/cs/demo/IceStorm/clock/config.sub
index d383e34e641..cb6b50d94f0 100644
--- a/cs/demo/IceStorm/clock/config.sub
+++ b/cs/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.