diff options
Diffstat (limited to 'java/demo')
28 files changed, 41 insertions, 41 deletions
diff --git a/java/demo/Freeze/library/config.collocated b/java/demo/Freeze/library/config.collocated index ddcc878f677..3d0c4326d7f 100644 --- a/java/demo/Freeze/library/config.collocated +++ b/java/demo/Freeze/library/config.collocated @@ -1,5 +1,5 @@ Library.Proxy=library:default -p 10000 -Library.Endpoints=default -p 10000 +Ice.OA.Library.Endpoints=default -p 10000 Library.EvictorSize=3 Freeze.Trace.Map=1 diff --git a/java/demo/Freeze/library/config.server b/java/demo/Freeze/library/config.server index 2a0e997bbf6..ec6edf4a0e0 100644 --- a/java/demo/Freeze/library/config.server +++ b/java/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/java/demo/Freeze/phonebook/config.collocated b/java/demo/Freeze/phonebook/config.collocated index 311adc0d6dd..31ceed6c126 100644 --- a/java/demo/Freeze/phonebook/config.collocated +++ b/java/demo/Freeze/phonebook/config.collocated @@ -3,7 +3,7 @@ Freeze.Trace.DbEnv=1 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.Proxy=phonebook:default -p 10000 PhoneBook.EvictorSize=3 diff --git a/java/demo/Freeze/phonebook/config.server b/java/demo/Freeze/phonebook/config.server index 861014c3a8b..db1c084ad28 100644 --- a/java/demo/Freeze/phonebook/config.server +++ b/java/demo/Freeze/phonebook/config.server @@ -3,7 +3,7 @@ Freeze.Trace.DbEnv=1 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/java/demo/Glacier2/callback/config.client b/java/demo/Glacier2/callback/config.client index 0e261c0c2db..55a3e950354 100644 --- a/java/demo/Glacier2/callback/config.client +++ b/java/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/java/demo/Glacier2/callback/config.glacier2 b/java/demo/Glacier2/callback/config.glacier2 index be7d46ea2d4..64060c57b05 100644 --- a/java/demo/Glacier2/callback/config.glacier2 +++ b/java/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=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 @@ -24,7 +24,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/java/demo/Glacier2/callback/config.server b/java/demo/Glacier2/callback/config.server index 78e95043136..033b969d997 100644 --- a/java/demo/Glacier2/callback/config.server +++ b/java/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/java/demo/Glacier2/callback/config.sessionserver b/java/demo/Glacier2/callback/config.sessionserver index 864d6bd5720..3662d7fcea7 100644 --- a/java/demo/Glacier2/callback/config.sessionserver +++ b/java/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/java/demo/Ice/async/config.server b/java/demo/Ice/async/config.server index fd72066f5a5..c7d7b368b1b 100644 --- a/java/demo/Ice/async/config.server +++ b/java/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/java/demo/Ice/bidir/config.server b/java/demo/Ice/bidir/config.server index 1e6ffd5e484..fa3219299a2 100755 --- a/java/demo/Ice/bidir/config.server +++ b/java/demo/Ice/bidir/config.server @@ -1,4 +1,4 @@ -Callback.Server.Endpoints=tcp -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000
# Active connection management must be disabled when using
# bidirectional connections.
diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client index 289b0bc9e6f..a3289d5e0b7 100644 --- a/java/demo/Ice/callback/config.client +++ b/java/demo/Ice/callback/config.client @@ -1,5 +1,5 @@ Callback.Client.CallbackServer=callback:tcp -p 12000: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/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server index 10d65a443ba..cf17b1509c2 100644 --- a/java/demo/Ice/callback/config.server +++ b/java/demo/Ice/callback/config.server @@ -1,4 +1,4 @@ -Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001 +Ice.OA.Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions diff --git a/java/demo/Ice/hello/config.server b/java/demo/Ice/hello/config.server index 665fc131088..907e2a13a55 100644 --- a/java/demo/Ice/hello/config.server +++ b/java/demo/Ice/hello/config.server @@ -3,7 +3,7 @@ # "helloadapater". 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/java/demo/Ice/invoke/config.server b/java/demo/Ice/invoke/config.server index 0978234e8c4..e925636df8d 100644 --- a/java/demo/Ice/invoke/config.server +++ b/java/demo/Ice/invoke/config.server @@ -3,7 +3,7 @@ # "helloadapater". The following line sets the endpoints for this # adapter # -Printer.Endpoints=default -p 10000 +Ice.OA.Printer.Endpoints=default -p 10000 # # Warn about connection exceptions diff --git a/java/demo/Ice/latency/config.server b/java/demo/Ice/latency/config.server index 6d82f1a7f2e..33cbd33492e 100644 --- a/java/demo/Ice/latency/config.server +++ b/java/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/java/demo/Ice/nested/config.client b/java/demo/Ice/nested/config.client index a895324d0b5..cc7b8c0a0fb 100644 --- a/java/demo/Ice/nested/config.client +++ b/java/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/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server index e0073284155..87c9057ed0d 100644 --- a/java/demo/Ice/nested/config.server +++ b/java/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/java/demo/Ice/session/config.server b/java/demo/Ice/session/config.server index 8aa8dfac36f..2731a988e56 100644 --- a/java/demo/Ice/session/config.server +++ b/java/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/java/demo/Ice/throughput/config.client b/java/demo/Ice/throughput/config.client index 3391b2ff0bb..df84838f465 100644 --- a/java/demo/Ice/throughput/config.client +++ b/java/demo/Ice/throughput/config.client @@ -1,5 +1,5 @@ Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1 -Throughput.Endpoints=default -p 10000 +Ice.OA.Throughput.Endpoints=default -p 10000 Ice.ACM.Client=0 Ice.ACM.Server=0 diff --git a/java/demo/Ice/throughput/config.server b/java/demo/Ice/throughput/config.server index 3391b2ff0bb..df84838f465 100644 --- a/java/demo/Ice/throughput/config.server +++ b/java/demo/Ice/throughput/config.server @@ -1,5 +1,5 @@ Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1 -Throughput.Endpoints=default -p 10000 +Ice.OA.Throughput.Endpoints=default -p 10000 Ice.ACM.Client=0 Ice.ACM.Server=0 diff --git a/java/demo/Ice/value/config.server b/java/demo/Ice/value/config.server index 4d7f600e5d7..3c7afee33aa 100644 --- a/java/demo/Ice/value/config.server +++ b/java/demo/Ice/value/config.server @@ -1,4 +1,4 @@ -Value.Endpoints=default -p 10000 +Ice.OA.Value.Endpoints=default -p 10000 # # SSL Configuration diff --git a/java/demo/IceBox/hello/config.icebox b/java/demo/IceBox/hello/config.icebox index 07adfa38ce4..11f2b0741f7 100644 --- a/java/demo/IceBox/hello/config.icebox +++ b/java/demo/IceBox/hello/config.icebox @@ -3,7 +3,7 @@ IceBox.InstanceName=DemoIceBox # # The IceBox server endpoint configuration # -IceBox.ServiceManager.Endpoints=tcp -p 9998 +Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The hello service @@ -15,7 +15,7 @@ IceBox.Service.Hello=HelloServiceI # the service. The following line sets the endpoints for this # adapter. # -Hello.Endpoints=tcp -p 10000:udp -p 10000 +Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000 # # Warn about connection exceptions diff --git a/java/demo/IceGrid/allocate/config.grid b/java/demo/IceGrid/allocate/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/java/demo/IceGrid/allocate/config.grid +++ b/java/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/java/demo/IceGrid/sessionActivation/config.grid b/java/demo/IceGrid/sessionActivation/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/java/demo/IceGrid/sessionActivation/config.grid +++ b/java/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/java/demo/IceGrid/simple/config.grid b/java/demo/IceGrid/simple/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/java/demo/IceGrid/simple/config.grid +++ b/java/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/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox index 07fb2e3cb6c..cd05e35ff37 100644 --- a/java/demo/IceStorm/clock/config.icebox +++ b/java/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/java/demo/IceStorm/clock/config.service b/java/demo/IceStorm/clock/config.service index 539369861b0..4f1edc9ad3f 100644 --- a/java/demo/IceStorm/clock/config.service +++ b/java/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/java/demo/IceStorm/clock/config.sub b/java/demo/IceStorm/clock/config.sub index d383e34e641..cb6b50d94f0 100644 --- a/java/demo/IceStorm/clock/config.sub +++ b/java/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. |