From d07fdae285690f699a70f97f36232e516dcad2bc Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Mon, 18 Dec 2006 17:06:44 +0000 Subject: Object adapter properties now prefixed by "Ice.OA." --- cpp/CHANGES | 6 ++ cpp/config/IceGridAdmin.py | 12 +-- cpp/config/PropertyNames.def | 25 +++-- cpp/config/makeprops.py | 4 +- cpp/config/templates.xml | 12 +-- cpp/demo/Database/Oracle/occi/config.server | 2 +- cpp/demo/Database/Oracle/proc/config.server | 2 +- cpp/demo/Freeze/library/config.collocated | 2 +- cpp/demo/Freeze/library/config.server | 2 +- cpp/demo/Freeze/phonebook/config.collocated | 2 +- cpp/demo/Freeze/phonebook/config.server | 2 +- cpp/demo/Glacier2/callback/config.client | 4 +- cpp/demo/Glacier2/callback/config.glacier2 | 4 +- cpp/demo/Glacier2/callback/config.server | 2 +- cpp/demo/Glacier2/callback/config.sessionserver | 2 +- cpp/demo/Glacier2/chat/config.client | 4 +- cpp/demo/Glacier2/chat/config.glacier2 | 4 +- cpp/demo/Glacier2/chat/config.server | 2 +- cpp/demo/Ice/MFC/server/config | 2 +- cpp/demo/Ice/async/config.server | 2 +- cpp/demo/Ice/bidir/config.server | 2 +- cpp/demo/Ice/callback/config.client | 2 +- cpp/demo/Ice/callback/config.server | 2 +- cpp/demo/Ice/converter/config.server | 2 +- cpp/demo/Ice/hello/config.server | 2 +- cpp/demo/Ice/invoke/config.server | 2 +- cpp/demo/Ice/latency/config.server | 2 +- cpp/demo/Ice/nested/config.client | 2 +- cpp/demo/Ice/nested/config.server | 2 +- cpp/demo/Ice/session/config.server | 2 +- cpp/demo/Ice/throughput/config.server | 2 +- cpp/demo/Ice/value/config.server | 2 +- cpp/demo/IceBox/hello/config.icebox | 4 +- cpp/demo/IceGrid/allocate/config.grid | 8 +- cpp/demo/IceGrid/sessionActivation/config.grid | 8 +- cpp/demo/IceGrid/simple/config.grid | 8 +- cpp/demo/IceGrid/simple/config.master | 6 +- cpp/demo/IceGrid/simple/config.node1 | 2 +- cpp/demo/IceGrid/simple/config.replica1 | 6 +- cpp/demo/IceGrid/simple/config.replica2 | 6 +- cpp/demo/IceStorm/clock/config.icebox | 2 +- cpp/demo/IceStorm/clock/config.service | 4 +- cpp/demo/IceStorm/clock/config.sub | 2 +- cpp/demo/IceStorm/counter/config.icebox | 2 +- cpp/demo/IceStorm/counter/config.server | 2 +- cpp/demo/IceStorm/counter/config.service | 4 +- cpp/demo/IceStorm/replicated/config.grid | 8 +- cpp/demo/IceStorm/replicated/config.sub | 2 +- cpp/src/Glacier2/Glacier2Router.cpp | 23 +++-- cpp/src/Ice/CommunicatorI.cpp | 2 +- cpp/src/Ice/ObjectAdapterFactory.cpp | 2 +- cpp/src/Ice/ObjectAdapterI.cpp | 124 ++++++++++++++++++++---- cpp/src/Ice/ObjectAdapterI.h | 4 + cpp/src/Ice/PropertyNames.cpp | 27 ++++-- cpp/src/Ice/PropertyNames.h | 2 +- cpp/src/IceBox/Admin.cpp | 18 +++- cpp/src/IceGrid/DescriptorBuilder.cpp | 17 +++- cpp/src/IceGrid/DescriptorHelper.cpp | 25 ++++- cpp/src/IceGrid/IceGridNode.cpp | 39 ++++++-- cpp/src/IceGrid/PlatformInfo.cpp | 36 ++++++- cpp/src/IceGrid/RegistryI.cpp | 63 ++++++++---- cpp/src/IceGrid/ServerI.cpp | 6 ++ cpp/src/IcePatch2/ClientUtil.cpp | 7 +- cpp/src/IcePatch2/Server.cpp | 20 ++-- cpp/src/IceUtil/StringUtil.cpp | 67 +++++++------ cpp/test/Freeze/evictor/Server.cpp | 3 +- cpp/test/Freeze/oldevictor/Server.cpp | 3 +- cpp/test/Glacier2/addressFilter/Server.cpp | 4 +- cpp/test/Glacier2/addressFilter/run.py | 6 +- cpp/test/Glacier2/attack/Server.cpp | 2 +- cpp/test/Glacier2/attack/run.py | 4 +- cpp/test/Glacier2/filters/Server.cpp | 6 +- cpp/test/Glacier2/filters/run.py | 4 +- cpp/test/Glacier2/router/Server.cpp | 2 +- cpp/test/Glacier2/router/run.py | 6 +- cpp/test/Glacier2/sessionControl/Server.cpp | 2 +- cpp/test/Glacier2/sessionControl/run.py | 4 +- cpp/test/Glacier2/ssl/run.py | 6 +- cpp/test/Ice/adapterDeactivation/Collocated.cpp | 2 +- cpp/test/Ice/adapterDeactivation/Server.cpp | 2 +- cpp/test/Ice/binding/Server.cpp | 2 +- cpp/test/Ice/binding/TestI.cpp | 2 +- cpp/test/Ice/checksum/server/Server.cpp | 2 +- cpp/test/Ice/custom/Collocated.cpp | 2 +- cpp/test/Ice/custom/Server.cpp | 2 +- cpp/test/Ice/custom/ServerAMD.cpp | 2 +- cpp/test/Ice/exceptions/AllTests.cpp | 8 +- cpp/test/Ice/exceptions/Collocated.cpp | 2 +- cpp/test/Ice/exceptions/Server.cpp | 2 +- cpp/test/Ice/exceptions/ServerAMD.cpp | 2 +- cpp/test/Ice/facets/AllTests.cpp | 2 +- cpp/test/Ice/facets/Collocated.cpp | 2 +- cpp/test/Ice/facets/Server.cpp | 2 +- cpp/test/Ice/faultTolerance/Server.cpp | 2 +- cpp/test/Ice/hold/Server.cpp | 2 +- cpp/test/Ice/inheritance/Collocated.cpp | 2 +- cpp/test/Ice/inheritance/Server.cpp | 2 +- cpp/test/Ice/location/Server.cpp | 2 +- cpp/test/Ice/location/TestI.cpp | 10 +- cpp/test/Ice/objects/Collocated.cpp | 2 +- cpp/test/Ice/objects/Server.cpp | 2 +- cpp/test/Ice/operations/Collocated.cpp | 2 +- cpp/test/Ice/operations/Server.cpp | 2 +- cpp/test/Ice/operations/ServerAMD.cpp | 2 +- cpp/test/Ice/retry/Server.cpp | 2 +- cpp/test/Ice/slicing/exceptions/Server.cpp | 2 +- cpp/test/Ice/slicing/exceptions/ServerAMD.cpp | 2 +- cpp/test/Ice/slicing/objects/Server.cpp | 2 +- cpp/test/Ice/slicing/objects/ServerAMD.cpp | 2 +- cpp/test/Ice/timeout/Server.cpp | 2 +- cpp/test/IceGrid/allocation/application.xml | 8 +- cpp/test/IceGrid/distribution/application.xml | 4 +- cpp/test/IceGrid/replication/AllTests.cpp | 4 +- cpp/test/IceGrid/replication/application.xml | 8 +- cpp/test/IceGrid/session/AllTests.cpp | 6 +- cpp/test/IceGrid/session/application.xml | 8 +- cpp/test/IceGrid/simple/run.py | 3 +- cpp/test/IceGrid/update/AllTests.cpp | 10 +- cpp/test/IceSSL/configuration/Server.cpp | 2 +- cpp/test/IceStorm/federation/run.py | 6 +- cpp/test/IceStorm/federation2/run.py | 6 +- cpp/test/IceStorm/single/run.py | 6 +- 122 files changed, 566 insertions(+), 312 deletions(-) (limited to 'cpp') diff --git a/cpp/CHANGES b/cpp/CHANGES index f7345630180..679fdf50e39 100644 --- a/cpp/CHANGES +++ b/cpp/CHANGES @@ -1,6 +1,12 @@ Changes since version 3.1.1 --------------------------- +- Object adapter properties are now prefixed by "Ice.OA.". For example, + "Ice.OA..Endpoints" instead of ".Endpoints". + The new properties can be set from the command line. The old style + property names have been deprecated and support will be removed in a + future release. + - The communcator object adapter now throw an InitializationException if the adapter has no configuration. It is possible to explicitly create a adapter with no configuration, useful for use with diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py index e1933b29af1..cedcb429bf1 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -27,7 +27,7 @@ else: iceGridPort = 12010; nodeOptions = r' --Ice.Warn.Connections=0' + \ - r' --IceGrid.Node.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Node.Endpoints=default' + \ r' --IceGrid.Node.WaitTime=30' + \ r' --Ice.ProgramName=icegridnode' + \ r' --IceGrid.Node.Trace.Replica=0' + \ @@ -45,9 +45,9 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.AdminPermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ r' --IceGrid.Registry.SSLPermissionsVerifier=IceGrid/NullSSLPermissionsVerifier' + \ r' --IceGrid.Registry.AdminSSLPermissionsVerifier=IceGrid/NullSSLPermissionsVerifier' + \ - r' --IceGrid.Registry.Server.Endpoints=default' + \ - r' --IceGrid.Registry.Internal.Endpoints=default' + \ - r' --IceGrid.Registry.SessionManager.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.Server.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.Internal.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.SessionManager.Endpoints=default' + \ r' --IceGrid.Registry.Trace.Session=0' + \ r' --IceGrid.Registry.Trace.Application=0' + \ r' --IceGrid.Registry.Trace.Node=0' + \ @@ -58,7 +58,7 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.Trace.Locator=0' + \ r' --Ice.ThreadPool.Server.Size=0 ' + \ r' --Ice.ThreadPool.Client.SizeWarn=0' + \ - r' --IceGrid.Registry.Client.ThreadPool.SizeWarn=0' + \ + r' --Ice.OA.IceGrid.Registry.Client.ThreadPool.SizeWarn=0' + \ r' --Ice.ServerIdleTime=0' + \ r' --IceGrid.Registry.DefaultTemplates=' + os.path.join(toplevel, "config", "templates.xml") @@ -97,7 +97,7 @@ def startIceGridRegistry(testdir, dynamicRegistration = False): print "starting icegrid " + name + "...", cmd = command + \ r' --Ice.ProgramName=' + name + \ - r' --IceGrid.Registry.Client.Endpoints="default -p ' + str(iceGridPort + i) + ' -t 30000" ' + \ + r' --Ice.OA.IceGrid.Registry.Client.Endpoints="default -p ' + str(iceGridPort + i) + ' -t 30000" ' + \ r' --IceGrid.Registry.Data=' + dataDir if i > 0: diff --git a/cpp/config/PropertyNames.def b/cpp/config/PropertyNames.def index 96f9e4433e9..3429e8b5595 100644 --- a/cpp/config/PropertyNames.def +++ b/cpp/config/PropertyNames.def @@ -148,6 +148,17 @@ Ice: MonitorConnections Nohup NullHandleAbort + OA..AdapterId + OA..Endpoints + OA..Locator + OA..PublishedEndpoints + OA..RegisterProcess + OA..ReplicaGroupId + OA..Router + OA..ThreadPool.Size + OA..ThreadPool.SizeMax + OA..ThreadPool.SizeWarn + OA..ThreadPool.StackSize Override.Compress Override.ConnectTimeout Override.Timeout @@ -336,8 +347,8 @@ IceSSL: DefaultDir DH. EntropyDaemon - FindCert.. - ImportCert.. + FindCert. + ImportCert. KeyFile Keystore KeystorePassword @@ -470,11 +481,11 @@ Freeze: DbEnv..DbRecoverFatal DbEnv..OldLogsAutoDelete DbEnv..PeriodicCheckpointMinSize - Evictor...MaxTxSize - Evictor...SavePeriod - Evictor...SaveSizeTrigger - Evictor...StreamTimeout - Evictor...PopulateEmptyIndices + Evictor..MaxTxSize + Evictor..SavePeriod + Evictor..SaveSizeTrigger + Evictor..StreamTimeout + Evictor..PopulateEmptyIndices Evictor.UseNonmutating Trace.DbEnv Trace.Evictor diff --git a/cpp/config/makeprops.py b/cpp/config/makeprops.py index cbf1b89ecb1..518be25a330 100644 --- a/cpp/config/makeprops.py +++ b/cpp/config/makeprops.py @@ -221,11 +221,11 @@ def writeEntry(lang, label, entry): file.write(" \"" + label + '.' + string.replace(entry, "", "*") + "\",\n") elif lang == "java": pattern = string.replace(entry, ".", "\\\\.") - pattern = string.replace(pattern, "", "[^\\\\s.]+") + pattern = string.replace(pattern, "", "[^\\\\s]+") file.write(" " + "\"^" + label + "\\\\." + pattern + "$\",\n") elif lang == "cs": pattern = string.replace(entry, ".", "\\.") - pattern = string.replace(pattern, "", "[^\\s.]+") + pattern = string.replace(pattern, "", "[^\\s]+") file.write(" " + "@\"^" + label + "\\." + pattern + "$\",\n") def processFile(lang): diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index 784f4c00a10..ef3eb97f006 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -25,8 +25,8 @@ - - + + @@ -44,10 +44,10 @@ - - - - + + + + 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 diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index 2e52ea9a6e6..aeac0ac4d27 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -131,8 +131,11 @@ Glacier2::RouterService::start(int argc, char* argv[]) // // Initialize the client object adapter. // - const string clientEndpointsProperty = "Glacier2.Client.Endpoints"; - if(properties->getProperty(clientEndpointsProperty).empty()) + // DEPRECATED PROPERTY: Remove extra code in future release + // + const string clientEndpointsProperty = "Ice.OA.Glacier2.Client.Endpoints"; + if(properties->getProperty(clientEndpointsProperty).empty() && + properties->getProperty("Glacier2.Client.Endpoints").empty()) { error("property `" + clientEndpointsProperty + "' is not set"); return false; @@ -143,9 +146,12 @@ Glacier2::RouterService::start(int argc, char* argv[]) // Initialize the server object adapter only if server endpoints // are defined. // - const string serverEndpointsProperty = "Glacier2.Server.Endpoints"; + // DEPRECATED PROPERTY: Remove extra code in future release + // + const string serverEndpointsProperty = "Ice.OA.Glacier2.Server.Endpoints"; ObjectAdapterPtr serverAdapter; - if(!properties->getProperty(serverEndpointsProperty).empty()) + if(!properties->getProperty(serverEndpointsProperty).empty() || + !properties->getProperty("Glacier2.Server.Endpoints").empty()) { serverAdapter = communicator()->createObjectAdapter("Glacier2.Server"); } @@ -154,9 +160,12 @@ Glacier2::RouterService::start(int argc, char* argv[]) // Initialize the admin object adapter only if admin endpoints // are defined. // - const string adminEndpointsProperty = "Glacier2.Admin.Endpoints"; + // DEPRECATED PROPERTY: Remove extra code in future release + // + const string adminEndpointsProperty = "Ice.OA.Glacier2.Admin.Endpoints"; ObjectAdapterPtr adminAdapter; - if(!properties->getProperty(adminEndpointsProperty).empty()) + if(!properties->getProperty(adminEndpointsProperty).empty() || + !properties->getProperty("Glacier2.Admin.Endpoints").empty()) { adminAdapter = communicator()->createObjectAdapter("Glacier2.Admin"); } @@ -167,7 +176,7 @@ Glacier2::RouterService::start(int argc, char* argv[]) // We need a separate object adapter for any collocated // permissions verifiers. We can't use the client adapter. // - properties->setProperty("Glacier2Internal.Verifiers.AdapterId", IceUtil::generateUUID()); + properties->setProperty("Ice.OA.Glacier2Internal.Verifiers.AdapterId", IceUtil::generateUUID()); ObjectAdapterPtr verifierAdapter = communicator()->createObjectAdapter("Glacier2Internal.Verifiers"); // diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 913df832639..d56d618eaa8 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -152,7 +152,7 @@ Ice::CommunicatorI::identityToString(const Identity& ident) const ObjectAdapterPtr Ice::CommunicatorI::createObjectAdapter(const string& name) { - return createObjectAdapterWithEndpoints(name, getProperties()->getProperty(name + ".Endpoints")); + return _instance->objectAdapterFactory()->createObjectAdapter(name, "", 0); } ObjectAdapterPtr diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index 36b88ee695e..03ca3d518c5 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -117,7 +117,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name); } - if(name.empty() && (!name.empty() || router != 0)) + if(name.empty() && (!endpoints.empty() || router != 0)) { InitializationException ex(__FILE__, __LINE__); ex.reason = "Cannot configure endpoints or router with nameless object adapter"; diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index ac6d5262c2a..954e3976ad5 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -45,6 +45,8 @@ using namespace std; using namespace Ice; using namespace IceInternal; +string Ice::ObjectAdapterI::_propertyPrefix = "Ice.OA."; + string Ice::ObjectAdapterI::getName() const { @@ -99,10 +101,13 @@ Ice::ObjectAdapterI::activate() locatorInfo = _locatorInfo; if(!_noConfig) { - printAdapterReady = - _instance->initializationData().properties->getPropertyAsInt("Ice.PrintAdapterReady") > 0; - registerProcess = - _instance->initializationData().properties->getPropertyAsInt(_name + ".RegisterProcess") > 0; + PropertiesPtr properties = _instance->initializationData().properties; + printAdapterReady = properties->getPropertyAsInt("Ice.PrintAdapterReady") > 0; + // + // DEPREACTED PROPERTY: Remove extra code in future release + // + registerProcess = properties->getPropertyAsIntWithDefault(_propertyPrefix + _name + ".RegisterProcess", + properties->getPropertyAsInt(_name + ".RegisterProcess")) > 0; } } @@ -694,13 +699,19 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica return; } + // + // DEPRECATED PROPERTIES: Remove extra code in future release + // + // // Make sure named adapter has some configuration // + PropertiesPtr properties = instance->initializationData().properties; + StringSeq oldProps = filterProperties(_name + "."); if(endpointInfo.empty() && router == 0) { - PropertyDict oaProps = instance->initializationData().properties->getPropertiesForPrefix(_name + "."); - if(oaProps.size() == 0) + StringSeq props = filterProperties(_propertyPrefix + _name + "."); + if(oldProps.size() == 0 && props.size() == 0) { InitializationException ex(__FILE__, __LINE__); ex.reason = "Object adapter \"" + _name + "\" requires configuration."; @@ -708,17 +719,34 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica } } - const_cast(_id) = instance->initializationData().properties->getProperty(name + ".AdapterId"); - const_cast(_replicaGroupId) = - instance->initializationData().properties->getProperty(name + ".ReplicaGroupId"); + if(oldProps.size() != 0) + { + Warning out(_instance->initializationData().logger); + out << "The following properties have been deprecated, please prepend \"Ice.OA.\":"; + for(unsigned int i = 0; i < oldProps.size(); ++i) + { + out << "\n " << oldProps[i]; + } + } + + const_cast(_id) = properties->getPropertyWithDefault(_propertyPrefix + _name + ".AdapterId", + properties->getProperty(_name + ".AdapterId")); + const_cast(_replicaGroupId) = + properties->getPropertyWithDefault(_propertyPrefix + _name + ".ReplicaGroupId", + properties->getProperty(_name + ".ReplicaGroupId")); __setNoDelete(true); try { if(!router) { - const_cast(router) = - RouterPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Router")); + const_cast(router) = RouterPrx::uncheckedCast( + _instance->proxyFactory()->propertyToProxy(_propertyPrefix + _name + ".Router")); + if(!router) + { + const_cast(router) = RouterPrx::uncheckedCast( + _instance->proxyFactory()->propertyToProxy(_name + ".Router")); + } } if(router) { @@ -767,7 +795,16 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica // The connection factory might change it, for example, to // fill in the real port number. // - vector endpoints = parseEndpoints(endpointInfo); + vector endpoints; + if(endpointInfo.empty()) + { + endpoints = parseEndpoints(properties->getPropertyWithDefault(_propertyPrefix + _name + ".Endpoints", + properties->getProperty(_name + ".Endpoints"))); + } + else + { + endpoints = parseEndpoints(endpointInfo); + } for(vector::iterator p = endpoints.begin(); p != endpoints.end(); ++p) { _incomingConnectionFactories.push_back(new IncomingConnectionFactory(instance, *p, this, _name)); @@ -786,7 +823,8 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica // Parse published endpoints. If set, these are used in proxies // instead of the connection factory endpoints. // - string endpts = _instance->initializationData().properties->getProperty(name + ".PublishedEndpoints"); + string endpts = properties->getPropertyWithDefault(_propertyPrefix + _name + ".PublishedEndpoints", + properties->getProperty(_name + ".PublishedEndpoints")); _publishedEndpoints = parseEndpoints(endpts); if(_publishedEndpoints.empty()) { @@ -801,11 +839,15 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica not1(Ice::constMemFun(&EndpointI::publish))), _publishedEndpoints.end()); } - string locatorProperty = _name + ".Locator"; - if(!_instance->initializationData().properties->getProperty(locatorProperty).empty()) + string locatorProperty = _propertyPrefix + _name + ".Locator"; + if(!properties->getProperty(locatorProperty).empty()) { setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(locatorProperty))); } + else if(!properties->getProperty(_name + ".Locator").empty()) + { + setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Locator"))); + } else { setLocator(_instance->referenceFactory()->getDefaultLocator()); @@ -813,11 +855,24 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica if(!_instance->threadPerConnection()) { - int size = _instance->initializationData().properties->getPropertyAsInt(_name + ".ThreadPool.Size"); - int sizeMax = _instance->initializationData().properties->getPropertyAsInt(_name + ".ThreadPool.SizeMax"); - if(size > 0 || sizeMax > 0) + if(!properties->getProperty(_propertyPrefix + _name + ".ThreadPool.Size").empty() || + !properties->getProperty(_propertyPrefix + _name + ".ThreadPool.SizeMax").empty()) + { + int size = properties->getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.Size"); + int sizeMax = properties->getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.SizeMax"); + if(size > 0 || sizeMax > 0) + { + _threadPool = new ThreadPool(_instance, _propertyPrefix + _name + ".ThreadPool", 0); + } + } + else { - _threadPool = new ThreadPool(_instance, _name + ".ThreadPool", 0); + int size = properties->getPropertyAsInt(_name + ".ThreadPool.Size"); + int sizeMax = properties->getPropertyAsInt(_name + ".ThreadPool.SizeMax"); + if(size > 0 || sizeMax > 0) + { + _threadPool = new ThreadPool(_instance, _name + ".ThreadPool", 0); + } } } } @@ -1082,6 +1137,37 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator } } +StringSeq +Ice::ObjectAdapterI::filterProperties(const string& prefix) +{ + static const string suffixes[] = + { + "AdapterId", + "Endpoints", + "Locator", + "PublishedEndpoints", + "RegisterProcess", + "ReplicaGroupId", + "Router", + "ThreadPool.Size", + "ThreadPool.SizeMax", + "ThreadPool.SizeWarn", + "ThreadPool.StackSize" + }; + + StringSeq propertySet; + PropertyDict props = _instance->initializationData().properties->getPropertiesForPrefix(prefix); + for(unsigned int i = 0; i < sizeof(suffixes)/sizeof(*suffixes); ++i) + { + if(props.find(prefix + suffixes[i]) != props.end()) + { + propertySet.push_back(prefix + suffixes[i]); + } + } + + return propertySet; +} + Ice::ObjectAdapterI::ProcessI::ProcessI(const CommunicatorPtr& communicator) : _communicator(communicator) { diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index e90416cadc0..c3f198d91b8 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -27,6 +27,7 @@ #include #include #include +#include #include namespace Ice @@ -96,6 +97,7 @@ private: static void checkIdentity(const Identity&); std::vector parseEndpoints(const std::string&) const; void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrx&, bool); + Ice::StringSeq filterProperties(const std::string&); bool _deactivated; IceInternal::InstancePtr _instance; @@ -117,6 +119,8 @@ private: bool _waitForDeactivate; bool _noConfig; + static std::string _propertyPrefix; + class ProcessI : public Process { public: diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 2449070ce72..6e84d41e3a4 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `./config/PropertyNames.def', Mon Dec 11 11:13:50 2006 +// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Dec 18 13:40:21 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -50,6 +50,17 @@ const char* IceInternal::PropertyNames::IceProps[] = "Ice.MonitorConnections", "Ice.Nohup", "Ice.NullHandleAbort", + "Ice.OA.*.AdapterId", + "Ice.OA.*.Endpoints", + "Ice.OA.*.Locator", + "Ice.OA.*.PublishedEndpoints", + "Ice.OA.*.RegisterProcess", + "Ice.OA.*.ReplicaGroupId", + "Ice.OA.*.Router", + "Ice.OA.*.ThreadPool.Size", + "Ice.OA.*.ThreadPool.SizeMax", + "Ice.OA.*.ThreadPool.SizeWarn", + "Ice.OA.*.ThreadPool.StackSize", "Ice.Override.Compress", "Ice.Override.ConnectTimeout", "Ice.Override.Timeout", @@ -253,8 +264,8 @@ const char* IceInternal::PropertyNames::IceSSLProps[] = "IceSSL.DefaultDir", "IceSSL.DH.*", "IceSSL.EntropyDaemon", - "IceSSL.FindCert.*.*", - "IceSSL.ImportCert.*.*", + "IceSSL.FindCert.*", + "IceSSL.ImportCert.*", "IceSSL.KeyFile", "IceSSL.Keystore", "IceSSL.KeystorePassword", @@ -396,11 +407,11 @@ const char* IceInternal::PropertyNames::FreezeProps[] = "Freeze.DbEnv.*.DbRecoverFatal", "Freeze.DbEnv.*.OldLogsAutoDelete", "Freeze.DbEnv.*.PeriodicCheckpointMinSize", - "Freeze.Evictor.*.*.MaxTxSize", - "Freeze.Evictor.*.*.SavePeriod", - "Freeze.Evictor.*.*.SaveSizeTrigger", - "Freeze.Evictor.*.*.StreamTimeout", - "Freeze.Evictor.*.*.PopulateEmptyIndices", + "Freeze.Evictor.*.MaxTxSize", + "Freeze.Evictor.*.SavePeriod", + "Freeze.Evictor.*.SaveSizeTrigger", + "Freeze.Evictor.*.StreamTimeout", + "Freeze.Evictor.*.PopulateEmptyIndices", "Freeze.Evictor.UseNonmutating", "Freeze.Trace.DbEnv", "Freeze.Trace.Evictor", diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 5df9ba17997..c1bdfae9cbc 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `./config/PropertyNames.def', Mon Dec 11 11:13:50 2006 +// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Dec 18 13:40:21 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index ce9855b64d3..4ca832c154d 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -92,10 +92,15 @@ Client::run(int argc, char* argv[]) string managerProxy; if(properties->getProperty("Ice.Default.Locator").empty()) { - string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints"); + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + string managerEndpoints = + properties->getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.Endpoints", + properties->getProperty("IceBox.ServiceManager.Endpoints")); if(managerEndpoints.empty()) { - cerr << appName() << ": property `IceBox.ServiceManager.Endpoints' is not set" << endl; + cerr << appName() << ": property `Ice.OA.IceBox.ServiceManager.Endpoints' is not set" << endl; return EXIT_FAILURE; } @@ -103,10 +108,15 @@ Client::run(int argc, char* argv[]) } else { - string managerAdapterId = properties->getProperty("IceBox.ServiceManager.AdapterId"); + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + string managerAdapterId = + properties->getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.AdapterId", + properties->getProperty("IceBox.ServiceManager.AdapterId")); if(managerAdapterId.empty()) { - cerr << appName() << ": property `IceBox.ServiceManager.AdapterId' is not set" << endl; + cerr << appName() << ": property `Ice.OA.IceBox.ServiceManager.AdapterId' is not set" << endl; return EXIT_FAILURE; } diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index 611966a6672..f99092e1062 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -681,6 +681,10 @@ CommunicatorDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs) desc.serverLifetime = attrs.asBool("server-lifetime", true); _descriptor->adapters.push_back(desc); + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + addProperty(_hiddenProperties, "Ice.OA." + desc.name + ".Endpoints", attrs("endpoints", "default")); addProperty(_hiddenProperties, desc.name + ".Endpoints", attrs("endpoints", "default")); } @@ -904,8 +908,13 @@ IceBoxDescriptorBuilder::init(const IceBoxDescriptorPtr& desc, const XmlAttribut ServerDescriptorBuilder::init(desc, attrs); _descriptor = desc; + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // addProperty(_hiddenProperties, "IceBox.InstanceName", "${server}"); + addProperty(_hiddenProperties, "Ice.OA.IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"); addProperty(_hiddenProperties, "IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1"); + addProperty(_hiddenProperties, "Ice.OA.IceBox.ServiceManager.RegisterProcess", "1"); addProperty(_hiddenProperties, "IceBox.ServiceManager.RegisterProcess", "1"); } @@ -932,7 +941,13 @@ IceBoxDescriptorBuilder::addAdapter(const XmlAttributesHelper& attrs) PropertyDescriptorSeq::iterator p = _hiddenProperties.begin(); while(p != _hiddenProperties.end()) { - if(p->name == "IceBox.ServiceManager.Endpoints" || p->name == "IceBox.ServiceManager.RegisterProcess") + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(p->name == "Ice.OA.IceBox.ServiceManager.Endpoints" || + p->name == "IceBox.ServiceManager.Endpoints" || + p->name == "Ice.OA.IceBox.ServiceManager.RegisterProcess" || + p->name == "IceBox.ServiceManager.RegisterProcess") { p = _hiddenProperties.erase(p); } diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 68138d8a469..dcc2c00ce76 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -962,8 +962,10 @@ CommunicatorHelper::instantiateImpl(const CommunicatorDescriptorPtr& instance, c // // Make sure the endpoints are defined. // - string endpoints = IceGrid::getProperty(instance->propertySet.properties, adapter.name + ".Endpoints"); - if(endpoints.empty()) + // DEPRECATED PROPERY: Remove extra code in future release. + // + if(IceGrid::getProperty(instance->propertySet.properties, "Ice.OA." + adapter.name + ".Endpoints").empty() && + IceGrid::getProperty(instance->propertySet.properties, adapter.name + ".Endpoints").empty()) { resolve.exception("invalid endpoints for adapter `" + adapter.name + "': empty string"); } @@ -1065,7 +1067,14 @@ CommunicatorHelper::printObjectAdapter(Output& out, const AdapterDescriptor& ada { out << nl << "priority = `" << adapter.priority << "'"; } - string endpoints = getProperty(adapter.name + ".Endpoints"); + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + string endpoints = getProperty("Ice.OA." + adapter.name + ".Endpoints"); + if(endpoints.empty()) + { + endpoints = getProperty(adapter.name + ".Endpoints"); + } if(!endpoints.empty()) { out << nl << "endpoints = `" << endpoints << "'"; @@ -1485,7 +1494,15 @@ IceBoxHelper::print(Output& out, const ServerInfo& info) const { out << "icebox `" + _desc->id + "'"; out << sb; - out << nl << "service manager endpoints = `" << getProperty("IceBox.ServiceManager.Endpoints") << "'"; + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + string endpoints = getProperty("Ice.OA.IceBox.ServiceManager.Endpoints"); + if(endpoints.empty()) + { + endpoints = getProperty("IceBox.ServiceManager.Endpoints"); + } + out << nl << "service manager endpoints = `" << endpoints << "'"; printImpl(out, info); for(vector::const_iterator p = _services.begin(); p != _services.end(); ++p) { diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index c23e68edc10..b90bdf0c210 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -227,13 +227,22 @@ NodeService::start(int argc, char* argv[]) out << "you should set individual adapter thread pools instead."; } - int size = properties->getPropertyAsIntWithDefault("IceGrid.Node.ThreadPool.Size", 0); + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + int size = properties->getPropertyAsIntWithDefault("Ice.OA.IceGrid.Node.ThreadPool.Size", + properties->getPropertyAsIntWithDefault("IceGrid.Node.ThreadPool.Size", 0)); if(size <= 0) { - properties->setProperty("IceGrid.Node.ThreadPool.Size", "1"); + properties->setProperty("Ice.OA.IceGrid.Node.ThreadPool.Size", "1"); size = 1; } - int sizeMax = properties->getPropertyAsIntWithDefault("IceGrid.Node.ThreadPool.SizeMax", 0); + + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + int sizeMax = properties->getPropertyAsIntWithDefault("Ice.OA.IceGrid.Node.ThreadPool.SizeMax", + properties->getPropertyAsIntWithDefault("IceGrid.Node.ThreadPool.SizeMax", 0)); if(sizeMax <= 0) { if(size >= sizeMax) @@ -243,7 +252,7 @@ NodeService::start(int argc, char* argv[]) ostringstream os; os << sizeMax; - properties->setProperty("IceGrid.Node.ThreadPool.SizeMax", os.str()); + properties->setProperty("Ice.OA.IceGrid.Node.ThreadPool.SizeMax", os.str()); } size = properties->getPropertyAsIntWithDefault("Ice.ThreadPool.Client.Size", 0); @@ -296,8 +305,13 @@ NodeService::start(int argc, char* argv[]) Identity locatorId; locatorId.category = properties->getPropertyWithDefault("IceGrid.InstanceName", "IceGrid"); locatorId.name = "Locator"; - string locatorPrx = "\"" + communicator()->identityToString(locatorId) + "\" :" + - properties->getProperty("IceGrid.Registry.Client.Endpoints"); + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + string endpoints = + properties->getPropertyWithDefault("Ice.OA.IceGrid.Registry.Client.Endpoints", + properties->getProperty("IceGrid.Registry.Client.Endpoints")); + string locatorPrx = "\"" + communicator()->identityToString(locatorId) + "\" :" + endpoints; communicator()->setDefaultLocator(LocatorPrx::uncheckedCast(communicator()->stringToProxy(locatorPrx))); properties->setProperty("Ice.Default.Locator", locatorPrx); } @@ -362,9 +376,12 @@ NodeService::start(int argc, char* argv[]) // // Check that required properties are set and valid. // - if(properties->getProperty("IceGrid.Node.Endpoints").empty()) + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(properties->getProperty("Ice.OA.IceGrid.Node.Endpoints").empty() && + properties->getProperty("IceGrid.Node.Endpoints").empty()) { - error("property `IceGrid.Node.Endpoints' is not set"); + error("property `Ice.OA.IceGrid.Node.Endpoints' is not set"); return false; } @@ -384,7 +401,11 @@ NodeService::start(int argc, char* argv[]) // // Create the node object adapter. // - properties->setProperty("IceGrid.Node.RegisterProcess", "0"); + // DEPRECATED PROPERTIES: Remove extra code in future release. + // + properties->setProperty("Ice.OA.IceGrid.Node.RegisterProcess", "0"); + properties->setProperty("IceGrid.Node.RegisterProcess", ""); + properties->setProperty("Ice.OA.IceGrid.Node.AdapterId", ""); properties->setProperty("IceGrid.Node.AdapterId", ""); _adapter = communicator()->createObjectAdapter("IceGrid.Node"); diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp index c5fc269efc6..188d5d68910 100644 --- a/cpp/src/IceGrid/PlatformInfo.cpp +++ b/cpp/src/IceGrid/PlatformInfo.cpp @@ -175,20 +175,46 @@ PlatformInfo::PlatformInfo(const string& prefix, _machine = utsinfo.machine; #endif + // + // DEPRECATED PROPERTIES: Remove extra code in future release. + // Ice::PropertiesPtr properties = communicator->getProperties(); + string endpointsPrefix; + string oldEndpointsPrefix; if(prefix == "IceGrid.Registry") { _name = properties->getPropertyWithDefault("IceGrid.Registry.ReplicaName", "Master"); - const string endpointsPrefix = prefix + ".Client"; - _endpoints = properties->getPropertyWithDefault( - endpointsPrefix + ".PublishedEndpoints", properties->getProperty(endpointsPrefix + ".Endpoints")); + endpointsPrefix = "Ice.OA." + prefix + ".Client"; + oldEndpointsPrefix = prefix + ".Client"; } else { _name = properties->getProperty(prefix + ".Name"); - _endpoints = properties->getPropertyWithDefault( - prefix + ".PublishedEndpoints", properties->getProperty(prefix + ".Endpoints")); + endpointsPrefix = prefix; + oldEndpointsPrefix = prefix; + } + + Ice::PropertyDict props = properties->getPropertiesForPrefix(endpointsPrefix); + Ice::PropertyDict::const_iterator p = props.find(endpointsPrefix + ".PublishedEndpoints"); + if(p != props.end()) + { + _endpoints = p->second; } + else + { + Ice::PropertyDict oldProps = properties->getPropertiesForPrefix(oldEndpointsPrefix); + p = props.find(oldEndpointsPrefix + ".PublishedEndpoints"); + if(p != props.end()) + { + _endpoints = p->second; + } + else + { + _endpoints = properties->getPropertyWithDefault( + endpointsPrefix + ".Endpoints", properties->getProperty(oldEndpointsPrefix + ".Endpoints")); + } + } + _dataDir = properties->getProperty(prefix + ".Data"); if(!IcePatch2::isAbsolute(_dataDir)) { diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index dc4b09ce6e8..cc07c398ee2 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -160,48 +160,63 @@ RegistryI::start(bool nowarn) // // Check that required properties are set and valid. // - if(properties->getProperty("IceGrid.Registry.Client.Endpoints").empty()) + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(properties->getProperty("Ice.OA.IceGrid.Registry.Client.Endpoints").empty() && + properties->getProperty("IceGrid.Registry.Client.Endpoints").empty()) { Error out(_communicator->getLogger()); - out << "property `IceGrid.Registry.Client.Endpoints' is not set"; + out << "property `Ice.OA.IceGrid.Registry.Client.Endpoints' is not set"; return false; } - if(properties->getProperty("IceGrid.Registry.Server.Endpoints").empty()) + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(properties->getProperty("Ice.OA.IceGrid.Registry.Server.Endpoints").empty() && + properties->getProperty("IceGrid.Registry.Server.Endpoints").empty()) { Error out(_communicator->getLogger()); - out << "property `IceGrid.Registry.Server.Endpoints' is not set"; + out << "property `Ice.OA.IceGrid.Registry.Server.Endpoints' is not set"; return false; } - if(properties->getProperty("IceGrid.Registry.Internal.Endpoints").empty()) + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(properties->getProperty("Ice.OA.IceGrid.Registry.Internal.Endpoints").empty() && + properties->getProperty("IceGrid.Registry.Internal.Endpoints").empty()) { Error out(_communicator->getLogger()); - out << "property `IceGrid.Registry.Internal.Endpoints' is not set"; + out << "property `Ice.OA.IceGrid.Registry.Internal.Endpoints' is not set"; return false; } - if(!properties->getProperty("IceGrid.Registry.SessionManager.Endpoints").empty()) + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(!properties->getProperty("Ice.OA.IceGrid.Registry.SessionManager.Endpoints").empty() || + !properties->getProperty("IceGrid.Registry.SessionManager.Endpoints").empty()) { if(!nowarn) { Warning out(_communicator->getLogger()); - out << "session manager endpoints `IceGrid.Registry.SessionManager.Endpoints' enabled"; + out << "session manager endpoints `Ice.OA.IceGrid.Registry.SessionManager.Endpoints' enabled"; } } properties->setProperty("Ice.PrintProcessId", "0"); properties->setProperty("Ice.ServerIdleTime", "0"); - properties->setProperty("IceGrid.Registry.Client.AdapterId", ""); - properties->setProperty("IceGrid.Registry.Server.AdapterId", ""); - properties->setProperty("IceGrid.Registry.SessionManager.AdapterId", ""); - properties->setProperty("IceGrid.Registry.Internal.AdapterId", ""); + properties->setProperty("Ice.OA.IceGrid.Registry.Client.AdapterId", ""); + properties->setProperty("Ice.OA.IceGrid.Registry.Server.AdapterId", ""); + properties->setProperty("Ice.OA.IceGrid.Registry.SessionManager.AdapterId", ""); + properties->setProperty("Ice.OA.IceGrid.Registry.Internal.AdapterId", ""); setupThreadPool(properties, "Ice.ThreadPool.Client", 1, 100); - setupThreadPool(properties, "IceGrid.Registry.Client.ThreadPool", 1, 10); - setupThreadPool(properties, "IceGrid.Registry.Server.ThreadPool", 1, 10); - setupThreadPool(properties, "IceGrid.Registry.SessionManager.ThreadPool", 1, 10); - setupThreadPool(properties, "IceGrid.Registry.Internal.ThreadPool", 1, 100); + setupThreadPool(properties, "Ice.OA.IceGrid.Registry.Client.ThreadPool", 1, 10); + setupThreadPool(properties, "Ice.OA.IceGrid.Registry.Server.ThreadPool", 1, 10); + setupThreadPool(properties, "Ice.OA.IceGrid.Registry.SessionManager.ThreadPool", 1, 10); + setupThreadPool(properties, "Ice.OA.IceGrid.Registry.Internal.ThreadPool", 1, 100); _replicaName = properties->getPropertyWithDefault("IceGrid.Registry.ReplicaName", "Master"); _master = _replicaName == "Master"; @@ -244,12 +259,18 @@ RegistryI::start(bool nowarn) // try { - string strPrx = _instanceName + "/Locator:" + properties->getProperty("IceGrid.Registry.Client.Endpoints"); + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + string endpoints = + properties->getPropertyWithDefault("Ice.OA.IceGrid.Registry.Client.Endpoints", + properties->getProperty("IceGrid.Registry.Client.Endpoints")); + string strPrx = _instanceName + "/Locator:" + endpoints; _communicator->stringToProxy(strPrx)->ice_timeout(5000)->ice_ping(); Error out(_communicator->getLogger()); out << "an IceGrid registry is already running and listening on\n"; - out << "the client endpoints `" << properties->getProperty("IceGrid.Registry.Client.Endpoints") << "'"; + out << "the client endpoints `" << endpoints << "'"; return false; } catch(const Ice::LocalException&) @@ -333,7 +354,11 @@ RegistryI::start(bool nowarn) ObjectAdapterPtr serverAdapter = _communicator->createObjectAdapter("IceGrid.Registry.Server"); _clientAdapter = _communicator->createObjectAdapter("IceGrid.Registry.Client"); ObjectAdapterPtr sessionManagerAdapter; - if(!properties->getProperty("IceGrid.Registry.SessionManager.Endpoints").empty()) + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + if(!properties->getProperty("Ice.OA.IceGrid.Registry.SessionManager.Endpoints").empty() || + !properties->getProperty("IceGrid.Registry.SessionManager.Endpoints").empty()) { sessionManagerAdapter = _communicator->createObjectAdapter("IceGrid.Registry.SessionManager"); } diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 51ecb0013b1..2ed1d397e65 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -2534,17 +2534,23 @@ ServerI::updateConfigFile(const string& serverDir, const CommunicatorDescriptorP { if(!q->id.empty() || q->registerProcess) { + // + // DEPREACTED PROPERTIES: Removed extra code in future release + // props.push_back(createProperty("# Object adapter " + q->name)); if(!q->id.empty()) { + props.push_back(createProperty("Ice.OA." + q->name + ".AdapterId", q->id)); props.push_back(createProperty(q->name + ".AdapterId", q->id)); if(!q->replicaGroupId.empty()) { + props.push_back(createProperty("Ice.OA." + q->name + ".ReplicaGroupId", q->replicaGroupId)); props.push_back(createProperty(q->name + ".ReplicaGroupId", q->replicaGroupId)); } } if(q->registerProcess) { + props.push_back(createProperty("Ice.OA." + q->name + ".RegisterProcess", "1")); props.push_back(createProperty(q->name + ".RegisterProcess", "1")); } } diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp index 6c2d9f60673..ba6bb4c1e6a 100755 --- a/cpp/src/IcePatch2/ClientUtil.cpp +++ b/cpp/src/IcePatch2/ClientUtil.cpp @@ -156,11 +156,12 @@ IcePatch2::Patcher::Patcher(const CommunicatorPtr& communicator, const PatcherFe { PropertiesPtr properties = communicator->getProperties(); - const char* endpointsProperty = "IcePatch2.Endpoints"; - const string endpoints = properties->getProperty(endpointsProperty); + const char* endpointsProperty = "Ice.OA.IcePatch2.Endpoints"; + string endpoints = properties->getPropertyWithDefault(endpointsProperty, + properties->getProperty("IcePatch2.Endpoints")); if(endpoints.empty()) { - throw string("property `") + endpointsProperty + "' is not set"; + throw string("property `") + endpointsProperty + "' is not set"; } Identity id; diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp index ed1e102c400..e285545c049 100644 --- a/cpp/src/IcePatch2/Server.cpp +++ b/cpp/src/IcePatch2/Server.cpp @@ -141,17 +141,25 @@ IcePatch2::PatcherService::start(int argc, char* argv[]) return false; } - const string endpointsProperty = "IcePatch2.Endpoints"; - if(properties->getProperty(endpointsProperty).empty()) + // + // DEPRECATED PROPERTY: Remove extra code in future release + // + const string endpointsProperty = "Ice.OA.IcePatch2.Endpoints"; + string endpoints = properties->getPropertyWithDefault(endpointsProperty, + properties->getProperty("IcePatch2.Endpoints")); + if(endpoints.empty()) { - error("property `" + endpointsProperty + "' is not set"); - return false; + error("property `" + endpointsProperty + "' is not set"); + return false; } ObjectAdapterPtr adapter = communicator()->createObjectAdapter("IcePatch2"); - const string adminEndpointsProperty = "IcePatch2.Admin.Endpoints"; + // + // DEPRECATED PROPERTY: Remove extra code in future release + // ObjectAdapterPtr adminAdapter; - if(!properties->getProperty(adminEndpointsProperty).empty()) + if(!properties->getProperty("Ice.OA.IcePatch2.Admin.Endpoints").empty() || + !properties->getProperty("IcePatch2.Admin.Endpoints").empty()) { adminAdapter = communicator()->createObjectAdapter("IcePatch2.Admin"); } diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index 2f1fa474dda..1b90f0ad3e8 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -337,51 +337,50 @@ IceUtil::checkQuote(const string& s, string::size_type start) // // Match `s' against the pattern `pat'. A * in the pattern acts -// as a wildcard: it matches any non-empty sequence of characters -// other than a period (`.'). We match by hand here because -// it's portable across platforms (whereas regex() isn't). +// as a wildcard: it matches any non-empty sequence of characters. +// We match by hand here because it's portable across platforms +// (whereas regex() isn't). Only one * per pattern is supported. // bool -IceUtil::match(const string& s, const string& pat, bool matchPeriod) +IceUtil::match(const string& s, const string& pat, bool emptyMatch) { assert(!s.empty()); assert(!pat.empty()); - if(pat.find('*') == string::npos) + // + // If pattern does not contain a wildcard just compare strings. + // + string::size_type beginIndex = pat.find('*'); + if(beginIndex == string::npos) { return s == pat; } - string::size_type sIndex = 0; - string::size_type patIndex = 0; - do + // + // Make sure start of the strings match + // + if(s.substr(0, beginIndex) != pat.substr(0, beginIndex)) { - if(pat[patIndex] == '*') - { - // - // Don't allow matching x..y against x.*.y if requested -- star matches non-empty sequence only. - // - if(!matchPeriod && s[sIndex] == '.') - { - return false; - } - while(sIndex < s.size() && (matchPeriod || s[sIndex] != '.')) - { - ++sIndex; - } - patIndex++; - } - else - { - if(pat[patIndex] != s[sIndex]) - { - return false; - } - ++sIndex; - ++patIndex; - } + return false; + } + + // + // Make sure there is something present in the middle to match the + // wildcard. If emptyMatch is true, allow a match of "". + // + string::size_type endIndex = s.length() - (pat.length() - beginIndex - 1); + if(endIndex < beginIndex || (!emptyMatch && endIndex == beginIndex)) + { + return false; + } + + // + // Make sure end of the strings match + // + if(s.substr(endIndex, s.length()) != pat.substr(beginIndex + 1, pat.length())) + { + return false; } - while(sIndex < s.size() && patIndex < pat.size()); - return sIndex == s.size() && patIndex == pat.size(); + return true; } diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index f7d1010966a..dde935ffd7f 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -50,8 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000"); - + communicator->getProperties()->setProperty("Ice.OA.Factory.Endpoints", "default -p 12010 -t 30000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(adapter, envName); diff --git a/cpp/test/Freeze/oldevictor/Server.cpp b/cpp/test/Freeze/oldevictor/Server.cpp index f7d1010966a..dde935ffd7f 100644 --- a/cpp/test/Freeze/oldevictor/Server.cpp +++ b/cpp/test/Freeze/oldevictor/Server.cpp @@ -50,8 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000"); - + communicator->getProperties()->setProperty("Ice.OA.Factory.Endpoints", "default -p 12010 -t 30000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(adapter, envName); diff --git a/cpp/test/Glacier2/addressFilter/Server.cpp b/cpp/test/Glacier2/addressFilter/Server.cpp index 29c63d6e017..6d9a85611e6 100644 --- a/cpp/test/Glacier2/addressFilter/Server.cpp +++ b/cpp/test/Glacier2/addressFilter/Server.cpp @@ -127,10 +127,10 @@ int BackendServer::run(int argc, char* argv[]) { string endpoints = - communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", + communicator()->getProperties()->getPropertyWithDefault("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 20000:ssl -p 12011 -t 20000"); - communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", endpoints); + communicator()->getProperties()->setProperty("Ice.OA.BackendAdapter.Endpoints", endpoints); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter"); BackendPtr backend = new BackendI; Ice::LocatorPtr locator = new ServerLocatorI(backend, adapter); diff --git a/cpp/test/Glacier2/addressFilter/run.py b/cpp/test/Glacier2/addressFilter/run.py index db150dda5b3..cdd1d578fd1 100755 --- a/cpp/test/Glacier2/addressFilter/run.py +++ b/cpp/test/Glacier2/addressFilter/run.py @@ -248,8 +248,8 @@ for testcase in testcases: serverOptions = TestUtil.serverProtocol + commonServerOptions routerCmd = router + serverOptions + " --Ice.Config=%s" % os.path.join(testdir, "router.cfg") + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/addressFilter/passwords"' routerConfig = file(os.path.join(testdir, "router.cfg"), "w") @@ -291,7 +291,7 @@ for testcase in testcases: if TestUtil.protocol != "ssl": serverConfig = file(os.path.join(testdir, "server.cfg"), "w") serverOptions = ' --Ice.Config=' + os.path.join(testdir, "server.cfg") + " " + serverOptions - serverConfig.write("BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") + serverConfig.write("Ice.OA.BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") serverConfig.close() serverCmd = os.path.join(testdir, 'server') + serverOptions diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp index 1ea110d43a5..d53d7dddc21 100644 --- a/cpp/test/Glacier2/attack/Server.cpp +++ b/cpp/test/Glacier2/attack/Server.cpp @@ -58,7 +58,7 @@ main(int argc, char* argv[]) int BackendServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter"); adapter->addServantLocator(new ServantLocatorI, ""); adapter->activate(); diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py index a0b701f0a38..8989be68548 100755 --- a/cpp/test/Glacier2/attack/run.py +++ b/cpp/test/Glacier2/attack/run.py @@ -24,8 +24,8 @@ router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ r' --Glacier2.RoutingTable.MaxSize=10' + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/attack/passwords"' print "starting router...", diff --git a/cpp/test/Glacier2/filters/Server.cpp b/cpp/test/Glacier2/filters/Server.cpp index 569c793d17f..19adc85d237 100755 --- a/cpp/test/Glacier2/filters/Server.cpp +++ b/cpp/test/Glacier2/filters/Server.cpp @@ -139,19 +139,19 @@ SessionControlServer::run(int, char*[]) // servant, allowing us to use any reference as long as the client // expects to use a proxy for the correct type of object. // - communicator()->getProperties()->setProperty("TestControllerAdapter.Endpoints", "tcp -p 12013"); + communicator()->getProperties()->setProperty("Ice.OA.TestControllerAdapter.Endpoints", "tcp -p 12013"); ObjectAdapterPtr controllerAdapter = communicator()->createObjectAdapter("TestControllerAdapter"); TestControllerIPtr controller = new TestControllerI; controllerAdapter->add(controller, communicator()->stringToIdentity("testController")); controllerAdapter->activate(); - communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010"); + communicator()->getProperties()->setProperty("Ice.OA.SessionControlAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter"); adapter->add(new SessionManagerI(controller), communicator()->stringToIdentity("SessionManager")); adapter->activate(); BackendPtr backend = new BackendI; - communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "default -p 12012"); + communicator()->getProperties()->setProperty("Ice.OA.BackendAdapter.Endpoints", "default -p 12012"); ObjectAdapterPtr backendAdapter = communicator()->createObjectAdapter("BackendAdapter"); backendAdapter->addServantLocator(new ServantLocatorI(backend), ""); backendAdapter->activate(); diff --git a/cpp/test/Glacier2/filters/run.py b/cpp/test/Glacier2/filters/run.py index 7018fd7177a..bfa651a14d1 100755 --- a/cpp/test/Glacier2/filters/run.py +++ b/cpp/test/Glacier2/filters/run.py @@ -34,8 +34,8 @@ print "ok" router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.SessionManager="SessionManager:tcp -h 127.0.0.1 -p 12010 -t 10000"' + \ r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ r' --Ice.Default.Locator="locator:default -h 127.0.0.1 -p 12012 -t 10000"' diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp index 6ab68f2e12b..6c552094dc5 100644 --- a/cpp/test/Glacier2/router/Server.cpp +++ b/cpp/test/Glacier2/router/Server.cpp @@ -37,7 +37,7 @@ main(int argc, char* argv[]) int CallbackServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("Ice.OA.CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); adapter->add(new CallbackI(), communicator()->stringToIdentity("c1/callback")); // The test allows "c1" as category. adapter->add(new CallbackI(), communicator()->stringToIdentity("c2/callback")); // The test allows "c2" as category. diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py index b47e59b3c8f..ac1bd1478b9 100755 --- a/cpp/test/Glacier2/router/run.py +++ b/cpp/test/Glacier2/router/run.py @@ -28,9 +28,9 @@ command = router + TestUtil.clientServerOptions + \ r' --Glacier2.Filter.Category.Accept="c1 c2"' + \ r' --Glacier2.Filter.Category.AcceptUser="2"' + \ r' --Glacier2.SessionTimeout="30"' + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/router/passwords"' print "starting router...", diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp index df45e98804e..7e83e195adf 100644 --- a/cpp/test/Glacier2/sessionControl/Server.cpp +++ b/cpp/test/Glacier2/sessionControl/Server.cpp @@ -32,7 +32,7 @@ main(int argc, char* argv[]) int SessionControlServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("Ice.OA.SessionControlAdapter.Endpoints", "tcp -p 12010 -t 10000"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter"); adapter->add(new SessionManagerI, communicator()->stringToIdentity("SessionManager")); adapter->activate(); diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py index 477a6ec050e..edcb81d07e1 100755 --- a/cpp/test/Glacier2/sessionControl/run.py +++ b/cpp/test/Glacier2/sessionControl/run.py @@ -34,8 +34,8 @@ print "ok" router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' \ r' --Glacier2.SessionManager="SessionManager:tcp -h 127.0.0.1 -p 12010 -t 10000"' \ r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py index 551b0802c25..860d1797694 100755 --- a/cpp/test/Glacier2/ssl/run.py +++ b/cpp/test/Glacier2/ssl/run.py @@ -36,9 +36,9 @@ router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ r' --Ice.Warn.Dispatch=0' + \ r' --Glacier2.AddSSLContext=1' + \ - r' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -t 10000"' + \ - r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \ r' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ r' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 8065b379527..017587fb46f 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -33,7 +33,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); ServantLocatorPtr locator = new ServantLocatorI; adapter->addServantLocator(locator, ""); diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index 77403ccb17f..39e195dc761 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -31,7 +31,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); ServantLocatorPtr locator = new ServantLocatorI; diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp index 62b9802d960..4d2ac618001 100644 --- a/cpp/test/Ice/binding/Server.cpp +++ b/cpp/test/Ice/binding/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("communicator"); adapter->add(new RemoteCommunicatorI(), id); diff --git a/cpp/test/Ice/binding/TestI.cpp b/cpp/test/Ice/binding/TestI.cpp index 89e6709a59c..6f67ec0bf9a 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -18,7 +18,7 @@ RemoteObjectAdapterPrx RemoteCommunicatorI::createObjectAdapter(const string& name, const string& endpoints, const Current& current) { Ice::CommunicatorPtr com = current.adapter->getCommunicator(); - com->getProperties()->setProperty(name + ".ThreadPool.Size", "1"); + com->getProperties()->setProperty("Ice.OA." + name + ".ThreadPool.Size", "1"); ObjectAdapterPtr adapter = com->createObjectAdapterWithEndpoints(name, endpoints); return RemoteObjectAdapterPrx::uncheckedCast(current.adapter->addWithUUID(new RemoteObjectAdapterI(adapter))); } diff --git a/cpp/test/Ice/checksum/server/Server.cpp b/cpp/test/Ice/checksum/server/Server.cpp index f6e4e4a6fa2..5a20b900881 100644 --- a/cpp/test/Ice/checksum/server/Server.cpp +++ b/cpp/test/Ice/checksum/server/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ChecksumI(adapter); adapter->add(object, communicator->stringToIdentity("test")); diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index f4a5f3e13f1..a6571401b9a 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -40,7 +40,7 @@ main(int argc, char** argv) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index ada96ddd009..d7f043244a7 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -39,7 +39,7 @@ main(int argc, char** argv) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index d194fe648f0..0714154a4dd 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -40,7 +40,7 @@ main(int argc, char** argv) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 4d361e6a85a..5b3994f87b2 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -583,7 +583,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Expected } - communicator->getProperties()->setProperty("TestAdapter0.Endpoints", "default"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter0.Endpoints", "default"); first = communicator->createObjectAdapter("TestAdapter0"); try { @@ -608,14 +608,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // // Properties must remain unaffected if an exception occurs. // - test(communicator->getProperties()->getProperty("TestAdapter0.Endpoints") == "default"); + test(communicator->getProperties()->getProperty("Ice.OA.TestAdapter0.Endpoints") == "default"); first->deactivate(); } cout << "ok" << endl; cout << "testing servant registration exceptions... " << flush; { - communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter1.Endpoints", "default"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter1"); Ice::ObjectPtr obj = new EmptyI; adapter->add(obj, communicator->stringToIdentity("x")); @@ -644,7 +644,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) cout << "testing servant locator registrations exceptions... " << flush; { - communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter2"); Ice::ServantLocatorPtr loc = new ServantLocatorI; adapter->addServantLocator(loc, "x"); diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index e707b049918..f361425cde0 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 26b3c89f181..75cb76c8793 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 99ebdb2b845..e8d7546e23d 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index 33e126a37d6..41805b7bca9 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -22,7 +22,7 @@ GPrx allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing facet registration exceptions... " << flush; - communicator->getProperties()->setProperty("FacetExceptionTestAdapter.Endpoints", "default"); + communicator->getProperties()->setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("FacetExceptionTestAdapter"); Ice::ObjectPtr obj = new EmptyI; adapter->add(obj, communicator->stringToIdentity("d")); diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index 5038f1bf054..5450f01f22a 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = new DI; adapter->add(d, communicator->stringToIdentity("d")); diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index fc71f95c9a0..cef1f93d2ed 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = new DI; adapter->add(d, communicator->stringToIdentity("d")); diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index 6c7c05832b3..cbc5a9db94c 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -50,7 +50,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) ostringstream endpts; endpts << "default -p " << port << ":udp"; - communicator->getProperties()->setProperty("TestAdapter.Endpoints", endpts.str()); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", endpts.str()); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("test")); diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp index 9a0c81a34fe..397af86e266 100644 --- a/cpp/test/Ice/hold/Server.cpp +++ b/cpp/test/Ice/hold/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new HoldI; adapter->add(object, communicator->stringToIdentity("hold")); diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index 7b169147632..266d482f833 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index 6fd5e31ca36..80e7879d72f 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp index e141e427e07..e03b57c4270 100644 --- a/cpp/test/Ice/location/Server.cpp +++ b/cpp/test/Ice/location/Server.cpp @@ -24,7 +24,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, // Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.ThreadPool.Server.Size", "2"); - properties->setProperty("ServerManager.Endpoints", "default -p 12010:udp"); + properties->setProperty("Ice.OA.ServerManager.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("ServerManager"); diff --git a/cpp/test/Ice/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp index 45cd666fb86..a36610ef230 100644 --- a/cpp/test/Ice/location/TestI.cpp +++ b/cpp/test/Ice/location/TestI.cpp @@ -18,12 +18,12 @@ ServerManagerI::ServerManagerI(const Ice::ObjectAdapterPtr& adapter, const Ice::InitializationData& initData) : _adapter(adapter), _registry(registry), _initData(initData) { - _initData.properties->setProperty("TestAdapter.Endpoints", "default"); - _initData.properties->setProperty("TestAdapter.AdapterId", "TestAdapter"); - _initData.properties->setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); + _initData.properties->setProperty("Ice.OA.TestAdapter.Endpoints", "default"); + _initData.properties->setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter"); + _initData.properties->setProperty("Ice.OA.TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); - _initData.properties->setProperty("TestAdapter2.Endpoints", "default"); - _initData.properties->setProperty("TestAdapter2.AdapterId", "TestAdapter2"); + _initData.properties->setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); + _initData.properties->setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2"); _initData.properties->setProperty("Ice.PrintAdapterReady", "0"); } diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 8b9bbc387cb..6e9531793d5 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); InitialPtr initial = new InitialI(adapter); adapter->add(initial, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 88343fa15f9..2b24c724a1a 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); InitialPtr initial = new InitialI(adapter); adapter->add(initial, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 58a734b368c..ddc5542f202 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -16,7 +16,7 @@ int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("test"); adapter->add(new MyDerivedClassI(adapter, id), id); diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index 7e782503d4a..5df8f4beac8 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("test"); adapter->add(new MyDerivedClassI(adapter, id), id); diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index 084eaeff6d9..51897e71501 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("test"); adapter->add(new MyDerivedClassI(adapter, id), id); diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp index fcd856114f9..2586732b4d1 100644 --- a/cpp/test/Ice/retry/Server.cpp +++ b/cpp/test/Ice/retry/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new RetryI; adapter->add(object, communicator->stringToIdentity("retry")); diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index f7148f82603..e9852c502b7 100644 --- a/cpp/test/Ice/slicing/exceptions/Server.cpp +++ b/cpp/test/Ice/slicing/exceptions/Server.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("Test")); diff --git a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp index f505ad08971..0b3d6a1af08 100644 --- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("Test")); diff --git a/cpp/test/Ice/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp index f7148f82603..e9852c502b7 100644 --- a/cpp/test/Ice/slicing/objects/Server.cpp +++ b/cpp/test/Ice/slicing/objects/Server.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("Test")); diff --git a/cpp/test/Ice/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp index f505ad08971..0b3d6a1af08 100644 --- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp +++ b/cpp/test/Ice/slicing/objects/ServerAMD.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, communicator->stringToIdentity("Test")); diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index b4da1eb153d..6c2d1c53a5d 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TimeoutI; adapter->add(object, communicator->stringToIdentity("timeout")); diff --git a/cpp/test/IceGrid/allocation/application.xml b/cpp/test/IceGrid/allocation/application.xml index 8e68bcc2b3b..9c43011dddb 100644 --- a/cpp/test/IceGrid/allocation/application.xml +++ b/cpp/test/IceGrid/allocation/application.xml @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/cpp/test/IceGrid/distribution/application.xml b/cpp/test/IceGrid/distribution/application.xml index 91b492dbc96..8822d7c2dd0 100644 --- a/cpp/test/IceGrid/distribution/application.xml +++ b/cpp/test/IceGrid/distribution/application.xml @@ -16,8 +16,8 @@ - - + + diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index d7be7246922..5f728712bb0 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -906,7 +906,7 @@ allTests(const Ice::CommunicatorPtr& comm) adapter.id = "TestAdapter.Server"; adapter.registerProcess = true; PropertyDescriptor property; - property.name = "TestAdapter.Endpoints"; + property.name = "Ice.OA.TestAdapter.Endpoints"; property.value = "default"; server->propertySet.properties.push_back(property); property.name = "Identity"; @@ -1078,7 +1078,7 @@ allTests(const Ice::CommunicatorPtr& comm) adapter.id = "TestAdapter.Server"; adapter.registerProcess = true; PropertyDescriptor property; - property.name = "TestAdapter.Endpoints"; + property.name = "Ice.OA.TestAdapter.Endpoints"; property.value = "default"; server->propertySet.properties.push_back(property); property.name = "Identity"; diff --git a/cpp/test/IceGrid/replication/application.xml b/cpp/test/IceGrid/replication/application.xml index abcf5d4e1d4..b0b1c2fad64 100644 --- a/cpp/test/IceGrid/replication/application.xml +++ b/cpp/test/IceGrid/replication/application.xml @@ -31,10 +31,10 @@ - - - - + + + + diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 82f12c4bf53..e40196c5a06 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -1657,7 +1657,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // server->adapters.push_back(adapter); // addProperty(server, "IceGrid.Node.Name", "node-1"); // addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-1"); -// addProperty(server, "IceGrid.Node.Endpoints", "default"); +// addProperty(server, "Ice.OA.IceGrid.Node.Endpoints", "default"); // NodeDescriptor node; // node.servers.push_back(server); // nodeApp.nodes["localnode"] = node; @@ -1789,7 +1789,7 @@ allTests(const Ice::CommunicatorPtr& communicator) server->adapters.push_back(adapter); addProperty(server, "IceGrid.Node.Name", "node-1"); addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-1"); - addProperty(server, "IceGrid.Node.Endpoints", "default"); + addProperty(server, "Ice.OA.IceGrid.Node.Endpoints", "default"); NodeDescriptor node; node.servers.push_back(server); nodeApp.nodes["localnode"] = node; @@ -1839,7 +1839,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.registerProcess = true; adapter.serverLifetime = true; server->adapters.push_back(adapter); - addProperty(server, "Server.Endpoints", "default"); + addProperty(server, "Ice.OA.Server.Endpoints", "default"); node = NodeDescriptor(); node.servers.push_back(server); testApp.nodes["localnode"] = node; diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml index ddc726028a2..707c3e33bb6 100644 --- a/cpp/test/IceGrid/session/application.xml +++ b/cpp/test/IceGrid/session/application.xml @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/cpp/test/IceGrid/simple/run.py b/cpp/test/IceGrid/simple/run.py index 41ba6654786..8b24f64d7ed 100755 --- a/cpp/test/IceGrid/simple/run.py +++ b/cpp/test/IceGrid/simple/run.py @@ -26,7 +26,8 @@ name = os.path.join("IceGrid", "simple") # # Test client/server without on demand activation. # -IceGridAdmin.iceGridClientServerTest(name, "", "--TestAdapter.Endpoints=default --TestAdapter.AdapterId=TestAdapter") +IceGridAdmin.iceGridClientServerTest(name, "", "--Ice.OA.TestAdapter.Endpoints=default" + \ + " --Ice.OA.TestAdapter.AdapterId=TestAdapter") # # Test client/server with on demand activation. diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp index b64a55b00a0..84caf0120b5 100644 --- a/cpp/test/IceGrid/update/AllTests.cpp +++ b/cpp/test/IceGrid/update/AllTests.cpp @@ -152,7 +152,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.name = "Server"; adapter.id = "ServerAdapter"; adapter.registerProcess = true; - addProperty(server, "Server.Endpoints", "default"); + addProperty(server, "Ice.OA.Server.Endpoints", "default"); ObjectDescriptor object; object.id = communicator->stringToIdentity("test"); object.type = "::Test::TestIntf"; @@ -215,7 +215,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.name = "Server"; adapter.id = "${server}"; adapter.registerProcess = true; - addProperty(server, "Server.Endpoints", "default"); + addProperty(server, "Ice.OA.Server.Endpoints", "default"); object = ObjectDescriptor(); object.id = communicator->stringToIdentity("${server}"); object.type = "::Test::TestIntf"; @@ -486,7 +486,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.name = "${service}"; adapter.id = "${server}.${service}"; adapter.registerProcess = true; - addProperty(service, "${service}.Endpoints", "default"); + addProperty(service, "Ice.OA.${service}.Endpoints", "default"); service->adapters.push_back(adapter); IceBoxDescriptorPtr server = new IceBoxDescriptor(); @@ -1042,7 +1042,7 @@ allTests(const Ice::CommunicatorPtr& communicator) addProperty(server, "IceGrid.Node.Name", "node-${index}"); addProperty(server, "IceGrid.Node.Data", properties->getProperty("TestDir") + "/db/node-${index}"); - addProperty(server, "IceGrid.Node.Endpoints", "default"); + addProperty(server, "Ice.OA.IceGrid.Node.Endpoints", "default"); addProperty(server, "IceGrid.Node.PropertiesOverride", properties->getProperty("NodePropertiesOverride")); nodeApp.serverTemplates["nodeTemplate"].descriptor = server; @@ -1103,7 +1103,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.registerProcess = true; adapter.serverLifetime = true; server->adapters.push_back(adapter); - addProperty(server, "Server.Endpoints", "default"); + addProperty(server, "Ice.OA.Server.Endpoints", "default"); testApp.nodes["node-1"].servers.push_back(server); try diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp index 7d0c5a5f80e..93ce6a25fc8 100644 --- a/cpp/test/IceSSL/configuration/Server.cpp +++ b/cpp/test/IceSSL/configuration/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "tcp -p 12010"); + communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "tcp -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("factory"); adapter->add(new ServerFactoryI, id); diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index 0c2e827422f..4f61b179a76 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -28,11 +28,11 @@ iceBox = TestUtil.getIceBox(testdir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --IceStorm.Publish.Endpoints="default"' + \ + ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --Ice.OA.IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12011"' diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index bd7754d34c3..301b6535288 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -30,11 +30,11 @@ iceBox = TestUtil.getIceBox(exedir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --IceStorm.Publish.Endpoints="default"' + \ + ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --Ice.OA.IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12011"' diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index 002f3b0c9c3..558b936a89e 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -28,11 +28,11 @@ iceBox = TestUtil.getIceBox(testdir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --IceStorm.Publish.Endpoints="default"' + \ + ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --Ice.OA.IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12011"' -- cgit v1.2.3