diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-12-18 17:06:44 +0000 |
| commit | d07fdae285690f699a70f97f36232e516dcad2bc (patch) | |
| tree | c239def689c5e6cc53ac76dbe3e60ec11c306964 | |
| parent | Fixed tryLock() comment (diff) | |
| download | ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.bz2 ice-d07fdae285690f699a70f97f36232e516dcad2bc.tar.xz ice-d07fdae285690f699a70f97f36232e516dcad2bc.zip | |
Object adapter properties now prefixed by "Ice.OA."
302 files changed, 1108 insertions, 626 deletions
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.<Adpater name>.Endpoints" instead of "<Adpater name>.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.<any>.AdapterId + OA.<any>.Endpoints + OA.<any>.Locator + OA.<any>.PublishedEndpoints + OA.<any>.RegisterProcess + OA.<any>.ReplicaGroupId + OA.<any>.Router + OA.<any>.ThreadPool.Size + OA.<any>.ThreadPool.SizeMax + OA.<any>.ThreadPool.SizeWarn + OA.<any>.ThreadPool.StackSize Override.Compress Override.ConnectTimeout Override.Timeout @@ -336,8 +347,8 @@ IceSSL: DefaultDir DH.<any> EntropyDaemon - FindCert.<any>.<any> - ImportCert.<any>.<any> + FindCert.<any> + ImportCert.<any> KeyFile Keystore KeystorePassword @@ -470,11 +481,11 @@ Freeze: DbEnv.<any>.DbRecoverFatal DbEnv.<any>.OldLogsAutoDelete DbEnv.<any>.PeriodicCheckpointMinSize - Evictor.<any>.<any>.MaxTxSize - Evictor.<any>.<any>.SavePeriod - Evictor.<any>.<any>.SaveSizeTrigger - Evictor.<any>.<any>.StreamTimeout - Evictor.<any>.<any>.PopulateEmptyIndices + Evictor.<any>.MaxTxSize + Evictor.<any>.SavePeriod + Evictor.<any>.SaveSizeTrigger + Evictor.<any>.StreamTimeout + Evictor.<any>.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, "<any>", "*") + "\",\n") elif lang == "java": pattern = string.replace(entry, ".", "\\\\.") - pattern = string.replace(pattern, "<any>", "[^\\\\s.]+") + pattern = string.replace(pattern, "<any>", "[^\\\\s]+") file.write(" " + "\"^" + label + "\\\\." + pattern + "$\",\n") elif lang == "cs": pattern = string.replace(entry, ".", "\\.") - pattern = string.replace(pattern, "<any>", "[^\\s.]+") + pattern = string.replace(pattern, "<any>", "[^\\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 @@ </adapter> <properties> - <property name="IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="IcePatch2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.IcePatch2.Admin.RegisterProcess" value="1"/> <property name="IcePatch2.InstanceName" value="${instance-name}"/> <property name="IcePatch2.Directory" value="${directory}"/> </properties> @@ -44,10 +44,10 @@ <server id="${instance-name}" exe="glacier2router"> <properties> - <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/> - <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/> - <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.Glacier2.Client.Endpoints" value="${client-endpoints}"/> + <property name="Ice.OA.Glacier2.Server.Endpoints" value="${server-endpoints}"/> + <property name="Ice.OA.Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.RegisterProcess" value="1"/> <property name="Glacier2.InstanceName" value="${instance-name}"/> <property name="Glacier2.SessionTimeout" value="${session-timeout}"/> </properties> 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; } } @@ -695,12 +700,18 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica } // + // 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<string&>(_id) = instance->initializationData().properties->getProperty(name + ".AdapterId"); - const_cast<string&>(_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<string&>(_id) = properties->getPropertyWithDefault(_propertyPrefix + _name + ".AdapterId", + properties->getProperty(_name + ".AdapterId")); + const_cast<string&>(_replicaGroupId) = + properties->getPropertyWithDefault(_propertyPrefix + _name + ".ReplicaGroupId", + properties->getProperty(_name + ".ReplicaGroupId")); __setNoDelete(true); try { if(!router) { - const_cast<RouterPrx&>(router) = - RouterPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Router")); + const_cast<RouterPrx&>(router) = RouterPrx::uncheckedCast( + _instance->proxyFactory()->propertyToProxy(_propertyPrefix + _name + ".Router")); + if(!router) + { + const_cast<RouterPrx&>(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<EndpointIPtr> endpoints = parseEndpoints(endpointInfo); + vector<EndpointIPtr> endpoints; + if(endpointInfo.empty()) + { + endpoints = parseEndpoints(properties->getPropertyWithDefault(_propertyPrefix + _name + ".Endpoints", + properties->getProperty(_name + ".Endpoints"))); + } + else + { + endpoints = parseEndpoints(endpointInfo); + } for(vector<EndpointIPtr>::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 <Ice/ThreadPoolF.h> #include <Ice/Exception.h> #include <Ice/Process.h> +#include <Ice/BuiltinSequences.h> #include <list> namespace Ice @@ -96,6 +97,7 @@ private: static void checkIdentity(const Identity&); std::vector<IceInternal::EndpointIPtr> 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<ServiceInstanceHelper>::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 @@ <parameter name="manager"/> <server id="${id}" exe="${ice.dir}/bin/glacier2router"> - <property name="Glacier2.Client.Endpoints" value="${endpoints}"/> - <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.Glacier2.Client.Endpoints" value="${endpoints}"/> + <property name="Ice.OA.Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.RegisterProcess" value="1"/> <property name="Glacier2.SessionManager" value="${manager}"/> <property name="Glacier2.SSLSessionManager" value="IceGrid/SSLSessionManager"/> 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 @@ <object identity="${instance-name}/server" type="::IcePatch2::FileServer"/> </adapter> <properties> - <property name="IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="IcePatch2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.IcePatch2.Admin.RegisterProcess" value="1"/> <property name="IcePatch2.InstanceName" value="${instance-name}"/> <property name="IcePatch2.Directory" value="${directory}"/> </properties> 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 @@ <dbproperty name="set_flags" value="DB_TXN_NOSYNC"/> </dbenv> <property name="IceGrid.InstanceName" value="TestIceGrid"/> - <property name="IceGrid.Registry.Client.Endpoints" value="default -h 127.0.0.1 -p ${port}"/> - <property name="IceGrid.Registry.Server.Endpoints" value="default"/> - <property name="IceGrid.Registry.Internal.Endpoints" value="default"/> - <property name="IceGrid.Registry.SessionManager.Endpoints" value="default"/> + <property name="Ice.OA.IceGrid.Registry.Client.Endpoints" value="default -h 127.0.0.1 -p ${port}"/> + <property name="Ice.OA.IceGrid.Registry.Server.Endpoints" value="default"/> + <property name="Ice.OA.IceGrid.Registry.Internal.Endpoints" value="default"/> + <property name="Ice.OA.IceGrid.Registry.SessionManager.Endpoints" value="default"/> <property name="IceGrid.Registry.ReplicaName" value="${replicaName}"/> <property name="IceGrid.Registry.Data" value="${node.datadir}/servers/${server}/dbs/data"/> <property name="IceGrid.Registry.PermissionsVerifier" value="TestIceGrid/NullPermissionsVerifier"/> 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 @@ <parameter name="ssl-manager"/> <server id="${id}" exe="${ice.dir}/bin/glacier2router"> - <property name="Glacier2.Client.Endpoints" value="${endpoints}"/> - <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.Glacier2.Client.Endpoints" value="${endpoints}"/> + <property name="Ice.OA.Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.RegisterProcess" value="1"/> <property name="Glacier2.SessionManager" value="${manager}"/> <property name="Glacier2.SSLSessionManager" value="${ssl-manager}"/> 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"' diff --git a/cs/CHANGES b/cs/CHANGES index 7fb3a930f5e..bb42983c1c7 100644 --- a/cs/CHANGES +++ b/cs/CHANGES @@ -1,6 +1,12 @@ Changes since version 3.1.1 --------------------------- +- Object adapter properties are now prefixed by "Ice.OA.". For example, + "Ice.OA.<Adpater name>.Endpoints" instead of "<Adpater name>.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/cs/config/IceGridAdmin.py b/cs/config/IceGridAdmin.py index 0e6fa9e3313..203b1fcfa19 100644 --- a/cs/config/IceGridAdmin.py +++ b/cs/config/IceGridAdmin.py @@ -27,7 +27,7 @@ ice_home = os.environ['ICE_HOME'] 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' + \ @@ -41,9 +41,9 @@ nodeOptions = r' --Ice.Warn.Connections=0' + \ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.PermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ r' --IceGrid.Registry.AdminPermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ - 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' + \ @@ -67,7 +67,7 @@ def startIceGridRegistry(testdir, dynamicRegistration = False): print "starting icegrid registry...", command = iceGrid + TestUtil.cppClientServerOptions + ' --nowarn ' + registryOptions + \ - r' --IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \ + r' --Ice.OA.IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \ r' --IceGrid.Registry.Data=' + dataDir + \ r' --IceGrid.Registry.DefaultTemplates=' + os.path.join(ice_home, "config", "templates.xml") diff --git a/cs/demo/Glacier2/callback/config.client b/cs/demo/Glacier2/callback/config.client index 3a5f413680b..4bb252f4066 100644 --- a/cs/demo/Glacier2/callback/config.client +++ b/cs/demo/Glacier2/callback/config.client @@ -15,14 +15,14 @@ Ice.Default.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h # match the value of Glacier2.Client.Endpoints. # (The SSL endpoint is ignored with .NET 1.1.) # -Callback.Client.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1: ssl -p 10005 -h 127.0.0.1 +Ice.OA.Callback.Client.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1: ssl -p 10005 -h 127.0.0.1 # # We don't need any endpoints for the client if we use a # router. Incoming requests are received through connections # established from the client to the router. # -Callback.Client.Endpoints= +Ice.OA.Callback.Client.Endpoints= # # This must match the value of Callback.Server.Endpoints in diff --git a/cs/demo/Glacier2/callback/config.glacier2 b/cs/demo/Glacier2/callback/config.glacier2 index 1d3527e8445..0971540187f 100644 --- a/cs/demo/Glacier2/callback/config.glacier2 +++ b/cs/demo/Glacier2/callback/config.glacier2 @@ -15,7 +15,7 @@ Ice.ThreadPerConnection.StackSize=262144 # The client-visible endpoint of Glacier2. This should be an endpoint # visible from the public Internet, and it should be secure. # -Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1 +Ice.OA.Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1 # # The server-visible endpoint of Glacier2. This endpoint is only @@ -24,7 +24,7 @@ Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1 # on the loopback, so that the server is not directly accessible from # the Internet. # -Glacier2.Server.Endpoints=tcp -h 127.0.0.1 +Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1 # # The configures the session manager. If no external session manager diff --git a/cs/demo/Glacier2/callback/config.server b/cs/demo/Glacier2/callback/config.server index 78e95043136..033b969d997 100644 --- a/cs/demo/Glacier2/callback/config.server +++ b/cs/demo/Glacier2/callback/config.server @@ -4,7 +4,7 @@ # loopback, so that the server is not directly accessible from the # Internet. # -Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000 +Ice.OA.Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000 # # Warn about connection exceptions diff --git a/cs/demo/Glacier2/callback/config.sessionserver b/cs/demo/Glacier2/callback/config.sessionserver index d5329e88926..8bfd51c9b3f 100644 --- a/cs/demo/Glacier2/callback/config.sessionserver +++ b/cs/demo/Glacier2/callback/config.sessionserver @@ -4,7 +4,7 @@ # loopback, so that the session server is not directly accessible from # the Internet. # -SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001 +Ice.OA.SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001 # # Warn about connection exceptions diff --git a/cs/demo/Ice/async/config.server b/cs/demo/Ice/async/config.server index fd72066f5a5..c7d7b368b1b 100644 --- a/cs/demo/Ice/async/config.server +++ b/cs/demo/Ice/async/config.server @@ -3,7 +3,7 @@ # "Queue". The following line sets the endpoints for this # adapter. # -Queue.Endpoints=tcp -p 10000 +Ice.OA.Queue.Endpoints=tcp -p 10000 # # Warn about connection exceptions diff --git a/cs/demo/Ice/bidir/config.server b/cs/demo/Ice/bidir/config.server index 95b5cc10bb9..f71ed60c03c 100755 --- a/cs/demo/Ice/bidir/config.server +++ b/cs/demo/Ice/bidir/config.server @@ -1,4 +1,4 @@ -Callback.Server.Endpoints=tcp -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000
#
# Warn about connection exceptions
diff --git a/cs/demo/Ice/callback/config.client b/cs/demo/Ice/callback/config.client index 40f54c6a767..936c2b0ffd3 100644 --- a/cs/demo/Ice/callback/config.client +++ b/cs/demo/Ice/callback/config.client @@ -4,7 +4,7 @@ # (The ssl endpoints are ignored with .NET 1.1.) # Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001 -Callback.Client.Endpoints=tcp:udp:ssl +Ice.OA.Callback.Client.Endpoints=tcp:udp:ssl # # Warn about connection exceptions diff --git a/cs/demo/Ice/callback/config.server b/cs/demo/Ice/callback/config.server index 3987f9ac249..58ba6cb10fc 100644 --- a/cs/demo/Ice/callback/config.server +++ b/cs/demo/Ice/callback/config.server @@ -2,7 +2,7 @@ # The server listens at the following endpoints. (The SSL # endpoint is ignored with .NET 1.1.) # -Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +Ice.OA.Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions diff --git a/cs/demo/Ice/hello/config.server b/cs/demo/Ice/hello/config.server index 9662f9db910..4bf1d1b584d 100644 --- a/cs/demo/Ice/hello/config.server +++ b/cs/demo/Ice/hello/config.server @@ -3,7 +3,7 @@ # "Hello". The following line sets the endpoints for this # adapter. (The SSL endpoint is ignored with .NET 1.1.) # -Hello.Endpoints=tcp -p 10000:udp -c -p 10000:ssl -p 10001 +Ice.OA.Hello.Endpoints=tcp -p 10000:udp -c -p 10000:ssl -p 10001 # # Warn about connection exceptions. diff --git a/cs/demo/Ice/invoke/config.server b/cs/demo/Ice/invoke/config.server index 693d0c89d21..a44665f4cad 100644 --- a/cs/demo/Ice/invoke/config.server +++ b/cs/demo/Ice/invoke/config.server @@ -3,7 +3,7 @@ # "helloadapater". The following line sets the endpoints for this # adapter # -Printer.Endpoints=tcp -p 10000:udp -p 10000 +Ice.OA.Printer.Endpoints=tcp -p 10000:udp -p 10000 # # Warn about connection exceptions diff --git a/cs/demo/Ice/latency/config.server b/cs/demo/Ice/latency/config.server index 6d82f1a7f2e..33cbd33492e 100644 --- a/cs/demo/Ice/latency/config.server +++ b/cs/demo/Ice/latency/config.server @@ -1 +1 @@ -Latency.Endpoints=default -p 10000 -h 127.0.0.1 +Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1 diff --git a/cs/demo/Ice/nested/config.client b/cs/demo/Ice/nested/config.client index a895324d0b5..cc7b8c0a0fb 100644 --- a/cs/demo/Ice/nested/config.client +++ b/cs/demo/Ice/nested/config.client @@ -1,5 +1,5 @@ Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000 -Nested.Client.Endpoints=default -t 10000 +Ice.OA.Nested.Client.Endpoints=default -t 10000 Ice.ThreadPool.Server.Size=5 Ice.ThreadPool.Server.SizeWarn=5 diff --git a/cs/demo/Ice/nested/config.server b/cs/demo/Ice/nested/config.server index e0073284155..87c9057ed0d 100644 --- a/cs/demo/Ice/nested/config.server +++ b/cs/demo/Ice/nested/config.server @@ -1,4 +1,4 @@ -Nested.Server.Endpoints=default -p 10000 -t 10000 +Ice.OA.Nested.Server.Endpoints=default -p 10000 -t 10000 Ice.ThreadPool.Server.Size=5 Ice.ThreadPool.Server.SizeWarn=5 diff --git a/cs/demo/Ice/session/config.server b/cs/demo/Ice/session/config.server index 8aa8dfac36f..2731a988e56 100755 --- a/cs/demo/Ice/session/config.server +++ b/cs/demo/Ice/session/config.server @@ -3,7 +3,7 @@ # "SessionFactory". The following line sets the endpoints for this # adapter. # -SessionFactory.Endpoints=default -p 10000 +Ice.OA.SessionFactory.Endpoints=default -p 10000 # # Warn about connection exceptions diff --git a/cs/demo/Ice/throughput/config.server b/cs/demo/Ice/throughput/config.server index dec5cfe8eb9..70da150f767 100644 --- a/cs/demo/Ice/throughput/config.server +++ b/cs/demo/Ice/throughput/config.server @@ -1 +1 @@ -Throughput.Endpoints=default -p 10000 -h 127.0.0.1 +Ice.OA.Throughput.Endpoints=default -p 10000 -h 127.0.0.1 diff --git a/cs/demo/Ice/value/config.server b/cs/demo/Ice/value/config.server index 8f2cf355ffc..52e81b9e331 100644 --- a/cs/demo/Ice/value/config.server +++ b/cs/demo/Ice/value/config.server @@ -1 +1 @@ -Value.Endpoints=default -p 10000 +Ice.OA.Value.Endpoints=default -p 10000 diff --git a/cs/demo/IceBox/hello/config.icebox b/cs/demo/IceBox/hello/config.icebox index 2fb767f56fb..484c25d8947 100644 --- a/cs/demo/IceBox/hello/config.icebox +++ b/cs/demo/IceBox/hello/config.icebox @@ -4,7 +4,7 @@ IceBox.InstanceName=DemoIceBox # The IceBox server endpoint configuration. (The SSL # endpoint is ignored with .NET 1.1.) # -IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 +Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 # # The hello service @@ -16,7 +16,7 @@ IceBox.Service.Hello=helloservice.dll:HelloServiceI # the service. The following line sets the endpoints for this # adapter. (The SSL endpoint is ignored with .NET 1.1.) # -Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions diff --git a/cs/demo/IceGrid/allocate/config.grid b/cs/demo/IceGrid/allocate/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cs/demo/IceGrid/allocate/config.grid +++ b/cs/demo/IceGrid/allocate/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cs/demo/IceGrid/sessionActivation/config.grid b/cs/demo/IceGrid/sessionActivation/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cs/demo/IceGrid/sessionActivation/config.grid +++ b/cs/demo/IceGrid/sessionActivation/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cs/demo/IceGrid/simple/config.grid b/cs/demo/IceGrid/simple/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cs/demo/IceGrid/simple/config.grid +++ b/cs/demo/IceGrid/simple/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox index 07fb2e3cb6c..cd05e35ff37 100644 --- a/cs/demo/IceStorm/clock/config.icebox +++ b/cs/demo/IceStorm/clock/config.icebox @@ -1,7 +1,7 @@ # # The IceBox server endpoint configuration # -IceBox.ServiceManager.Endpoints=tcp -p 9998 +Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service diff --git a/cs/demo/IceStorm/clock/config.service b/cs/demo/IceStorm/clock/config.service index 539369861b0..4f1edc9ad3f 100644 --- a/cs/demo/IceStorm/clock/config.service +++ b/cs/demo/IceStorm/clock/config.service @@ -7,7 +7,7 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000 # This property defines the endpoints on which the IceStorm # TopicManager listens. # -IceStorm.TopicManager.Endpoints=default -p 10000 +Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000 # # The IceStorm service instance name. @@ -20,7 +20,7 @@ IceStorm.InstanceName=DemoIceStorm # IceStorm instances this must run on a fixed port (or use # IceGrid). # -IceStorm.Publish.Endpoints=default -p 10001 +Ice.OA.IceStorm.Publish.Endpoints=default -p 10001 # # TopicManager Tracing diff --git a/cs/demo/IceStorm/clock/config.sub b/cs/demo/IceStorm/clock/config.sub index d383e34e641..cb6b50d94f0 100644 --- a/cs/demo/IceStorm/clock/config.sub +++ b/cs/demo/IceStorm/clock/config.sub @@ -2,7 +2,7 @@ # This property is used to configure the endpoints of the clock # subscriber adapter. # -Clock.Subscriber.Endpoints=tcp +Ice.OA.Clock.Subscriber.Endpoints=tcp # # This property is used by the clients to connect to IceStorm. diff --git a/cs/src/Ice/CommunicatorI.cs b/cs/src/Ice/CommunicatorI.cs index 3f94dddfd42..c2b5f744426 100755 --- a/cs/src/Ice/CommunicatorI.cs +++ b/cs/src/Ice/CommunicatorI.cs @@ -54,7 +54,7 @@ namespace Ice public ObjectAdapter createObjectAdapter(string name) { - return createObjectAdapterWithEndpoints(name, getProperties().getProperty(name + ".Endpoints")); + return instance_.objectAdapterFactory().createObjectAdapter(name, "", null); } public ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints) diff --git a/cs/src/Ice/ObjectAdapterI.cs b/cs/src/Ice/ObjectAdapterI.cs index e2657eb31cb..a50898f9fb4 100755 --- a/cs/src/Ice/ObjectAdapterI.cs +++ b/cs/src/Ice/ObjectAdapterI.cs @@ -69,7 +69,12 @@ namespace Ice if(!_noConfig) { Properties properties = instance_.initializationData().properties; - registerProcess = properties.getPropertyAsInt(_name + ".RegisterProcess") > 0; + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + registerProcess = properties.getPropertyAsIntWithDefault( + _propertyPrefix + _name + ".RegisterProcess", + properties.getPropertyAsInt(_name + ".RegisterProcess")) > 0; printAdapterReady = properties.getPropertyAsInt("Ice.PrintAdapterReady") > 0; } } @@ -715,27 +720,51 @@ namespace Ice } // + // DEPRECATED PROPERTIES: Remove extra code in future release. + // + + // // Make sure named adapter has configuration. // + Properties properties = instance_.initializationData().properties; + string[] oldProps = filterProperties(_name + "."); if(endpointInfo.Length == 0 && router == null) { - PropertyDict oaProps = instance.initializationData().properties.getPropertiesForPrefix(_name + "."); - if(oaProps.Count == 0) + string[] props = filterProperties(_propertyPrefix + _name + "."); + if(props.Length == 0 && oldProps.Length == 0) { InitializationException ex = new InitializationException(); ex.reason = "Object adapter \"" + _name + "\" requires configuration."; throw ex; } } + + if(oldProps.Length != 0) + { + string message = "The following properties have been deprecated, please prepend \"Ice.OA.\":"; + for(int i = 0; i < oldProps.Length; ++i) + { + message += "\n " + oldProps[i]; + } + instance_.initializationData().logger.warning(message); + } - _id = instance.initializationData().properties.getProperty(name + ".AdapterId"); - _replicaGroupId = instance.initializationData().properties.getProperty(name + ".ReplicaGroupId"); + _id = properties.getPropertyWithDefault(_propertyPrefix + _name + ".AdapterId", + properties.getProperty(_name + ".AdapterId")); + _replicaGroupId = properties.getPropertyWithDefault(_propertyPrefix + _name + ".ReplicaGroupId", + properties.getProperty(_name + ".ReplicaGroupId")); try { if(router == null) { - router = RouterPrxHelper.uncheckedCast(instance_.proxyFactory().propertyToProxy(name + ".Router")); + router = RouterPrxHelper.uncheckedCast( + instance_.proxyFactory().propertyToProxy(_propertyPrefix + _name + ".Router")); + if(router == null) + { + router = RouterPrxHelper.uncheckedCast( + instance_.proxyFactory().propertyToProxy(_name + ".Router")); + } } if(router != null) { @@ -804,7 +833,17 @@ namespace Ice // The connection factory might change it, for example, to // fill in the real port number. // - ArrayList endpoints = parseEndpoints(endpointInfo); + ArrayList endpoints; + if(endpointInfo.Length == 0) + { + endpoints = parseEndpoints(properties.getPropertyWithDefault( + _propertyPrefix + _name + ".Endpoints", + properties.getProperty(_name + ".Endpoints"))); + } + else + { + endpoints = parseEndpoints(endpointInfo); + } for(int i = 0; i < endpoints.Count; ++i) { IceInternal.EndpointI endp = (IceInternal.EndpointI)endpoints[i]; @@ -817,7 +856,7 @@ namespace Ice if(tl.network >= 2) { instance_.initializationData().logger.trace(tl.networkCat, - "created adapter `" + name + "' without endpoints"); + "created adapter `" + _name + "' without endpoints"); } } @@ -825,7 +864,8 @@ namespace Ice // 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.Count == 0) { @@ -849,12 +889,17 @@ namespace Ice _publishedEndpoints = tmp; } - string locatorProperty = name + ".Locator"; - if(instance_.initializationData().properties.getProperty(locatorProperty).Length > 0) + string locatorProperty = _propertyPrefix + _name + ".Locator"; + if(properties.getProperty(locatorProperty).Length > 0) { setLocator(LocatorPrxHelper.uncheckedCast( instance_.proxyFactory().propertyToProxy(locatorProperty))); } + else if(properties.getProperty(_name + ".Locator").Length > 0) + { + setLocator(LocatorPrxHelper.uncheckedCast( + instance_.proxyFactory().propertyToProxy(_name + ".Locator"))); + } else { setLocator(instance_.referenceFactory().getDefaultLocator()); @@ -862,12 +907,26 @@ namespace Ice 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").Length != 0 || + properties.getProperty(_propertyPrefix + _name + ".ThreadPool.SizeMax").Length != 0) + { + int size = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.Size"); + int sizeMax = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.SizeMax"); + if(size > 0 || sizeMax > 0) + { + _threadPool = + new IceInternal.ThreadPool(instance_, _propertyPrefix + _name + ".ThreadPool", 0); + } + } + else { - _threadPool = new IceInternal.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 IceInternal.ThreadPool(instance_, _name + ".ThreadPool", 0); + } } } } @@ -1168,6 +1227,37 @@ namespace Ice } } + static private readonly string[] _suffixes = + { + "AdapterId", + "Endpoints", + "Locator", + "PublishedEndpoints", + "RegisterProcess", + "ReplicaGroupId", + "Router", + "ThreadPool.Size", + "ThreadPool.SizeMax", + "ThreadPool.SizeWarn", + "ThreadPool.StackSize" + }; + + private string[] + filterProperties(string prefix) + { + ArrayList propertySet = new ArrayList(); + PropertyDict props = instance_.initializationData().properties.getPropertiesForPrefix(prefix); + for(int i = 0; i < _suffixes.Length; ++i) + { + if(props.Contains(prefix + _suffixes[i])) + { + propertySet.Add(prefix + _suffixes[i]); + } + } + + return (string[])propertySet.ToArray(typeof(string)); + } + private sealed class ProcessI : ProcessDisp_ { public ProcessI(Communicator communicator) @@ -1220,6 +1310,6 @@ namespace Ice private bool _waitForActivate; private bool _waitForDeactivate; private bool _noConfig; + static private string _propertyPrefix = "Ice.OA."; } - } diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs index 34b02d34f6a..88acc2f65fd 100644 --- a/cs/src/Ice/PropertyNames.cs +++ b/cs/src/Ice/PropertyNames.cs @@ -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! @@ -52,12 +52,23 @@ namespace IceInternal @"^Ice\.MonitorConnections$", @"^Ice\.Nohup$", @"^Ice\.NullHandleAbort$", + @"^Ice\.OA\.[^\s]+\.AdapterId$", + @"^Ice\.OA\.[^\s]+\.Endpoints$", + @"^Ice\.OA\.[^\s]+\.Locator$", + @"^Ice\.OA\.[^\s]+\.PublishedEndpoints$", + @"^Ice\.OA\.[^\s]+\.RegisterProcess$", + @"^Ice\.OA\.[^\s]+\.ReplicaGroupId$", + @"^Ice\.OA\.[^\s]+\.Router$", + @"^Ice\.OA\.[^\s]+\.ThreadPool\.Size$", + @"^Ice\.OA\.[^\s]+\.ThreadPool\.SizeMax$", + @"^Ice\.OA\.[^\s]+\.ThreadPool\.SizeWarn$", + @"^Ice\.OA\.[^\s]+\.ThreadPool\.StackSize$", @"^Ice\.Override\.Compress$", @"^Ice\.Override\.ConnectTimeout$", @"^Ice\.Override\.Timeout$", @"^Ice\.Override\.Secure$", - @"^Ice\.Package\.[^\s.]+$", - @"^Ice\.Plugin\.[^\s.]+$", + @"^Ice\.Package\.[^\s]+$", + @"^Ice\.Plugin\.[^\s]+$", @"^Ice\.PluginLoadOrder$", @"^Ice\.PrintAdapterReady$", @"^Ice\.PrintProcessId$", @@ -101,7 +112,7 @@ namespace IceInternal @"^IceBox\.InstanceName$", @"^IceBox\.LoadOrder$", @"^IceBox\.PrintServicesReady$", - @"^IceBox\.Service\.[^\s.]+$", + @"^IceBox\.Service\.[^\s]+$", @"^IceBox\.ServiceManager\.AdapterId$", @"^IceBox\.ServiceManager\.ReplicaGroupId$", @"^IceBox\.ServiceManager\.Endpoints$", @@ -111,7 +122,7 @@ namespace IceInternal @"^IceBox\.ServiceManager\.ThreadPool\.SizeMax$", @"^IceBox\.ServiceManager\.ThreadPool\.SizeWarn$", @"^IceBox\.ServiceManager\.ThreadPool\.StackSize$", - @"^IceBox\.UseSharedCommunicator\.[^\s.]+$", + @"^IceBox\.UseSharedCommunicator\.[^\s]+$", null }; @@ -253,10 +264,10 @@ namespace IceInternal @"^IceSSL\.CheckCRL$", @"^IceSSL\.Ciphers$", @"^IceSSL\.DefaultDir$", - @"^IceSSL\.DH\.[^\s.]+$", + @"^IceSSL\.DH\.[^\s]+$", @"^IceSSL\.EntropyDaemon$", - @"^IceSSL\.FindCert\.[^\s.]+\.[^\s.]+$", - @"^IceSSL\.ImportCert\.[^\s.]+\.[^\s.]+$", + @"^IceSSL\.FindCert\.[^\s]+$", + @"^IceSSL\.ImportCert\.[^\s]+$", @"^IceSSL\.KeyFile$", @"^IceSSL\.Keystore$", @"^IceSSL\.KeystorePassword$", @@ -274,7 +285,7 @@ namespace IceInternal @"^IceSSL\.TrustOnly$", @"^IceSSL\.TrustOnly\.Client$", @"^IceSSL\.TrustOnly\.Server$", - @"^IceSSL\.TrustOnly\.Server\.[^\s.]+$", + @"^IceSSL\.TrustOnly\.Server\.[^\s]+$", null }; @@ -392,17 +403,17 @@ namespace IceInternal public static string[] FreezeProps = { - @"^Freeze\.DbEnv\.[^\s.]+\.CheckpointPeriod$", - @"^Freeze\.DbEnv\.[^\s.]+\.DbHome$", - @"^Freeze\.DbEnv\.[^\s.]+\.DbPrivate$", - @"^Freeze\.DbEnv\.[^\s.]+\.DbRecoverFatal$", - @"^Freeze\.DbEnv\.[^\s.]+\.OldLogsAutoDelete$", - @"^Freeze\.DbEnv\.[^\s.]+\.PeriodicCheckpointMinSize$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.MaxTxSize$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.SavePeriod$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.SaveSizeTrigger$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.StreamTimeout$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.PopulateEmptyIndices$", + @"^Freeze\.DbEnv\.[^\s]+\.CheckpointPeriod$", + @"^Freeze\.DbEnv\.[^\s]+\.DbHome$", + @"^Freeze\.DbEnv\.[^\s]+\.DbPrivate$", + @"^Freeze\.DbEnv\.[^\s]+\.DbRecoverFatal$", + @"^Freeze\.DbEnv\.[^\s]+\.OldLogsAutoDelete$", + @"^Freeze\.DbEnv\.[^\s]+\.PeriodicCheckpointMinSize$", + @"^Freeze\.Evictor\.[^\s]+\.MaxTxSize$", + @"^Freeze\.Evictor\.[^\s]+\.SavePeriod$", + @"^Freeze\.Evictor\.[^\s]+\.SaveSizeTrigger$", + @"^Freeze\.Evictor\.[^\s]+\.StreamTimeout$", + @"^Freeze\.Evictor\.[^\s]+\.PopulateEmptyIndices$", @"^Freeze\.Evictor\.UseNonmutating$", @"^Freeze\.Trace\.DbEnv$", @"^Freeze\.Trace\.Evictor$", diff --git a/cs/test/Glacier2/attack/Server.cs b/cs/test/Glacier2/attack/Server.cs index 40bd0be82b0..256bb44ce99 100644 --- a/cs/test/Glacier2/attack/Server.cs +++ b/cs/test/Glacier2/attack/Server.cs @@ -37,7 +37,7 @@ class Server : Ice.Application { public override int run(string[] args) { - communicator().getProperties().setProperty("BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("BackendAdapter"); adapter.addServantLocator(new ServantLocatorI(), ""); adapter.activate(); diff --git a/cs/test/Glacier2/attack/run.py b/cs/test/Glacier2/attack/run.py index fbadcee93e0..48fb18554b8 100755 --- a/cs/test/Glacier2/attack/run.py +++ b/cs/test/Glacier2/attack/run.py @@ -31,8 +31,8 @@ router = os.path.join(ice_home, "bin", "glacier2router") command = router + TestUtil.cppClientServerOptions + \ r' --Ice.PrintProcessId' \ 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/cs/test/Glacier2/router/Server.cs b/cs/test/Glacier2/router/Server.cs index 0a3cb67036a..ab1cbbba6ae 100644 --- a/cs/test/Glacier2/router/Server.cs +++ b/cs/test/Glacier2/router/Server.cs @@ -13,7 +13,7 @@ public class Server : Ice.Application { public override int run(string[] args) { - communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py index d830b6b0514..0939f538011 100755 --- a/cs/test/Glacier2/router/run.py +++ b/cs/test/Glacier2/router/run.py @@ -34,9 +34,9 @@ command = router + TestUtil.cppClientServerOptions + \ 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/cs/test/Ice/adapterDeactivation/Collocated.cs b/cs/test/Ice/adapterDeactivation/Collocated.cs index 07e119ecabe..d5802776d45 100755 --- a/cs/test/Ice/adapterDeactivation/Collocated.cs +++ b/cs/test/Ice/adapterDeactivation/Collocated.cs @@ -15,7 +15,7 @@ public class Collocated { public override int run(string[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); diff --git a/cs/test/Ice/adapterDeactivation/Server.cs b/cs/test/Ice/adapterDeactivation/Server.cs index 2f5cc80f864..9cfc66909dd 100755 --- a/cs/test/Ice/adapterDeactivation/Server.cs +++ b/cs/test/Ice/adapterDeactivation/Server.cs @@ -13,7 +13,7 @@ public class Server { public override int run(string[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); diff --git a/cs/test/Ice/binding/RemoteCommunicatorI.cs b/cs/test/Ice/binding/RemoteCommunicatorI.cs index eafc1aa4043..c22235c3707 100644 --- a/cs/test/Ice/binding/RemoteCommunicatorI.cs +++ b/cs/test/Ice/binding/RemoteCommunicatorI.cs @@ -15,7 +15,7 @@ public class RemoteCommunicatorI : RemoteCommunicatorDisp_ createObjectAdapter(string name, string endpoints, Ice.Current current) { Ice.Communicator com = current.adapter.getCommunicator(); - com.getProperties().setProperty(name + ".ThreadPool.Size", "1"); + com.getProperties().setProperty("Ice.OA." + name + ".ThreadPool.Size", "1"); Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, endpoints); return RemoteObjectAdapterPrxHelper.uncheckedCast( current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter))); diff --git a/cs/test/Ice/binding/Server.cs b/cs/test/Ice/binding/Server.cs index 9c6a5f6b282..2fd4fede356 100755 --- a/cs/test/Ice/binding/Server.cs +++ b/cs/test/Ice/binding/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); diff --git a/cs/test/Ice/checksum/server/Server.cs b/cs/test/Ice/checksum/server/Server.cs index 80de1224a55..e9919705a16 100755 --- a/cs/test/Ice/checksum/server/Server.cs +++ b/cs/test/Ice/checksum/server/Server.cs @@ -13,7 +13,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new Test.ChecksumI(adapter); adapter.add(@object, communicator.stringToIdentity("test")); diff --git a/cs/test/Ice/exceptions/AllTests.cs b/cs/test/Ice/exceptions/AllTests.cs index 1301d38f7f4..c3dec48c091 100755 --- a/cs/test/Ice/exceptions/AllTests.cs +++ b/cs/test/Ice/exceptions/AllTests.cs @@ -676,7 +676,7 @@ public class AllTests // Expected } - communicator.getProperties().setProperty("TestAdapter0.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter0.Endpoints", "default"); first = communicator.createObjectAdapter("TestAdapter0"); try { @@ -703,14 +703,14 @@ public class AllTests { // Expected } - test(communicator.getProperties().getProperty("TestAdapter0.Endpoints").Equals("default")); + test(communicator.getProperties().getProperty("Ice.OA.TestAdapter0.Endpoints").Equals("default")); first.deactivate(); Console.WriteLine("ok"); } { Console.Write("testing servant registration exceptions... "); - communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter1.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1"); Ice.Object obj = new EmptyI(); adapter.add(obj, communicator.stringToIdentity("x")); @@ -738,7 +738,7 @@ public class AllTests { Console.Write("testing servant locator registration exceptions... "); - communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter2"); Ice.ServantLocator loc = new ServantLocatorI(); adapter.addServantLocator(loc, "x"); diff --git a/cs/test/Ice/exceptions/Collocated.cs b/cs/test/Ice/exceptions/Collocated.cs index d2141318b3d..15a983dc1b6 100755 --- a/cs/test/Ice/exceptions/Collocated.cs +++ b/cs/test/Ice/exceptions/Collocated.cs @@ -12,7 +12,7 @@ public class Collocated private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new ThrowerI(adapter); adapter.add(obj, communicator.stringToIdentity("thrower")); diff --git a/cs/test/Ice/exceptions/Server.cs b/cs/test/Ice/exceptions/Server.cs index fd4e8916410..0a696111a7d 100755 --- a/cs/test/Ice/exceptions/Server.cs +++ b/cs/test/Ice/exceptions/Server.cs @@ -33,7 +33,7 @@ public class Server Ice.Properties properties = communicator.getProperties(); // We don't need to disable warnings because we have a dummy logger. //properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new ThrowerI(adapter); adapter.add(@object, communicator.stringToIdentity("thrower")); diff --git a/cs/test/Ice/facets/AllTests.cs b/cs/test/Ice/facets/AllTests.cs index b0ff31b165c..6e8027acda6 100755 --- a/cs/test/Ice/facets/AllTests.cs +++ b/cs/test/Ice/facets/AllTests.cs @@ -23,7 +23,7 @@ public class AllTests public static GPrx allTests(Ice.Communicator communicator) { Console.Write("testing facet registration exceptions... "); - communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter"); Ice.Object obj = new EmptyI(); adapter.add(obj, communicator.stringToIdentity("d")); diff --git a/cs/test/Ice/facets/Collocated.cs b/cs/test/Ice/facets/Collocated.cs index 29a24de16da..aa84bb58d08 100755 --- a/cs/test/Ice/facets/Collocated.cs +++ b/cs/test/Ice/facets/Collocated.cs @@ -11,7 +11,7 @@ public class Collocated { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/cs/test/Ice/facets/Server.cs b/cs/test/Ice/facets/Server.cs index f18dcfcafa1..1be531133a7 100755 --- a/cs/test/Ice/facets/Server.cs +++ b/cs/test/Ice/facets/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/cs/test/Ice/faultTolerance/Server.cs b/cs/test/Ice/faultTolerance/Server.cs index 51a2f633fe7..4d0e30e8c5e 100755 --- a/cs/test/Ice/faultTolerance/Server.cs +++ b/cs/test/Ice/faultTolerance/Server.cs @@ -52,7 +52,7 @@ public class Server return 1; } - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p " + port + ":udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(adapter); adapter.add(obj, communicator.stringToIdentity("test")); diff --git a/cs/test/Ice/hold/Server.cs b/cs/test/Ice/hold/Server.cs index 02f7034555b..00e960a38f0 100644 --- a/cs/test/Ice/hold/Server.cs +++ b/cs/test/Ice/hold/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator 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.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new HoldI(), communicator.stringToIdentity("hold")); adapter.activate(); diff --git a/cs/test/Ice/inheritance/Collocated.cs b/cs/test/Ice/inheritance/Collocated.cs index ed01a2cc2b7..13533733f88 100755 --- a/cs/test/Ice/inheritance/Collocated.cs +++ b/cs/test/Ice/inheritance/Collocated.cs @@ -12,7 +12,7 @@ public class Collocated private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new InitialI(adapter); adapter.add(obj, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/inheritance/Server.cs b/cs/test/Ice/inheritance/Server.cs index 72f0c2f56f5..4928176493d 100755 --- a/cs/test/Ice/inheritance/Server.cs +++ b/cs/test/Ice/inheritance/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); adapter.add(@object, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/location/Server.cs b/cs/test/Ice/location/Server.cs index bc19ac0b5fb..6a12a8de3be 100755 --- a/cs/test/Ice/location/Server.cs +++ b/cs/test/Ice/location/Server.cs @@ -19,7 +19,7 @@ public class Server // Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.ThreadPool.Server.Size", "2"); - properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp"); + properties.setProperty("Ice.OA.ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter"); diff --git a/cs/test/Ice/location/ServerManagerI.cs b/cs/test/Ice/location/ServerManagerI.cs index 5e5e9ab636d..241add27aa0 100755 --- a/cs/test/Ice/location/ServerManagerI.cs +++ b/cs/test/Ice/location/ServerManagerI.cs @@ -19,11 +19,11 @@ public class ServerManagerI : ServerManagerDisp_ _registry = registry; _communicators = new ArrayList();
_initData = initData;
- _initData.properties.setProperty("TestAdapter.Endpoints", "default");
- _initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
- _initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
- _initData.properties.setProperty("TestAdapter2.Endpoints", "default");
- _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
+ _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("Ice.OA.TestAdapter2.Endpoints", "default");
+ _initData.properties.setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2");
} public override void startServer(Ice.Current current) diff --git a/cs/test/Ice/objects/Collocated.cs b/cs/test/Ice/objects/Collocated.cs index 060b17a0152..efaba31354f 100755 --- a/cs/test/Ice/objects/Collocated.cs +++ b/cs/test/Ice/objects/Collocated.cs @@ -14,7 +14,7 @@ public class Client private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); adapter.add(initial, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/objects/Server.cs b/cs/test/Ice/objects/Server.cs index 157b5578d7a..81788bb95dd 100755 --- a/cs/test/Ice/objects/Server.cs +++ b/cs/test/Ice/objects/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); adapter.add(@object, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/operations/Collocated.cs b/cs/test/Ice/operations/Collocated.cs index 338f68eb64b..ad893001941 100755 --- a/cs/test/Ice/operations/Collocated.cs +++ b/cs/test/Ice/operations/Collocated.cs @@ -13,7 +13,7 @@ public class Collocated { private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("test"); adapter.add(new MyDerivedClassI(adapter, id), id); diff --git a/cs/test/Ice/operations/Server.cs b/cs/test/Ice/operations/Server.cs index d9f817f7fa8..125bcc6a845 100755 --- a/cs/test/Ice/operations/Server.cs +++ b/cs/test/Ice/operations/Server.cs @@ -18,7 +18,7 @@ public class Server // communicator.getProperties().setProperty("Ice.Warn.Connections", "0"); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("test"); adapter.add(new MyDerivedClassI(adapter, id), id); diff --git a/cs/test/Ice/retry/Server.cs b/cs/test/Ice/retry/Server.cs index 26b55404e4a..b95c1f64b03 100644 --- a/cs/test/Ice/retry/Server.cs +++ b/cs/test/Ice/retry/Server.cs @@ -13,7 +13,7 @@ public class Server { public static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new RetryI(), communicator.stringToIdentity("retry")); adapter.activate(); diff --git a/cs/test/Ice/slicing/exceptions/Server.cs b/cs/test/Ice/slicing/exceptions/Server.cs index 62c4aa7568c..428ab61fbe7 100755 --- a/cs/test/Ice/slicing/exceptions/Server.cs +++ b/cs/test/Ice/slicing/exceptions/Server.cs @@ -13,7 +13,7 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new TestI(adapter); adapter.add(@object, communicator.stringToIdentity("Test")); diff --git a/cs/test/Ice/slicing/objects/Server.cs b/cs/test/Ice/slicing/objects/Server.cs index a6f678f73cf..76e901258a8 100755 --- a/cs/test/Ice/slicing/objects/Server.cs +++ b/cs/test/Ice/slicing/objects/Server.cs @@ -13,7 +13,7 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(adapter); adapter.add(obj, communicator.stringToIdentity("Test")); diff --git a/cs/test/Ice/timeout/Server.cs b/cs/test/Ice/timeout/Server.cs index 77f934cfcb3..28a88ec7092 100644 --- a/cs/test/Ice/timeout/Server.cs +++ b/cs/test/Ice/timeout/Server.cs @@ -13,7 +13,7 @@ public class Server { public static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new TimeoutI(), communicator.stringToIdentity("timeout")); adapter.activate(); diff --git a/cs/test/IceGrid/simple/run.py b/cs/test/IceGrid/simple/run.py index e47e4137ea8..4e190bf017c 100755 --- a/cs/test/IceGrid/simple/run.py +++ b/cs/test/IceGrid/simple/run.py @@ -31,7 +31,8 @@ testdir = os.path.join(toplevel, "test", name) # # 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/java/CHANGES b/java/CHANGES index ba6abda0f6d..3174121a5c1 100644 --- a/java/CHANGES +++ b/java/CHANGES @@ -1,6 +1,12 @@ Changes since version 3.1.1 --------------------------- +- Object adapter properties are now prefixed by "Ice.OA.". For example, + "Ice.OA.<Adpater name>.Endpoints" instead of "<Adpater name>.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/java/config/IceGridAdmin.py b/java/config/IceGridAdmin.py index 13b17fabb85..2bce88b5f8f 100644 --- a/java/config/IceGridAdmin.py +++ b/java/config/IceGridAdmin.py @@ -30,7 +30,7 @@ ice_home = os.environ['ICE_HOME'] 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' + \ @@ -44,9 +44,9 @@ nodeOptions = r' --Ice.Warn.Connections=0' + \ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.PermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ r' --IceGrid.Registry.AdminPermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ - 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.Adapter=0' + \ @@ -69,7 +69,7 @@ def startIceGridRegistry(testdir, dynamicRegistration = False): print "starting icegrid registry...", command = iceGrid + TestUtil.cppClientServerOptions + ' --nowarn ' + registryOptions + \ - r' --IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \ + r' --Ice.OA.IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \ r' --IceGrid.Registry.Data=' + dataDir + \ r' --IceGrid.Registry.DefaultTemplates=' + os.path.join(ice_home, "config", "templates.xml") diff --git a/java/demo/Freeze/library/config.collocated b/java/demo/Freeze/library/config.collocated index ddcc878f677..3d0c4326d7f 100644 --- a/java/demo/Freeze/library/config.collocated +++ b/java/demo/Freeze/library/config.collocated @@ -1,5 +1,5 @@ Library.Proxy=library:default -p 10000 -Library.Endpoints=default -p 10000 +Ice.OA.Library.Endpoints=default -p 10000 Library.EvictorSize=3 Freeze.Trace.Map=1 diff --git a/java/demo/Freeze/library/config.server b/java/demo/Freeze/library/config.server index 2a0e997bbf6..ec6edf4a0e0 100644 --- a/java/demo/Freeze/library/config.server +++ b/java/demo/Freeze/library/config.server @@ -1,4 +1,4 @@ -Library.Endpoints=default -p 10000 +Ice.OA.Library.Endpoints=default -p 10000 Library.EvictorSize=3 Freeze.Trace.Map=1 diff --git a/java/demo/Freeze/phonebook/config.collocated b/java/demo/Freeze/phonebook/config.collocated index 311adc0d6dd..31ceed6c126 100644 --- a/java/demo/Freeze/phonebook/config.collocated +++ b/java/demo/Freeze/phonebook/config.collocated @@ -3,7 +3,7 @@ Freeze.Trace.DbEnv=1 Freeze.Evictor.db.contacts.SavePeriod=10000 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1 -PhoneBook.Endpoints=default -p 10000 +Ice.OA.PhoneBook.Endpoints=default -p 10000 PhoneBook.Proxy=phonebook:default -p 10000 PhoneBook.EvictorSize=3 diff --git a/java/demo/Freeze/phonebook/config.server b/java/demo/Freeze/phonebook/config.server index 861014c3a8b..db1c084ad28 100644 --- a/java/demo/Freeze/phonebook/config.server +++ b/java/demo/Freeze/phonebook/config.server @@ -3,7 +3,7 @@ Freeze.Trace.DbEnv=1 Freeze.Evictor.db.contacts.SavePeriod=10000 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1 -PhoneBook.Endpoints=default -p 10000 +Ice.OA.PhoneBook.Endpoints=default -p 10000 PhoneBook.EvictorSize=3 # diff --git a/java/demo/Glacier2/callback/config.client b/java/demo/Glacier2/callback/config.client index 0e261c0c2db..55a3e950354 100644 --- a/java/demo/Glacier2/callback/config.client +++ b/java/demo/Glacier2/callback/config.client @@ -9,14 +9,14 @@ Ice.Default.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 # object adapter named Callback.Client. This router proxy must # match the value of Glacier2.Client.Endpoints. # -Callback.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 +Ice.OA.Callback.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 # # We don't need any endpoints for the client if we use a # router. Incoming requests are received through connections # established from the client to the router. # -Callback.Client.Endpoints= +Ice.OA.Callback.Client.Endpoints= # # This must match the value of Callback.Server.Endpoints in diff --git a/java/demo/Glacier2/callback/config.glacier2 b/java/demo/Glacier2/callback/config.glacier2 index be7d46ea2d4..64060c57b05 100644 --- a/java/demo/Glacier2/callback/config.glacier2 +++ b/java/demo/Glacier2/callback/config.glacier2 @@ -15,7 +15,7 @@ Ice.ThreadPerConnection.StackSize=262144 # The client-visible endpoint of Glacier2. This should be an endpoint # visible from the public Internet, and it should be secure. # -Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1 +Ice.OA.Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1 # # The server-visible endpoint of Glacier2. This endpoint is only @@ -24,7 +24,7 @@ Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1 # on the loopback, so that the server is not directly accessible from # the Internet. # -Glacier2.Server.Endpoints=tcp -h 127.0.0.1 +Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1 # # The configures the session manager. If no external session manager diff --git a/java/demo/Glacier2/callback/config.server b/java/demo/Glacier2/callback/config.server index 78e95043136..033b969d997 100644 --- a/java/demo/Glacier2/callback/config.server +++ b/java/demo/Glacier2/callback/config.server @@ -4,7 +4,7 @@ # loopback, so that the server is not directly accessible from the # Internet. # -Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000 +Ice.OA.Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000 # # Warn about connection exceptions diff --git a/java/demo/Glacier2/callback/config.sessionserver b/java/demo/Glacier2/callback/config.sessionserver index 864d6bd5720..3662d7fcea7 100644 --- a/java/demo/Glacier2/callback/config.sessionserver +++ b/java/demo/Glacier2/callback/config.sessionserver @@ -4,7 +4,7 @@ # loopback, so that the session server is not directly accessible from # the Internet. # -SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001 +Ice.OA.SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001 # # Warn about connection exceptions diff --git a/java/demo/Ice/async/config.server b/java/demo/Ice/async/config.server index fd72066f5a5..c7d7b368b1b 100644 --- a/java/demo/Ice/async/config.server +++ b/java/demo/Ice/async/config.server @@ -3,7 +3,7 @@ # "Queue". The following line sets the endpoints for this # adapter. # -Queue.Endpoints=tcp -p 10000 +Ice.OA.Queue.Endpoints=tcp -p 10000 # # Warn about connection exceptions diff --git a/java/demo/Ice/bidir/config.server b/java/demo/Ice/bidir/config.server index 1e6ffd5e484..fa3219299a2 100755 --- a/java/demo/Ice/bidir/config.server +++ b/java/demo/Ice/bidir/config.server @@ -1,4 +1,4 @@ -Callback.Server.Endpoints=tcp -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000
# Active connection management must be disabled when using
# bidirectional connections.
diff --git a/java/demo/Ice/callback/config.client b/java/demo/Ice/callback/config.client index 289b0bc9e6f..a3289d5e0b7 100644 --- a/java/demo/Ice/callback/config.client +++ b/java/demo/Ice/callback/config.client @@ -1,5 +1,5 @@ Callback.Client.CallbackServer=callback:tcp -p 12000:udp -p 10000:ssl -p 10001 -Callback.Client.Endpoints=tcp:udp:ssl +Ice.OA.Callback.Client.Endpoints=tcp:udp:ssl # # Warn about connection exceptions diff --git a/java/demo/Ice/callback/config.server b/java/demo/Ice/callback/config.server index 10d65a443ba..cf17b1509c2 100644 --- a/java/demo/Ice/callback/config.server +++ b/java/demo/Ice/callback/config.server @@ -1,4 +1,4 @@ -Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001 +Ice.OA.Callback.Server.Endpoints=tcp -p 12000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions diff --git a/java/demo/Ice/hello/config.server b/java/demo/Ice/hello/config.server index 665fc131088..907e2a13a55 100644 --- a/java/demo/Ice/hello/config.server +++ b/java/demo/Ice/hello/config.server @@ -3,7 +3,7 @@ # "helloadapater". The following line sets the endpoints for this # adapter # -Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions diff --git a/java/demo/Ice/invoke/config.server b/java/demo/Ice/invoke/config.server index 0978234e8c4..e925636df8d 100644 --- a/java/demo/Ice/invoke/config.server +++ b/java/demo/Ice/invoke/config.server @@ -3,7 +3,7 @@ # "helloadapater". The following line sets the endpoints for this # adapter # -Printer.Endpoints=default -p 10000 +Ice.OA.Printer.Endpoints=default -p 10000 # # Warn about connection exceptions diff --git a/java/demo/Ice/latency/config.server b/java/demo/Ice/latency/config.server index 6d82f1a7f2e..33cbd33492e 100644 --- a/java/demo/Ice/latency/config.server +++ b/java/demo/Ice/latency/config.server @@ -1 +1 @@ -Latency.Endpoints=default -p 10000 -h 127.0.0.1 +Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1 diff --git a/java/demo/Ice/nested/config.client b/java/demo/Ice/nested/config.client index a895324d0b5..cc7b8c0a0fb 100644 --- a/java/demo/Ice/nested/config.client +++ b/java/demo/Ice/nested/config.client @@ -1,5 +1,5 @@ Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000 -Nested.Client.Endpoints=default -t 10000 +Ice.OA.Nested.Client.Endpoints=default -t 10000 Ice.ThreadPool.Server.Size=5 Ice.ThreadPool.Server.SizeWarn=5 diff --git a/java/demo/Ice/nested/config.server b/java/demo/Ice/nested/config.server index e0073284155..87c9057ed0d 100644 --- a/java/demo/Ice/nested/config.server +++ b/java/demo/Ice/nested/config.server @@ -1,4 +1,4 @@ -Nested.Server.Endpoints=default -p 10000 -t 10000 +Ice.OA.Nested.Server.Endpoints=default -p 10000 -t 10000 Ice.ThreadPool.Server.Size=5 Ice.ThreadPool.Server.SizeWarn=5 diff --git a/java/demo/Ice/session/config.server b/java/demo/Ice/session/config.server index 8aa8dfac36f..2731a988e56 100644 --- a/java/demo/Ice/session/config.server +++ b/java/demo/Ice/session/config.server @@ -3,7 +3,7 @@ # "SessionFactory". The following line sets the endpoints for this # adapter. # -SessionFactory.Endpoints=default -p 10000 +Ice.OA.SessionFactory.Endpoints=default -p 10000 # # Warn about connection exceptions diff --git a/java/demo/Ice/throughput/config.client b/java/demo/Ice/throughput/config.client index 3391b2ff0bb..df84838f465 100644 --- a/java/demo/Ice/throughput/config.client +++ b/java/demo/Ice/throughput/config.client @@ -1,5 +1,5 @@ Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1 -Throughput.Endpoints=default -p 10000 +Ice.OA.Throughput.Endpoints=default -p 10000 Ice.ACM.Client=0 Ice.ACM.Server=0 diff --git a/java/demo/Ice/throughput/config.server b/java/demo/Ice/throughput/config.server index 3391b2ff0bb..df84838f465 100644 --- a/java/demo/Ice/throughput/config.server +++ b/java/demo/Ice/throughput/config.server @@ -1,5 +1,5 @@ Throughput.Throughput=throughput:default -p 10000 -h 127.0.0.1 -Throughput.Endpoints=default -p 10000 +Ice.OA.Throughput.Endpoints=default -p 10000 Ice.ACM.Client=0 Ice.ACM.Server=0 diff --git a/java/demo/Ice/value/config.server b/java/demo/Ice/value/config.server index 4d7f600e5d7..3c7afee33aa 100644 --- a/java/demo/Ice/value/config.server +++ b/java/demo/Ice/value/config.server @@ -1,4 +1,4 @@ -Value.Endpoints=default -p 10000 +Ice.OA.Value.Endpoints=default -p 10000 # # SSL Configuration diff --git a/java/demo/IceBox/hello/config.icebox b/java/demo/IceBox/hello/config.icebox index 07adfa38ce4..11f2b0741f7 100644 --- a/java/demo/IceBox/hello/config.icebox +++ b/java/demo/IceBox/hello/config.icebox @@ -3,7 +3,7 @@ IceBox.InstanceName=DemoIceBox # # The IceBox server endpoint configuration # -IceBox.ServiceManager.Endpoints=tcp -p 9998 +Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The hello service @@ -15,7 +15,7 @@ IceBox.Service.Hello=HelloServiceI # the service. The following line sets the endpoints for this # adapter. # -Hello.Endpoints=tcp -p 10000:udp -p 10000 +Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000 # # Warn about connection exceptions diff --git a/java/demo/IceGrid/allocate/config.grid b/java/demo/IceGrid/allocate/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/java/demo/IceGrid/allocate/config.grid +++ b/java/demo/IceGrid/allocate/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/java/demo/IceGrid/sessionActivation/config.grid b/java/demo/IceGrid/sessionActivation/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/java/demo/IceGrid/sessionActivation/config.grid +++ b/java/demo/IceGrid/sessionActivation/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/java/demo/IceGrid/simple/config.grid b/java/demo/IceGrid/simple/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/java/demo/IceGrid/simple/config.grid +++ b/java/demo/IceGrid/simple/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/java/demo/IceStorm/clock/config.icebox b/java/demo/IceStorm/clock/config.icebox index 07fb2e3cb6c..cd05e35ff37 100644 --- a/java/demo/IceStorm/clock/config.icebox +++ b/java/demo/IceStorm/clock/config.icebox @@ -1,7 +1,7 @@ # # The IceBox server endpoint configuration # -IceBox.ServiceManager.Endpoints=tcp -p 9998 +Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service diff --git a/java/demo/IceStorm/clock/config.service b/java/demo/IceStorm/clock/config.service index 539369861b0..4f1edc9ad3f 100644 --- a/java/demo/IceStorm/clock/config.service +++ b/java/demo/IceStorm/clock/config.service @@ -7,7 +7,7 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000 # This property defines the endpoints on which the IceStorm # TopicManager listens. # -IceStorm.TopicManager.Endpoints=default -p 10000 +Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000 # # The IceStorm service instance name. @@ -20,7 +20,7 @@ IceStorm.InstanceName=DemoIceStorm # IceStorm instances this must run on a fixed port (or use # IceGrid). # -IceStorm.Publish.Endpoints=default -p 10001 +Ice.OA.IceStorm.Publish.Endpoints=default -p 10001 # # TopicManager Tracing diff --git a/java/demo/IceStorm/clock/config.sub b/java/demo/IceStorm/clock/config.sub index d383e34e641..cb6b50d94f0 100644 --- a/java/demo/IceStorm/clock/config.sub +++ b/java/demo/IceStorm/clock/config.sub @@ -2,7 +2,7 @@ # This property is used to configure the endpoints of the clock # subscriber adapter. # -Clock.Subscriber.Endpoints=tcp +Ice.OA.Clock.Subscriber.Endpoints=tcp # # This property is used by the clients to connect to IceStorm. diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java index 04114b7557a..25d51cb72db 100644 --- a/java/src/Ice/CommunicatorI.java +++ b/java/src/Ice/CommunicatorI.java @@ -62,7 +62,7 @@ public final class CommunicatorI extends LocalObjectImpl implements Communicator public ObjectAdapter createObjectAdapter(String name) { - return createObjectAdapterWithEndpoints(name, getProperties().getProperty(name + ".Endpoints")); + return _instance.objectAdapterFactory().createObjectAdapter(name, "", null); } public ObjectAdapter diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 17ed667b8ab..c016a5533a0 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -69,7 +69,11 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt if(!_noConfig) { final Properties properties = _instance.initializationData().properties; - registerProcess = properties.getPropertyAsInt(_name +".RegisterProcess") > 0; + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + registerProcess = properties.getPropertyAsIntWithDefault(_propertyPrefix + _name +".RegisterProcess", + properties.getPropertyAsInt(_name +".RegisterProcess")) > 0; printAdapterReady = properties.getPropertyAsInt("Ice.PrintAdapterReady") > 0; } } @@ -708,12 +712,18 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt } // + // DEPRECATED PROPERTIES: Remove extra code in future release. + // + + // // Make sure named adapter has some configuration. // + final Properties properties = instance.initializationData().properties; + String[] oldProps = filterProperties(_name + "."); if(endpointInfo.length() == 0 && router == null) { - java.util.Map oaProps = instance.initializationData().properties.getPropertiesForPrefix(_name + "."); - if(oaProps.size() == 0) + String[] props = filterProperties(_propertyPrefix + _name + "."); + if(props.length == 0 && oldProps.length == 0) { InitializationException ex = new InitializationException(); ex.reason = "Object adapter \"" + _name + "\" requires configuration."; @@ -721,14 +731,32 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt } } - _id = instance.initializationData().properties.getProperty(name + ".AdapterId"); - _replicaGroupId = instance.initializationData().properties.getProperty(name + ".ReplicaGroupId"); + if(oldProps.length != 0) + { + String message = "The following properties have been deprecated, please prepend \"Ice.OA.\":"; + for(int i = 0; i < oldProps.length; ++i) + { + message += "\n " + oldProps[i]; + } + _instance.initializationData().logger.warning(message); + } + + _id = properties.getPropertyWithDefault(_propertyPrefix + _name + ".AdapterId", + properties.getProperty(_name + ".AdapterId")); + _replicaGroupId = properties.getPropertyWithDefault(_propertyPrefix + _name + ".ReplicaGroupId", + properties.getProperty(_name + ".ReplicaGroupId")); try { if(router == null) { - router = RouterPrxHelper.uncheckedCast(_instance.proxyFactory().propertyToProxy(name + ".Router")); + router = RouterPrxHelper.uncheckedCast( + _instance.proxyFactory().propertyToProxy(_propertyPrefix + name + ".Router")); + if(router == null) + { + router = RouterPrxHelper.uncheckedCast( + _instance.proxyFactory().propertyToProxy(name + ".Router")); + } } if(router != null) { @@ -796,7 +824,16 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt // The connection factory might change it, for example, to // fill in the real port number. // - java.util.ArrayList endpoints = parseEndpoints(endpointInfo); + java.util.ArrayList endpoints; + if(endpointInfo.length() == 0) + { + endpoints = parseEndpoints(properties.getPropertyWithDefault(_propertyPrefix + _name + ".Endpoints", + properties.getProperty(_name + ".Endpoints"))); + } + else + { + endpoints = parseEndpoints(endpointInfo); + } for(int i = 0; i < endpoints.size(); ++i) { IceInternal.EndpointI endp = (IceInternal.EndpointI)endpoints.get(i); @@ -817,7 +854,8 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt // 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.size() == 0) { @@ -843,11 +881,16 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt } } - String locatorProperty = name + ".Locator"; - if(_instance.initializationData().properties.getProperty(locatorProperty).length() > 0) + String locatorProperty = _propertyPrefix + _name + ".Locator"; + if(properties.getProperty(locatorProperty).length() > 0) { setLocator(LocatorPrxHelper.uncheckedCast(_instance.proxyFactory().propertyToProxy(locatorProperty))); } + else if(properties.getProperty(_name + ".Locator").length() > 0) + { + setLocator(LocatorPrxHelper.uncheckedCast( + _instance.proxyFactory().propertyToProxy(_name + ".Locator"))); + } else { setLocator(_instance.referenceFactory().getDefaultLocator()); @@ -855,11 +898,24 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt 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").length() != 0 || + properties.getProperty(_propertyPrefix + _name + ".ThreadPool.SizeMax").length() != 0) + { + int size = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.Size"); + int sizeMax = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.SizeMax"); + if(size > 0 || sizeMax > 0) + { + _threadPool = new IceInternal.ThreadPool(_instance, _propertyPrefix + _name + ".ThreadPool", 0); + } + } + else { - _threadPool = new IceInternal.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 IceInternal.ThreadPool(_instance, _name + ".ThreadPool", 0); + } } } } @@ -1144,6 +1200,37 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt } } + static private String[] _suffixes = + { + "AdapterId", + "Endpoints", + "Locator", + "PublishedEndpoints", + "RegisterProcess", + "ReplicaGroupId", + "Router", + "ThreadPool.Size", + "ThreadPool.SizeMax", + "ThreadPool.SizeWarn", + "ThreadPool.StackSize" + }; + + String[] + filterProperties(String prefix) + { + java.util.ArrayList propertySet = new java.util.ArrayList(); + java.util.Map props = _instance.initializationData().properties.getPropertiesForPrefix(prefix); + for(int i = 0; i < _suffixes.length; ++i) + { + if(props.containsKey(prefix + _suffixes[i])) + { + propertySet.add(prefix + _suffixes[i]); + } + } + + return (String[])propertySet.toArray(new String[0]); + } + private static class ProcessI extends _ProcessDisp { ProcessI(Communicator communicator) @@ -1197,4 +1284,5 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt private boolean _waitForActivate; private boolean _waitForDeactivate; private boolean _noConfig; + static private String _propertyPrefix = "Ice.OA."; } diff --git a/java/src/IceBox/Admin.java b/java/src/IceBox/Admin.java index 0bc82241717..04397bb6fdb 100644 --- a/java/src/IceBox/Admin.java +++ b/java/src/IceBox/Admin.java @@ -68,7 +68,12 @@ public final class Admin String managerProxy; if(properties.getProperty("Ice.Default.Locator").length() == 0) { - String managerEndpoints = properties.getProperty("IceBox.ServiceManager.Endpoints"); + // + // DEPREACTED PROPERTIES: Remove extra code in future release. + // + String managerEndpoints = + properties.getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.Endpoints", + properties.getProperty("IceBox.ServiceManager.Endpoints")); if(managerEndpoints.length() == 0) { System.err.println(appName() + ": property `IceBox.ServiceManager.Endpoints' is not set"); @@ -79,7 +84,12 @@ public final class Admin } else { - String managerAdapterId = properties.getProperty("IceBox.ServiceManager.AdapterId"); + // + // DEPREACTED PROPERTIES: Remove extra code in future release. + // + String managerAdapterId = + properties.getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.AdapterId", + properties.getProperty("IceBox.ServiceManager.AdapterId")); if(managerAdapterId.length() == 0) { System.err.println(appName() + ": property `IceBox.ServiceManager.AdapterId' is not set"); diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java index aa96cb4f8c1..fd854398a79 100755 --- a/java/src/IceGridGUI/Application/PlainServer.java +++ b/java/src/IceGridGUI/Application/PlainServer.java @@ -89,8 +89,8 @@ class PlainServer extends Communicator implements Server { java.util.LinkedList properties = new java.util.LinkedList(); properties.add(new PropertyDescriptor("IceBox.InstanceName", "${server}")); - properties.add(new PropertyDescriptor("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); - properties.add(new PropertyDescriptor("IceBox.RegisterProcess", "1")); + properties.add(new PropertyDescriptor("Ice.OA.IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); + properties.add(new PropertyDescriptor("Ice.OA.IceBox.RegisterProcess", "1")); return new IceBoxDescriptor( new java.util.LinkedList(), diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java index 0de2e690502..f5e84bf10ff 100755 --- a/java/src/IceGridGUI/Application/PropertiesField.java +++ b/java/src/IceGridGUI/Application/PropertiesField.java @@ -94,8 +94,8 @@ public class PropertiesField extends JTable while(p.hasNext()) { AdapterDescriptor ad = (AdapterDescriptor)p.next(); - hiddenPropertyNames.add(ad.name + ".Endpoints"); - hiddenPropertyNames.add(ad.name + ".PublishedEndpoints"); + hiddenPropertyNames.add("Ice.OA." + ad.name + ".Endpoints"); + hiddenPropertyNames.add("Ice.OA." + ad.name + ".PublishedEndpoints"); } } diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java index b74fd1f2698..d974135f158 100755 --- a/java/src/IceGridGUI/Application/TreeNode.java +++ b/java/src/IceGridGUI/Application/TreeNode.java @@ -141,7 +141,7 @@ public abstract class TreeNode extends TreeNodeBase while(p.hasNext()) { AdapterDescriptor ad = (AdapterDescriptor)p.next(); - hiddenPropertyNames.add(ad.name + ".Endpoints"); + hiddenPropertyNames.add("Ice.OA." + ad.name + ".Endpoints"); } } diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java index aa44dfc081c..e69428ea9b3 100755 --- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java @@ -71,9 +71,9 @@ class AdapterEditor extends Editor java.util.Map properties = adapter.getProperties(); // getId() returns the name of the adapter! - _endpoints.setText(resolver.substitute((String)properties.get(adapter.getId() + ".Endpoints"))); + _endpoints.setText(resolver.substitute((String)properties.get("Ice.OA." + adapter.getId() + ".Endpoints"))); _publishedEndpoints.setText( - resolver.substitute((String)properties.get(adapter.getId() + ".PublishedEndpoints"))); + resolver.substitute((String)properties.get("Ice.OA." + adapter.getId() + ".PublishedEndpoints"))); _registerProcess.setSelected(descriptor.registerProcess); _serverLifetime.setSelected(descriptor.serverLifetime); diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 5fa671f2164..fc4d6aa214a 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -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! @@ -52,12 +52,23 @@ public final class PropertyNames "^Ice\\.MonitorConnections$", "^Ice\\.Nohup$", "^Ice\\.NullHandleAbort$", + "^Ice\\.OA\\.[^\\s]+\\.AdapterId$", + "^Ice\\.OA\\.[^\\s]+\\.Endpoints$", + "^Ice\\.OA\\.[^\\s]+\\.Locator$", + "^Ice\\.OA\\.[^\\s]+\\.PublishedEndpoints$", + "^Ice\\.OA\\.[^\\s]+\\.RegisterProcess$", + "^Ice\\.OA\\.[^\\s]+\\.ReplicaGroupId$", + "^Ice\\.OA\\.[^\\s]+\\.Router$", + "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.Size$", + "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.SizeMax$", + "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.SizeWarn$", + "^Ice\\.OA\\.[^\\s]+\\.ThreadPool\\.StackSize$", "^Ice\\.Override\\.Compress$", "^Ice\\.Override\\.ConnectTimeout$", "^Ice\\.Override\\.Timeout$", "^Ice\\.Override\\.Secure$", - "^Ice\\.Package\\.[^\\s.]+$", - "^Ice\\.Plugin\\.[^\\s.]+$", + "^Ice\\.Package\\.[^\\s]+$", + "^Ice\\.Plugin\\.[^\\s]+$", "^Ice\\.PluginLoadOrder$", "^Ice\\.PrintAdapterReady$", "^Ice\\.PrintProcessId$", @@ -101,7 +112,7 @@ public final class PropertyNames "^IceBox\\.InstanceName$", "^IceBox\\.LoadOrder$", "^IceBox\\.PrintServicesReady$", - "^IceBox\\.Service\\.[^\\s.]+$", + "^IceBox\\.Service\\.[^\\s]+$", "^IceBox\\.ServiceManager\\.AdapterId$", "^IceBox\\.ServiceManager\\.ReplicaGroupId$", "^IceBox\\.ServiceManager\\.Endpoints$", @@ -111,7 +122,7 @@ public final class PropertyNames "^IceBox\\.ServiceManager\\.ThreadPool\\.SizeMax$", "^IceBox\\.ServiceManager\\.ThreadPool\\.SizeWarn$", "^IceBox\\.ServiceManager\\.ThreadPool\\.StackSize$", - "^IceBox\\.UseSharedCommunicator\\.[^\\s.]+$", + "^IceBox\\.UseSharedCommunicator\\.[^\\s]+$", null }; @@ -253,10 +264,10 @@ public final class PropertyNames "^IceSSL\\.CheckCRL$", "^IceSSL\\.Ciphers$", "^IceSSL\\.DefaultDir$", - "^IceSSL\\.DH\\.[^\\s.]+$", + "^IceSSL\\.DH\\.[^\\s]+$", "^IceSSL\\.EntropyDaemon$", - "^IceSSL\\.FindCert\\.[^\\s.]+\\.[^\\s.]+$", - "^IceSSL\\.ImportCert\\.[^\\s.]+\\.[^\\s.]+$", + "^IceSSL\\.FindCert\\.[^\\s]+$", + "^IceSSL\\.ImportCert\\.[^\\s]+$", "^IceSSL\\.KeyFile$", "^IceSSL\\.Keystore$", "^IceSSL\\.KeystorePassword$", @@ -274,7 +285,7 @@ public final class PropertyNames "^IceSSL\\.TrustOnly$", "^IceSSL\\.TrustOnly\\.Client$", "^IceSSL\\.TrustOnly\\.Server$", - "^IceSSL\\.TrustOnly\\.Server\\.[^\\s.]+$", + "^IceSSL\\.TrustOnly\\.Server\\.[^\\s]+$", null }; @@ -392,17 +403,17 @@ public final class PropertyNames public static final String FreezeProps[] = { - "^Freeze\\.DbEnv\\.[^\\s.]+\\.CheckpointPeriod$", - "^Freeze\\.DbEnv\\.[^\\s.]+\\.DbHome$", - "^Freeze\\.DbEnv\\.[^\\s.]+\\.DbPrivate$", - "^Freeze\\.DbEnv\\.[^\\s.]+\\.DbRecoverFatal$", - "^Freeze\\.DbEnv\\.[^\\s.]+\\.OldLogsAutoDelete$", - "^Freeze\\.DbEnv\\.[^\\s.]+\\.PeriodicCheckpointMinSize$", - "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.MaxTxSize$", - "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.SavePeriod$", - "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.SaveSizeTrigger$", - "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.StreamTimeout$", - "^Freeze\\.Evictor\\.[^\\s.]+\\.[^\\s.]+\\.PopulateEmptyIndices$", + "^Freeze\\.DbEnv\\.[^\\s]+\\.CheckpointPeriod$", + "^Freeze\\.DbEnv\\.[^\\s]+\\.DbHome$", + "^Freeze\\.DbEnv\\.[^\\s]+\\.DbPrivate$", + "^Freeze\\.DbEnv\\.[^\\s]+\\.DbRecoverFatal$", + "^Freeze\\.DbEnv\\.[^\\s]+\\.OldLogsAutoDelete$", + "^Freeze\\.DbEnv\\.[^\\s]+\\.PeriodicCheckpointMinSize$", + "^Freeze\\.Evictor\\.[^\\s]+\\.MaxTxSize$", + "^Freeze\\.Evictor\\.[^\\s]+\\.SavePeriod$", + "^Freeze\\.Evictor\\.[^\\s]+\\.SaveSizeTrigger$", + "^Freeze\\.Evictor\\.[^\\s]+\\.StreamTimeout$", + "^Freeze\\.Evictor\\.[^\\s]+\\.PopulateEmptyIndices$", "^Freeze\\.Evictor\\.UseNonmutating$", "^Freeze\\.Trace\\.DbEnv$", "^Freeze\\.Trace\\.Evictor$", diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java index b5037579877..d072de1ee16 100644 --- a/java/test/Freeze/evictor/Server.java +++ b/java/test/Freeze/evictor/Server.java @@ -46,8 +46,7 @@ public class Server static int run(String[] args, Ice.Communicator communicator, String envName) { - communicator.getProperties().setProperty("Evictor.Endpoints", "default -p 12010"); - + communicator.getProperties().setProperty("Ice.OA.Evictor.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("Evictor"); RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI(adapter, envName); diff --git a/java/test/Freeze/oldevictor/Server.java b/java/test/Freeze/oldevictor/Server.java index b5037579877..d072de1ee16 100644 --- a/java/test/Freeze/oldevictor/Server.java +++ b/java/test/Freeze/oldevictor/Server.java @@ -46,8 +46,7 @@ public class Server static int run(String[] args, Ice.Communicator communicator, String envName) { - communicator.getProperties().setProperty("Evictor.Endpoints", "default -p 12010"); - + communicator.getProperties().setProperty("Ice.OA.Evictor.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("Evictor"); RemoteEvictorFactoryI factory = new RemoteEvictorFactoryI(adapter, envName); diff --git a/java/test/Glacier2/attack/BackendServer.java b/java/test/Glacier2/attack/BackendServer.java index 6109dbfaf7a..2603e5ba691 100644 --- a/java/test/Glacier2/attack/BackendServer.java +++ b/java/test/Glacier2/attack/BackendServer.java @@ -14,7 +14,7 @@ class BackendServer extends Ice.Application public int run(String[] args) { - communicator().getProperties().setProperty("BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("BackendAdapter"); adapter.addServantLocator(new ServantLocatorI(), ""); adapter.activate(); diff --git a/java/test/Glacier2/attack/run.py b/java/test/Glacier2/attack/run.py index 5349aaee88e..e9fe9db3dfb 100755 --- a/java/test/Glacier2/attack/run.py +++ b/java/test/Glacier2/attack/run.py @@ -31,8 +31,8 @@ router = os.path.join(ice_home, "bin", "glacier2router") command = router + TestUtil.cppClientServerOptions + \ r' --Ice.PrintProcessId' \ 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/java/test/Glacier2/router/CallbackServer.java b/java/test/Glacier2/router/CallbackServer.java index 79650ddc031..29c2fd01915 100644 --- a/java/test/Glacier2/router/CallbackServer.java +++ b/java/test/Glacier2/router/CallbackServer.java @@ -14,7 +14,7 @@ class CallbackServer extends Ice.Application public int run(String[] args) { - communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py index 4fa7ac4cbaf..33dd558c297 100755 --- a/java/test/Glacier2/router/run.py +++ b/java/test/Glacier2/router/run.py @@ -34,9 +34,9 @@ command = router + TestUtil.cppClientServerOptions + \ 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/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/Ice/adapterDeactivation/Collocated.java index c3e650cd868..a9e07b0a996 100644 --- a/java/test/Ice/adapterDeactivation/Collocated.java +++ b/java/test/Ice/adapterDeactivation/Collocated.java @@ -14,7 +14,7 @@ public class Collocated public int run(String[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java index 3bfc71ac8be..dc61855d95f 100644 --- a/java/test/Ice/adapterDeactivation/Server.java +++ b/java/test/Ice/adapterDeactivation/Server.java @@ -14,7 +14,7 @@ public class Server public int run(String[] args) { - 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.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ServantLocator locator = new ServantLocatorI(); diff --git a/java/test/Ice/binding/RemoteCommunicatorI.java b/java/test/Ice/binding/RemoteCommunicatorI.java index 3e914af3cb0..44b562f28e2 100644 --- a/java/test/Ice/binding/RemoteCommunicatorI.java +++ b/java/test/Ice/binding/RemoteCommunicatorI.java @@ -15,7 +15,7 @@ public class RemoteCommunicatorI extends _RemoteCommunicatorDisp createObjectAdapter(String name, String endpoints, Ice.Current current) { Ice.Communicator com = current.adapter.getCommunicator(); - com.getProperties().setProperty(name + ".ThreadPool.Size", "1"); + com.getProperties().setProperty("Ice.OA." + name + ".ThreadPool.Size", "1"); Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, endpoints); return RemoteObjectAdapterPrxHelper.uncheckedCast( current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter))); diff --git a/java/test/Ice/binding/Server.java b/java/test/Ice/binding/Server.java index 908c3c1d27e..335ead21769 100644 --- a/java/test/Ice/binding/Server.java +++ b/java/test/Ice/binding/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); diff --git a/java/test/Ice/checksum/server/Server.java b/java/test/Ice/checksum/server/Server.java index e152d0680f2..e3ab5ba5169 100644 --- a/java/test/Ice/checksum/server/Server.java +++ b/java/test/Ice/checksum/server/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ChecksumI(adapter); adapter.add(object, communicator.stringToIdentity("test")); diff --git a/java/test/Ice/custom/Collocated.java b/java/test/Ice/custom/Collocated.java index 4a698d51fca..b52d59d9d34 100644 --- a/java/test/Ice/custom/Collocated.java +++ b/java/test/Ice/custom/Collocated.java @@ -12,7 +12,7 @@ public class Collocated private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object test = new TestI(communicator); adapter.add(test, communicator.stringToIdentity("test")); diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java index fe6082914bd..67a65e536c9 100644 --- a/java/test/Ice/custom/Server.java +++ b/java/test/Ice/custom/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object test = new TestI(communicator); adapter.add(test, communicator.stringToIdentity("test")); diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java index a9f75b9e34b..09cccf1006c 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/Ice/exceptions/AllTests.java @@ -729,7 +729,7 @@ public class AllTests // Expected } - communicator.getProperties().setProperty("TestAdapter0.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter0.Endpoints", "default"); first = communicator.createObjectAdapter("TestAdapter0"); try { @@ -751,14 +751,14 @@ public class AllTests { // Expected } - test(communicator.getProperties().getProperty("TestAdapter0.Endpoints").equals("default")); + test(communicator.getProperties().getProperty("Ice.OA.TestAdapter0.Endpoints").equals("default")); first.deactivate(); System.out.println("ok"); } { System.out.print("testing servant registration exceptions... "); - communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter1.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1"); Ice.Object obj = new EmptyI(); adapter.add(obj, communicator.stringToIdentity("x")); @@ -786,7 +786,7 @@ public class AllTests { System.out.print("testing servant locator registration exceptions... "); - communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter2"); Ice.ServantLocator loc = new ServantLocatorI(); adapter.addServantLocator(loc, "x"); diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java index e66910ef1a9..bdb45582272 100644 --- a/java/test/Ice/exceptions/Collocated.java +++ b/java/test/Ice/exceptions/Collocated.java @@ -12,7 +12,7 @@ public class Collocated private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ThrowerI(adapter); adapter.add(object, communicator.stringToIdentity("thrower")); diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java index 16aceacb26e..3658a024e81 100644 --- a/java/test/Ice/exceptions/Server.java +++ b/java/test/Ice/exceptions/Server.java @@ -15,7 +15,7 @@ public class Server Ice.Properties properties = communicator.getProperties(); // We don't need to disable warnings, because we have a dummy logger. //properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ThrowerI(adapter); adapter.add(object, communicator.stringToIdentity("thrower")); diff --git a/java/test/Ice/exceptionsAMD/Server.java b/java/test/Ice/exceptionsAMD/Server.java index 145d755516c..cea5b7970b4 100644 --- a/java/test/Ice/exceptionsAMD/Server.java +++ b/java/test/Ice/exceptionsAMD/Server.java @@ -15,7 +15,7 @@ public class Server Ice.Properties properties = communicator.getProperties(); // We don't need to disable warnings, because we have a dummy logger. //properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ThrowerI(adapter); adapter.add(object, communicator.stringToIdentity("thrower")); diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java index 1a973d9a7b6..dd8ebab48be 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/Ice/facets/AllTests.java @@ -24,7 +24,7 @@ public class AllTests allTests(Ice.Communicator communicator) { System.out.print("testing facet registration exceptions... "); - communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter"); Ice.Object obj = new EmptyI(); adapter.add(obj, communicator.stringToIdentity("d")); diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java index 57dae86829f..8ad09d661bb 100644 --- a/java/test/Ice/facets/Collocated.java +++ b/java/test/Ice/facets/Collocated.java @@ -12,7 +12,7 @@ public class Collocated private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java index 1b96f6bd22a..ef76e630f25 100644 --- a/java/test/Ice/facets/Server.java +++ b/java/test/Ice/facets/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java index 945a57d480f..20479bd75e7 100644 --- a/java/test/Ice/faultTolerance/Server.java +++ b/java/test/Ice/faultTolerance/Server.java @@ -54,7 +54,7 @@ public class Server return 1; } - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p " + port + ":udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(adapter, port); adapter.add(object, communicator.stringToIdentity("test")); diff --git a/java/test/Ice/hold/Server.java b/java/test/Ice/hold/Server.java index cf67f2624a5..75b9a4fa56c 100644 --- a/java/test/Ice/hold/Server.java +++ b/java/test/Ice/hold/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator 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.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new HoldI(), communicator.stringToIdentity("hold")); adapter.activate(); diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java index 2c3bb3c32bf..46d72ad7255 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/Ice/inheritance/Collocated.java @@ -12,7 +12,7 @@ public class Collocated private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); adapter.add(object, communicator.stringToIdentity("initial")); diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java index 72f64a3e2dc..c45f57e7d57 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/Ice/inheritance/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); adapter.add(object, communicator.stringToIdentity("initial")); diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java index 7695cc73d68..11ce8285cef 100644 --- a/java/test/Ice/location/Server.java +++ b/java/test/Ice/location/Server.java @@ -19,7 +19,7 @@ public class Server // Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.ThreadPool.Server.Size", "2"); - properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp"); + properties.setProperty("Ice.OA.ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter"); diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java index 459e297ae95..b3ebcb7181d 100644 --- a/java/test/Ice/location/ServerManagerI.java +++ b/java/test/Ice/location/ServerManagerI.java @@ -18,11 +18,11 @@ public class ServerManagerI extends _ServerManagerDisp _communicators = new java.util.ArrayList(); _initData = initData; - _initData.properties.setProperty("TestAdapter.Endpoints", "default"); - _initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter"); - _initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); - _initData.properties.setProperty("TestAdapter2.Endpoints", "default"); - _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2"); + _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("Ice.OA.TestAdapter2.Endpoints", "default"); + _initData.properties.setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2"); } public void diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java index 693a7314c42..df4ae229345 100644 --- a/java/test/Ice/objects/Collocated.java +++ b/java/test/Ice/objects/Collocated.java @@ -14,7 +14,7 @@ public class Collocated private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); adapter.add(initial, communicator.stringToIdentity("initial")); diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java index 94d4c639c3b..392275fcd62 100644 --- a/java/test/Ice/objects/Server.java +++ b/java/test/Ice/objects/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(adapter); adapter.add(object, communicator.stringToIdentity("initial")); diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java index bd792b1b193..922c5f7554e 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/Ice/operations/Collocated.java @@ -12,7 +12,7 @@ public class Collocated private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("test"); adapter.add(new MyDerivedClassI(adapter, id), id); diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java index c4587b3a49e..e9f87e54f3d 100644 --- a/java/test/Ice/operations/Server.java +++ b/java/test/Ice/operations/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("test"); adapter.add(new MyDerivedClassI(adapter, id), id); diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java index dcfe6be3c3b..f1904824aff 100644 --- a/java/test/Ice/operationsAMD/Server.java +++ b/java/test/Ice/operationsAMD/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator 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.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("test"); adapter.add(new MyDerivedClassI(adapter, id), id); diff --git a/java/test/Ice/package/Server.java b/java/test/Ice/package/Server.java index f654daa8c1a..8f58212a801 100644 --- a/java/test/Ice/package/Server.java +++ b/java/test/Ice/package/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new InitialI(); adapter.add(object, communicator.stringToIdentity("initial")); diff --git a/java/test/Ice/retry/Server.java b/java/test/Ice/retry/Server.java index 07599c76676..a6d242aaa58 100644 --- a/java/test/Ice/retry/Server.java +++ b/java/test/Ice/retry/Server.java @@ -17,9 +17,9 @@ public class Server // overridden by configuration. If it isn't then we assume // defaults. // - if(communicator.getProperties().getProperty("TestAdapter.Endpoints").length() == 0) + if(communicator.getProperties().getProperty("Ice.OA.TestAdapter.Endpoints").length() == 0) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); } Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/java/test/Ice/slicing/exceptions/ssrc/Server.java b/java/test/Ice/slicing/exceptions/ssrc/Server.java index 838720c51da..82d0ca056e4 100644 --- a/java/test/Ice/slicing/exceptions/ssrc/Server.java +++ b/java/test/Ice/slicing/exceptions/ssrc/Server.java @@ -14,7 +14,7 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(adapter); adapter.add(object, Ice.Util.stringToIdentity("Test")); diff --git a/java/test/Ice/slicing/exceptionsAMD/Server.java b/java/test/Ice/slicing/exceptionsAMD/Server.java index 26f31323549..76cb1f20cda 100644 --- a/java/test/Ice/slicing/exceptionsAMD/Server.java +++ b/java/test/Ice/slicing/exceptionsAMD/Server.java @@ -14,7 +14,7 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(adapter); adapter.add(object, communicator.stringToIdentity("Test")); diff --git a/java/test/Ice/slicing/objects/ssrc/Server.java b/java/test/Ice/slicing/objects/ssrc/Server.java index 838720c51da..82d0ca056e4 100644 --- a/java/test/Ice/slicing/objects/ssrc/Server.java +++ b/java/test/Ice/slicing/objects/ssrc/Server.java @@ -14,7 +14,7 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(adapter); adapter.add(object, Ice.Util.stringToIdentity("Test")); diff --git a/java/test/Ice/slicing/objectsAMD/Server.java b/java/test/Ice/slicing/objectsAMD/Server.java index 26f31323549..76cb1f20cda 100644 --- a/java/test/Ice/slicing/objectsAMD/Server.java +++ b/java/test/Ice/slicing/objectsAMD/Server.java @@ -14,7 +14,7 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new TestI(adapter); adapter.add(object, communicator.stringToIdentity("Test")); diff --git a/java/test/Ice/timeout/Server.java b/java/test/Ice/timeout/Server.java index a6ed62b6825..e578d97fa45 100644 --- a/java/test/Ice/timeout/Server.java +++ b/java/test/Ice/timeout/Server.java @@ -17,9 +17,9 @@ public class Server // overridden by configuration. If it isn't then we assume // defaults. // - if(communicator.getProperties().getProperty("TestAdapter.Endpoints").length() == 0) + if(communicator.getProperties().getProperty("Ice.OA.TestAdapter.Endpoints").length() == 0) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); } Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/java/test/IceGrid/simple/run.py b/java/test/IceGrid/simple/run.py index 045588931e9..c3980d610be 100755 --- a/java/test/IceGrid/simple/run.py +++ b/java/test/IceGrid/simple/run.py @@ -32,7 +32,8 @@ os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + os.g # # 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/java/test/IceSSL/configuration/Server.java b/java/test/IceSSL/configuration/Server.java index 72417152f35..503d3b3d858 100644 --- a/java/test/IceSSL/configuration/Server.java +++ b/java/test/IceSSL/configuration/Server.java @@ -12,7 +12,7 @@ public class Server private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "tcp -p 12010"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("factory"); adapter.add(new ServerFactoryI(), id); diff --git a/py/CHANGES b/py/CHANGES index 2f3854a20d9..3e8220a30c1 100644 --- a/py/CHANGES +++ b/py/CHANGES @@ -3,6 +3,12 @@ NOTE: Please keep changes in the appropriate section for HEAD or 3.1. Changes since version 3.1.1 --------------------------- +- Object adapter properties are now prefixed by "Ice.OA.". For example, + "Ice.OA.<Adpater name>.Endpoints" instead of "<Adpater name>.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. + - Added Communicator::propertyToProxy() which creates a proxy from a set of properties. This function allows you to set various local proxy settings, such as the Locator cache timeout, which cannot be diff --git a/py/demo/Glacier2/callback/config.client b/py/demo/Glacier2/callback/config.client index b5b1b6d19a0..80783ab4894 100644 --- a/py/demo/Glacier2/callback/config.client +++ b/py/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/py/demo/Glacier2/callback/config.glacier2 b/py/demo/Glacier2/callback/config.glacier2 index cde23b9a94e..f4e6b214d14 100644 --- a/py/demo/Glacier2/callback/config.glacier2 +++ b/py/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/py/demo/Glacier2/callback/config.server b/py/demo/Glacier2/callback/config.server index 78e95043136..033b969d997 100644 --- a/py/demo/Glacier2/callback/config.server +++ b/py/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/py/demo/Glacier2/callback/config.sessionserver b/py/demo/Glacier2/callback/config.sessionserver index 864d6bd5720..3662d7fcea7 100644 --- a/py/demo/Glacier2/callback/config.sessionserver +++ b/py/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/py/demo/Ice/async/config.server b/py/demo/Ice/async/config.server index fd72066f5a5..c7d7b368b1b 100644 --- a/py/demo/Ice/async/config.server +++ b/py/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/py/demo/Ice/bidir/config.server b/py/demo/Ice/bidir/config.server index c36f2405d66..e81cb4a8e39 100644 --- a/py/demo/Ice/bidir/config.server +++ b/py/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/py/demo/Ice/callback/config.client b/py/demo/Ice/callback/config.client index a4b00fb2984..95caf8d3eae 100644 --- a/py/demo/Ice/callback/config.client +++ b/py/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/py/demo/Ice/callback/config.server b/py/demo/Ice/callback/config.server index deaef3f87de..795a07e8f27 100644 --- a/py/demo/Ice/callback/config.server +++ b/py/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/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server index bb2040f2cdc..aeff24452ac 100644 --- a/py/demo/Ice/hello/config.server +++ b/py/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/py/demo/Ice/latency/config.server b/py/demo/Ice/latency/config.server index f79409c7738..449847f90e6 100644 --- a/py/demo/Ice/latency/config.server +++ b/py/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 #Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs diff --git a/py/demo/Ice/session/config.server b/py/demo/Ice/session/config.server index 8aa8dfac36f..2731a988e56 100644 --- a/py/demo/Ice/session/config.server +++ b/py/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/py/demo/Ice/throughput/config.server b/py/demo/Ice/throughput/config.server index ddae4a1a27a..3b9fd7e7c6f 100644 --- a/py/demo/Ice/throughput/config.server +++ b/py/demo/Ice/throughput/config.server @@ -1,4 +1,4 @@ -Throughput.Endpoints=default -p 10000 -h 127.0.0.1 +Ice.OA.Throughput.Endpoints=default -p 10000 -h 127.0.0.1 #Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs diff --git a/py/demo/Ice/value/config.server b/py/demo/Ice/value/config.server index 8f2cf355ffc..52e81b9e331 100644 --- a/py/demo/Ice/value/config.server +++ b/py/demo/Ice/value/config.server @@ -1 +1 @@ -Value.Endpoints=default -p 10000 +Ice.OA.Value.Endpoints=default -p 10000 diff --git a/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox index 07fb2e3cb6c..cd05e35ff37 100644 --- a/py/demo/IceStorm/clock/config.icebox +++ b/py/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/py/demo/IceStorm/clock/config.service b/py/demo/IceStorm/clock/config.service index 539369861b0..4f1edc9ad3f 100644 --- a/py/demo/IceStorm/clock/config.service +++ b/py/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/py/demo/IceStorm/clock/config.sub b/py/demo/IceStorm/clock/config.sub index d383e34e641..cb6b50d94f0 100644 --- a/py/demo/IceStorm/clock/config.sub +++ b/py/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/py/test/Ice/adapterDeactivation/Collocated.py b/py/test/Ice/adapterDeactivation/Collocated.py index d725ce0163d..130bcf7901c 100644 --- a/py/test/Ice/adapterDeactivation/Collocated.py +++ b/py/test/Ice/adapterDeactivation/Collocated.py @@ -26,7 +26,7 @@ import Test, TestI, AllTests class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = self.communicator().createObjectAdapter("TestAdapter") locator = TestI.ServantLocatorI() diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py index 668011e0415..53c185cc6e8 100644 --- a/py/test/Ice/adapterDeactivation/Server.py +++ b/py/test/Ice/adapterDeactivation/Server.py @@ -26,7 +26,7 @@ import Test, TestI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = self.communicator().createObjectAdapter("TestAdapter") locator = TestI.ServantLocatorI() diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py index 873b5e1432d..290790b87f9 100644 --- a/py/test/Ice/binding/Server.py +++ b/py/test/Ice/binding/Server.py @@ -26,7 +26,7 @@ import Test, TestI def run(args, communicator): communicator.getProperties().setProperty("Ice.Warn.Connections", "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") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("communicator") adapter.add(TestI.RemoteCommunicatorI(), id) diff --git a/py/test/Ice/binding/TestI.py b/py/test/Ice/binding/TestI.py index 7081caf468b..dfd5533c599 100644 --- a/py/test/Ice/binding/TestI.py +++ b/py/test/Ice/binding/TestI.py @@ -13,7 +13,7 @@ import Ice, Test class RemoteCommunicatorI(Test.RemoteCommunicator): def createObjectAdapter(self, name, endpoints, current=None): com = current.adapter.getCommunicator() - com.getProperties().setProperty(name + ".ThreadPool.Size", "1") + com.getProperties().setProperty("Ice.OA." + name + ".ThreadPool.Size", "1") adapter = com.createObjectAdapterWithEndpoints(name, endpoints) return Test.RemoteObjectAdapterPrx.uncheckedCast(current.adapter.addWithUUID(RemoteObjectAdapterI(adapter))) diff --git a/py/test/Ice/checksum/Server.py b/py/test/Ice/checksum/Server.py index 237e2afb8b2..bfcb7de77a2 100644 --- a/py/test/Ice/checksum/Server.py +++ b/py/test/Ice/checksum/Server.py @@ -46,7 +46,7 @@ class ChecksumI(Test.Checksum): self._adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = ChecksumI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py index 9282c34333a..6c94e852709 100644 --- a/py/test/Ice/custom/Server.py +++ b/py/test/Ice/custom/Server.py @@ -88,7 +88,7 @@ class CustomI(Test.Custom): self._adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = CustomI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/exceptions/AllTests.py b/py/test/Ice/exceptions/AllTests.py index 438cbdb53f7..c7092d50dfa 100644 --- a/py/test/Ice/exceptions/AllTests.py +++ b/py/test/Ice/exceptions/AllTests.py @@ -289,7 +289,7 @@ class AMI_WrongOperation_noSuchOperationI(CallbackBase): def allTests(communicator): print "testing servant registration exceptions... ", - communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default") + communicator.getProperties().setProperty("Ice.OA.TestAdapter1.Endpoints", "default") adapter = communicator.createObjectAdapter("TestAdapter1") obj = EmptyI() adapter.add(obj, communicator.stringToIdentity("x")) @@ -310,7 +310,7 @@ def allTests(communicator): print "ok" print "testing servant locator registrations exceptions... ", - communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default") + communicator.getProperties().setProperty("Ice.OA.TestAdapter2.Endpoints", "default") adapter = communicator.createObjectAdapter("TestAdapter2") loc = ServantLocatorI() adapter.addServantLocator(loc, "x") diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py index b20b8f69998..8828ef9d93c 100644 --- a/py/test/Ice/exceptions/Collocated.py +++ b/py/test/Ice/exceptions/Collocated.py @@ -27,7 +27,7 @@ import Test, TestI, AllTests def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py index a3cb4d4bd06..d67f51d4740 100644 --- a/py/test/Ice/exceptions/Server.py +++ b/py/test/Ice/exceptions/Server.py @@ -27,7 +27,7 @@ import Test, TestI def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py index 8918b9285a1..c1789f36796 100644 --- a/py/test/Ice/exceptions/ServerAMD.py +++ b/py/test/Ice/exceptions/ServerAMD.py @@ -125,7 +125,7 @@ class ThrowerI(Test.Thrower): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = communicator.createObjectAdapter("TestAdapter") object = ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/facets/AllTests.py b/py/test/Ice/facets/AllTests.py index 3fecd56af9f..af289224430 100644 --- a/py/test/Ice/facets/AllTests.py +++ b/py/test/Ice/facets/AllTests.py @@ -19,7 +19,7 @@ class EmptyI(Test.Empty): def allTests(communicator): print "testing facet registration exceptions... ", - communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default") + communicator.getProperties().setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default") adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter") obj = EmptyI() adapter.add(obj, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/facets/Collocated.py b/py/test/Ice/facets/Collocated.py index 0a81d3653e3..9a3f6f4aa1d 100644 --- a/py/test/Ice/facets/Collocated.py +++ b/py/test/Ice/facets/Collocated.py @@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() adapter.add(d, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py index 1048de39eac..4ec016482ce 100644 --- a/py/test/Ice/facets/Server.py +++ b/py/test/Ice/facets/Server.py @@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() adapter.add(d, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/faultTolerance/Server.py b/py/test/Ice/faultTolerance/Server.py index f36f9a81d19..8ff6d736574 100644 --- a/py/test/Ice/faultTolerance/Server.py +++ b/py/test/Ice/faultTolerance/Server.py @@ -64,7 +64,7 @@ def run(args, communicator): return False endpts = "default -p " + str(port) + ":udp" - communicator.getProperties().setProperty("TestAdapter.Endpoints", endpts) + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", endpts) adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/inheritance/Collocated.py b/py/test/Ice/inheritance/Collocated.py index e51c8dfd6c8..3a1572abb73 100644 --- a/py/test/Ice/inheritance/Collocated.py +++ b/py/test/Ice/inheritance/Collocated.py @@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) adapter.add(object, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/inheritance/Server.py b/py/test/Ice/inheritance/Server.py index 28556abfa5c..910a2724cbb 100644 --- a/py/test/Ice/inheritance/Server.py +++ b/py/test/Ice/inheritance/Server.py @@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) adapter.add(object, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/location/Server.py b/py/test/Ice/location/Server.py index d6655b3f447..500b7377da9 100644 --- a/py/test/Ice/location/Server.py +++ b/py/test/Ice/location/Server.py @@ -85,10 +85,10 @@ class ServerManagerI(Test.ServerManager): self._registry = registry self._communicators = [] self._initData = initData - self._initData.properties.setProperty("TestAdapter.Endpoints", "default") - self._initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter") - self._initData.properties.setProperty("TestAdapter2.Endpoints", "default") - self._initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2") + self._initData.properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default") + self._initData.properties.setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter") + self._initData.properties.setProperty("Ice.OA.TestAdapter2.Endpoints", "default") + self._initData.properties.setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2") def startServer(self, current=None): @@ -154,7 +154,7 @@ def run(args, communicator, initData): # 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") adapter = communicator.createObjectAdapter("ServerManager") diff --git a/py/test/Ice/objects/Collocated.py b/py/test/Ice/objects/Collocated.py index b659095829a..0b4be21ab96 100644 --- a/py/test/Ice/objects/Collocated.py +++ b/py/test/Ice/objects/Collocated.py @@ -26,7 +26,7 @@ Ice.loadSlice('ClientPrivate.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) adapter.add(initial, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/objects/Server.py b/py/test/Ice/objects/Server.py index 13f9a2ed4c9..77b66949069 100644 --- a/py/test/Ice/objects/Server.py +++ b/py/test/Ice/objects/Server.py @@ -26,7 +26,7 @@ Ice.loadSlice('ServerPrivate.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) adapter.add(initial, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py index 823a5bfc14b..d08f38f7986 100644 --- a/py/test/Ice/operations/Collocated.py +++ b/py/test/Ice/operations/Collocated.py @@ -35,7 +35,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("test") adapter.add(TestI.MyDerivedClassI(adapter, id), id) diff --git a/py/test/Ice/operations/Server.py b/py/test/Ice/operations/Server.py index d3dc430be7f..36ecaea2793 100644 --- a/py/test/Ice/operations/Server.py +++ b/py/test/Ice/operations/Server.py @@ -36,7 +36,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice') import Test, TestI def run(args, 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") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("test") adapter.add(TestI.MyDerivedClassI(adapter, id), id) diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py index 08a753995c5..6272b646111 100644 --- a/py/test/Ice/operations/ServerAMD.py +++ b/py/test/Ice/operations/ServerAMD.py @@ -229,7 +229,7 @@ class TestCheckedCastI(Test.TestCheckedCast): return Test.TestCheckedCast.ice_isA(self, s, current) def run(args, 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") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("test") adapter.add(MyDerivedClassI(adapter, id), id) diff --git a/py/test/Ice/retry/Server.py b/py/test/Ice/retry/Server.py index b954f1e99f9..0c64dd1f27e 100644 --- a/py/test/Ice/retry/Server.py +++ b/py/test/Ice/retry/Server.py @@ -36,7 +36,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice') import Test, TestI def run(args, 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") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("retry") adapter.add(TestI.RetryI(), id) diff --git a/py/test/Ice/slicing/exceptions/Server.py b/py/test/Ice/slicing/exceptions/Server.py index d5ff332b808..4f711ddfa01 100644 --- a/py/test/Ice/slicing/exceptions/Server.py +++ b/py/test/Ice/slicing/exceptions/Server.py @@ -117,7 +117,7 @@ class TestI(Test.TestIntf): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, Ice.stringToIdentity("Test")) diff --git a/py/test/Ice/slicing/exceptions/ServerAMD.py b/py/test/Ice/slicing/exceptions/ServerAMD.py index 0c5b3310e2e..ce4f384cb1a 100644 --- a/py/test/Ice/slicing/exceptions/ServerAMD.py +++ b/py/test/Ice/slicing/exceptions/ServerAMD.py @@ -118,7 +118,7 @@ class TestI(Test.TestIntf): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, Ice.stringToIdentity("Test")) diff --git a/py/test/Ice/slicing/objects/Server.py b/py/test/Ice/slicing/objects/Server.py index c9199e0c293..90fdeece83d 100644 --- a/py/test/Ice/slicing/objects/Server.py +++ b/py/test/Ice/slicing/objects/Server.py @@ -279,7 +279,7 @@ class TestI(Test.TestIntf): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, Ice.stringToIdentity("Test")) diff --git a/py/test/Ice/slicing/objects/ServerAMD.py b/py/test/Ice/slicing/objects/ServerAMD.py index 72a98f3f9af..ab4067c625c 100644 --- a/py/test/Ice/slicing/objects/ServerAMD.py +++ b/py/test/Ice/slicing/objects/ServerAMD.py @@ -304,7 +304,7 @@ class TestI(Test.TestIntf): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, Ice.stringToIdentity("Test")) |