diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
| commit | d07fdae285690f699a70f97f36232e516dcad2bc (patch) | |
| tree | c239def689c5e6cc53ac76dbe3e60ec11c306964 /cpp/demo | |
| parent | Fixed tryLock() comment (diff) | |
| download | ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.bz2 ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.xz ice-d07fdae285690f699a70f97f36232e516dcad2bc.zip | |
Object adapter properties now prefixed by "Ice.OA."
Diffstat (limited to 'cpp/demo')
43 files changed, 68 insertions, 68 deletions
diff --git a/cpp/demo/Database/Oracle/occi/config.server b/cpp/demo/Database/Oracle/occi/config.server index 0b627b50ba0..811786ca555 100644 --- a/cpp/demo/Database/Oracle/occi/config.server +++ b/cpp/demo/Database/Oracle/occi/config.server @@ -1,4 +1,4 @@ -HR.Endpoints=tcp -p 10000 +Ice.OA.HR.Endpoints=tcp -p 10000 Ice.ThreadPool.Server.Size=5 diff --git a/cpp/demo/Database/Oracle/proc/config.server b/cpp/demo/Database/Oracle/proc/config.server index 735c720adc8..a7ec7e19f06 100644 --- a/cpp/demo/Database/Oracle/proc/config.server +++ b/cpp/demo/Database/Oracle/proc/config.server @@ -1,4 +1,4 @@ -HR.Endpoints=tcp -p 10000 +Ice.OA.HR.Endpoints=tcp -p 10000 Ice.ThreadPool.Server.Size=5 diff --git a/cpp/demo/Freeze/library/config.collocated b/cpp/demo/Freeze/library/config.collocated index ddcc878f677..aeae5134b38 100644 --- a/cpp/demo/Freeze/library/config.collocated +++ b/cpp/demo/Freeze/library/config.collocated @@ -1,5 +1,5 @@ +Ice.OA.Library.Endpoints=default -p 10000 Library.Proxy=library:default -p 10000 -Library.Endpoints=default -p 10000 Library.EvictorSize=3 Freeze.Trace.Map=1 diff --git a/cpp/demo/Freeze/library/config.server b/cpp/demo/Freeze/library/config.server index 2a0e997bbf6..ec6edf4a0e0 100644 --- a/cpp/demo/Freeze/library/config.server +++ b/cpp/demo/Freeze/library/config.server @@ -1,4 +1,4 @@ -Library.Endpoints=default -p 10000 +Ice.OA.Library.Endpoints=default -p 10000 Library.EvictorSize=3 Freeze.Trace.Map=1 diff --git a/cpp/demo/Freeze/phonebook/config.collocated b/cpp/demo/Freeze/phonebook/config.collocated index 4ccb82637d2..bd1e093dffc 100644 --- a/cpp/demo/Freeze/phonebook/config.collocated +++ b/cpp/demo/Freeze/phonebook/config.collocated @@ -3,8 +3,8 @@ Freeze.Trace.DbEnv=2 Freeze.Evictor.db.contacts.SavePeriod=10000 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1 +Ice.OA.PhoneBook.Endpoints=default -p 10000 PhoneBook.Proxy=phonebook:default -p 10000 -PhoneBook.Endpoints=default -p 10000 PhoneBook.EvictorSize=3 # diff --git a/cpp/demo/Freeze/phonebook/config.server b/cpp/demo/Freeze/phonebook/config.server index 3edf516c354..4a324b8b9d4 100644 --- a/cpp/demo/Freeze/phonebook/config.server +++ b/cpp/demo/Freeze/phonebook/config.server @@ -3,7 +3,7 @@ Freeze.Trace.DbEnv=2 Freeze.Evictor.db.contacts.SavePeriod=10000 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1 -PhoneBook.Endpoints=default -p 10000 +Ice.OA.PhoneBook.Endpoints=default -p 10000 PhoneBook.EvictorSize=3 # diff --git a/cpp/demo/Glacier2/callback/config.client b/cpp/demo/Glacier2/callback/config.client index b5b1b6d19a0..80783ab4894 100644 --- a/cpp/demo/Glacier2/callback/config.client +++ b/cpp/demo/Glacier2/callback/config.client @@ -9,14 +9,14 @@ Ice.Default.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 # object adapter named Callback.Client. This router proxy must # match the value of Glacier2.Client.Endpoints. # -Callback.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 +Ice.OA.Callback.Client.Router=DemoGlacier2/router: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/cpp/demo/Glacier2/callback/config.glacier2 b/cpp/demo/Glacier2/callback/config.glacier2 index cde23b9a94e..f4e6b214d14 100644 --- a/cpp/demo/Glacier2/callback/config.glacier2 +++ b/cpp/demo/Glacier2/callback/config.glacier2 @@ -18,7 +18,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=ssl -p 10005 -h 127.0.0.1 +Ice.OA.Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1 # # The server-visible endpoint of Glacier2. This endpoint is only @@ -27,7 +27,7 @@ Glacier2.Client.Endpoints=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/cpp/demo/Glacier2/callback/config.server b/cpp/demo/Glacier2/callback/config.server index f79e0e891f7..5dafe9342dd 100644 --- a/cpp/demo/Glacier2/callback/config.server +++ b/cpp/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/cpp/demo/Glacier2/callback/config.sessionserver b/cpp/demo/Glacier2/callback/config.sessionserver index d5329e88926..8bfd51c9b3f 100644 --- a/cpp/demo/Glacier2/callback/config.sessionserver +++ b/cpp/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/cpp/demo/Glacier2/chat/config.client b/cpp/demo/Glacier2/chat/config.client index 4edc4c3c42b..b5c3978cbcf 100644 --- a/cpp/demo/Glacier2/chat/config.client +++ b/cpp/demo/Glacier2/chat/config.client @@ -9,14 +9,14 @@ Ice.Default.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 # object adapter named Chat.Client. This router proxy must # match the value of Glacier2.Client.Endpoints. # -Chat.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 +Ice.OA.Chat.Client.Router=DemoGlacier2/router: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. # -Chat.Client.Endpoints= +Ice.OA.Chat.Client.Endpoints= # # No active connection management is permitted with Glacier2. diff --git a/cpp/demo/Glacier2/chat/config.glacier2 b/cpp/demo/Glacier2/chat/config.glacier2 index a29d4a25a0e..d35d2a53ff2 100644 --- a/cpp/demo/Glacier2/chat/config.glacier2 +++ b/cpp/demo/Glacier2/chat/config.glacier2 @@ -4,7 +4,7 @@ Glacier2.InstanceName=DemoGlacier2 # The client-visible endpoint of Glacier2. This should be an endpoint # visible from the public Internet, and it should be secure. # -Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1 +Ice.OA.Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1 # # The server-visible endpoint of Glacier2. This endpoint is only @@ -13,7 +13,7 @@ Glacier2.Client.Endpoints=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 proxy of the session manager. diff --git a/cpp/demo/Glacier2/chat/config.server b/cpp/demo/Glacier2/chat/config.server index b77909532ea..21e486c5ffa 100644 --- a/cpp/demo/Glacier2/chat/config.server +++ b/cpp/demo/Glacier2/chat/config.server @@ -4,7 +4,7 @@ # loopback, so that the session server is not directly accessible from # the Internet. # -ChatServer.Endpoints=tcp -h 127.0.0.1 -p 10001 +Ice.OA.ChatServer.Endpoints=tcp -h 127.0.0.1 -p 10001 # # Warn about connection exceptions 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 diff --git a/cpp/demo/IceBox/hello/config.icebox b/cpp/demo/IceBox/hello/config.icebox index 61f5a70ff37..25f380fd8a1 100644 --- a/cpp/demo/IceBox/hello/config.icebox +++ b/cpp/demo/IceBox/hello/config.icebox @@ -3,7 +3,7 @@ IceBox.InstanceName=DemoIceBox # # The IceBox server endpoint configuration # -IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 +Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 # # The hello service @@ -15,7 +15,7 @@ IceBox.Service.Hello=HelloService:create # of the service. 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/IceGrid/allocate/config.grid b/cpp/demo/IceGrid/allocate/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cpp/demo/IceGrid/allocate/config.grid +++ b/cpp/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/cpp/demo/IceGrid/sessionActivation/config.grid b/cpp/demo/IceGrid/sessionActivation/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cpp/demo/IceGrid/sessionActivation/config.grid +++ b/cpp/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/cpp/demo/IceGrid/simple/config.grid b/cpp/demo/IceGrid/simple/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cpp/demo/IceGrid/simple/config.grid +++ b/cpp/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/cpp/demo/IceGrid/simple/config.master b/cpp/demo/IceGrid/simple/config.master index 78ffd3edaa1..a92de3fe6de 100644 --- a/cpp/demo/IceGrid/simple/config.master +++ b/cpp/demo/IceGrid/simple/config.master @@ -2,9 +2,9 @@ IceGrid.InstanceName=DemoIceGrid Ice.ProgramName=Master -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 diff --git a/cpp/demo/IceGrid/simple/config.node1 b/cpp/demo/IceGrid/simple/config.node1 index 0a02f1f13ed..bfb2d204877 100644 --- a/cpp/demo/IceGrid/simple/config.node1 +++ b/cpp/demo/IceGrid/simple/config.node1 @@ -3,7 +3,7 @@ Ice.ProgramName=Node1 Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000:default -p 12001:default -p 12002 IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node1 #IceGrid.Node.Output=db #IceGrid.Node.RedirectErrToOut=1 diff --git a/cpp/demo/IceGrid/simple/config.replica1 b/cpp/demo/IceGrid/simple/config.replica1 index a7acf3e3357..273b0b40087 100644 --- a/cpp/demo/IceGrid/simple/config.replica1 +++ b/cpp/demo/IceGrid/simple/config.replica1 @@ -5,9 +5,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000:default -p 12002 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12001 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12001 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/replica1 IceGrid.Registry.ReplicaName=Replica1 diff --git a/cpp/demo/IceGrid/simple/config.replica2 b/cpp/demo/IceGrid/simple/config.replica2 index afbfaa4f4eb..89ab9c247f4 100644 --- a/cpp/demo/IceGrid/simple/config.replica2 +++ b/cpp/demo/IceGrid/simple/config.replica2 @@ -5,9 +5,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000:default -p 12001 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12002 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12002 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/replica2 IceGrid.Registry.ReplicaName=Replica2 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 |