diff options
129 files changed, 373 insertions, 411 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES index dfb48c4308e..953de2b6712 100644 --- a/cpp/CHANGES +++ b/cpp/CHANGES @@ -133,12 +133,6 @@ Changes since version 3.1.1 scheme. See the Ice manual for information on the configuration of replicated IceGrid registries. -- 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 2b2f6bdead3..5e73a86c0c0 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -27,14 +27,14 @@ else: iceGridPort = 12010; nodeOptions = r' --Ice.Warn.Connections=0' + \ - r' --Ice.OA.IceGrid.Node.Endpoints=default' + \ + r' --IceGrid.Node.Endpoints=default' + \ r' --IceGrid.Node.WaitTime=30' + \ r' --Ice.ProgramName=icegridnode' + \ r' --IceGrid.Node.Trace.Replica=0' + \ r' --IceGrid.Node.Trace.Activator=0' + \ r' --IceGrid.Node.Trace.Adapter=0' + \ r' --IceGrid.Node.Trace.Server=0' + \ - r' --Ice.OA.IceGrid.Node.ThreadPool.SizeWarn=0' + \ + r' --IceGrid.Node.ThreadPool.SizeWarn=0' + \ r' --IceGrid.Node.PrintServersReady=node' + \ r' --Ice.NullHandleAbort' + \ r' --Ice.ThreadPool.Server.Size=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' --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.Server.Endpoints=default' + \ + r' --IceGrid.Registry.Internal.Endpoints=default' + \ + r' --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' --Ice.OA.IceGrid.Registry.Client.ThreadPool.SizeWarn=0' + \ + r' --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' --Ice.OA.IceGrid.Registry.Client.Endpoints="default -p ' + str(iceGridPort + i) + ' -t 30000" ' + \ + r' --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 5e08566aeec..f692784c411 100644 --- a/cpp/config/PropertyNames.def +++ b/cpp/config/PropertyNames.def @@ -153,19 +153,6 @@ 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>.ThreadPerConnection - OA.<any>.ThreadPerConnection.StackSize - OA.<any>.ThreadPool.Size - OA.<any>.ThreadPool.SizeMax - OA.<any>.ThreadPool.SizeWarn - OA.<any>.ThreadPool.StackSize Override.Compress Override.ConnectTimeout Override.Timeout @@ -214,10 +201,14 @@ IceBox: PrintServicesReady Service.<any> ServiceManager.AdapterId - ServiceManager.ReplicaGroupId ServiceManager.Endpoints + ServiceManager.Locator ServiceManager.PublishedEndpoints ServiceManager.RegisterProcess + ServiceManager.ReplicaGroupId + ServiceManager.Router + ServiceManager.ThreadPerConnection + ServiceManager.ThreadPerConnection.StackSize ServiceManager.ThreadPool.Size ServiceManager.ThreadPool.SizeMax ServiceManager.ThreadPool.SizeWarn @@ -237,18 +228,22 @@ IceGrid: AdminGUI.Endpoints InstanceName Node.AdapterId - Node.ReplicaGroupId - Node.RegisterProcess Node.CollocateRegistry Node.Data Node.DisableOnFailure Node.Endpoints + Node.Locator Node.Name Node.Output Node.PrintServersReady Node.PropertiesOverride Node.PublishedEndpoints Node.RedirectErrToOut + Node.RegisterProcess + Node.ReplicaGroupId + Node.Router + Node.ThreadPerConnection + Node.ThreadPerConnection.StackSize Node.ThreadPool.Size Node.ThreadPool.SizeMax Node.ThreadPool.SizeWarn @@ -269,15 +264,6 @@ IceGrid: Node.UserAccountMapper.CollocationOptimization Node.UserAccountMapper.ThreadPerConnection Node.WaitTime - Registry.SessionManager.AdapterId - Registry.SessionManager.ReplicaGroupId - Registry.SessionManager.Endpoints - Registry.SessionManager.PublishedEndpoints - Registry.SessionManager.RegisterProcess - Registry.SessionManager.ThreadPool.Size - Registry.SessionManager.ThreadPool.SizeMax - Registry.SessionManager.ThreadPool.SizeWarn - Registry.SessionManager.ThreadPool.StackSize Registry.AdminCryptPasswords Registry.AdminPermissionsVerifier Registry.AdminPermissionsVerifier.EndpointSelection @@ -298,10 +284,14 @@ IceGrid: Registry.AdminSSLPermissionsVerifier.CollocationOptimization Registry.AdminSSLPermissionsVerifier.ThreadPerConnection Registry.Client.AdapterId - Registry.Client.ReplicaGroupId Registry.Client.Endpoints + Registry.Client.Locator Registry.Client.PublishedEndpoints Registry.Client.RegisterProcess + Registry.Client.ReplicaGroupId + Registry.Client.Router + Registry.Client.ThreadPerConnection + Registry.Client.ThreadPerConnection.StackSize Registry.Client.ThreadPool.Size Registry.Client.ThreadPool.SizeMax Registry.Client.ThreadPool.SizeWarn @@ -311,10 +301,14 @@ IceGrid: Registry.DefaultTemplates Registry.DynamicRegistration Registry.Internal.AdapterId - Registry.Internal.ReplicaGroupId Registry.Internal.Endpoints + Registry.Internal.Locator Registry.Internal.PublishedEndpoints Register.Internal.RegisterProcess + Registry.Internal.ReplicaGroupId + Registry.Internal.Router + Registry.Internal.ThreadPerConnection + Registry.Internal.ThreadPerConnection.StackSize Registry.Internal.ThreadPool.Size Registry.Internal.ThreadPool.SizeMax Registry.Internal.ThreadPool.SizeWarn @@ -332,14 +326,31 @@ IceGrid: Registry.ReplicaName Registry.ReplicaSessionTimeout Registry.Server.AdapterId - Registry.Server.ReplicaGroupId Registry.Server.Endpoints + Registry.Server.Locator Registry.Server.PublishedEndpoints Registry.Server.RegisterProcess + Registry.Server.ReplicaGroupId + Registry.Server.Router + Registry.Server.ThreadPerConnection + Registry.Server.ThreadPerConnection.StackSize Registry.Server.ThreadPool.Size Registry.Server.ThreadPool.SizeMax Registry.Server.ThreadPool.SizeWarn Registry.Server.ThreadPool.StackSize + Registry.SessionManager.AdapterId + Registry.SessionManager.Endpoints + Registry.SessionManager.Locator + Registry.SessionManager.PublishedEndpoints + Registry.SessionManager.RegisterProcess + Registry.SessionManager.ReplicaGroupId + Registry.SessionManager.Router + Registry.SessionManager.ThreadPerConnection + Registry.SessionManager.ThreadPerConnection.StackSize + Registry.SessionManager.ThreadPool.Size + Registry.SessionManager.ThreadPool.SizeMax + Registry.SessionManager.ThreadPool.SizeWarn + Registry.SessionManager.ThreadPool.StackSize Registry.SessionTimeout Registry.SSLPermissionsVerifier Registry.SSLPermissionsVerifier.EndpointSelection @@ -363,12 +374,15 @@ IceGrid: IcePatch2: AdapterId - ReplicaGroupId Admin.AdapterId - Admin.ReplicaGroupId Admin.Endpoints + Admin.Locator Admin.PublishedEndpoints Admin.RegisterProcess + Admin.ReplicaGroupId + Admin.Router + Admin.ThreadPerConnection + Admin.ThreadPerConnection.StackSize Admin.ThreadPool.Size Admin.ThreadPool.SizeMax Admin.ThreadPool.SizeWarn @@ -377,10 +391,15 @@ IcePatch2: Directory Endpoints InstanceName + Locator PublishedEndpoints RegisterProcess + ReplicaGroupId Remove + Router Thorough + ThreadPerConnection + ThreadPerConnection.StackSize ThreadPool.Size ThreadPool.SizeMax ThreadPool.SizeWarn @@ -425,17 +444,21 @@ IceStorm: Flush.Timeout InstanceName Publish.AdapterId - Publish.ReplicaGroupId Publish.Endpoints + Publish.Locator Publish.PublishedEndpoints Publish.RegisterProcess + Publish.ReplicaGroupId + Publish.Router + Publish.ThreadPerConnection + Publish.ThreadPerConnection.StackSize Publish.ThreadPool.Size Publish.ThreadPool.SizeMax Publish.ThreadPool.SizeWarn Publish.ThreadPool.StackSize TopicManager.AdapterId - TopicManager.ReplicaGroupId TopicManager.Endpoints + TopicManager.Locator TopicManager.Proxy TopicManager.Proxy.EndpointSelection TopicManager.Proxy.ConnectionCached @@ -447,6 +470,10 @@ IceStorm: TopicManager.Proxy.ThreadPerConnection TopicManager.PublishedEndpoints TopicManager.RegisterProcess + TopicManager.ReplicaGroupId + TopicManager.Router + TopicManager.ThreadPerConnection + TopicManager.ThreadPerConnection.StackSize TopicManager.ThreadPool.Size TopicManager.ThreadPool.SizeMax TopicManager.ThreadPool.SizeWarn diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index b980e2a6451..c647c319c91 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -25,8 +25,8 @@ </adapter> <properties> - <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.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="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="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.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="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 811786ca555..0b627b50ba0 100644 --- a/cpp/demo/Database/Oracle/occi/config.server +++ b/cpp/demo/Database/Oracle/occi/config.server @@ -1,4 +1,4 @@ -Ice.OA.HR.Endpoints=tcp -p 10000 +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 a7ec7e19f06..735c720adc8 100644 --- a/cpp/demo/Database/Oracle/proc/config.server +++ b/cpp/demo/Database/Oracle/proc/config.server @@ -1,4 +1,4 @@ -Ice.OA.HR.Endpoints=tcp -p 10000 +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 aeae5134b38..98e198f5c14 100644 --- a/cpp/demo/Freeze/library/config.collocated +++ b/cpp/demo/Freeze/library/config.collocated @@ -1,4 +1,4 @@ -Ice.OA.Library.Endpoints=default -p 10000 +Library.Endpoints=default -p 10000 Library.Proxy=library:default -p 10000 Library.EvictorSize=3 diff --git a/cpp/demo/Freeze/library/config.server b/cpp/demo/Freeze/library/config.server index ec6edf4a0e0..2a0e997bbf6 100644 --- a/cpp/demo/Freeze/library/config.server +++ b/cpp/demo/Freeze/library/config.server @@ -1,4 +1,4 @@ -Ice.OA.Library.Endpoints=default -p 10000 +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 bd1e093dffc..cbef5a2e21e 100644 --- a/cpp/demo/Freeze/phonebook/config.collocated +++ b/cpp/demo/Freeze/phonebook/config.collocated @@ -3,7 +3,7 @@ Freeze.Trace.DbEnv=2 Freeze.Evictor.db.contacts.SavePeriod=10000 Freeze.Evictor.db.contacts.PopulateEmptyIndices=1 -Ice.OA.PhoneBook.Endpoints=default -p 10000 +PhoneBook.Endpoints=default -p 10000 PhoneBook.Proxy=phonebook:default -p 10000 PhoneBook.EvictorSize=3 diff --git a/cpp/demo/Freeze/phonebook/config.server b/cpp/demo/Freeze/phonebook/config.server index 4a324b8b9d4..3edf516c354 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 -Ice.OA.PhoneBook.Endpoints=default -p 10000 +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 80783ab4894..b5b1b6d19a0 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. # -Ice.OA.Callback.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 +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. # -Ice.OA.Callback.Client.Endpoints= +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 bb37111f2f3..78585f8e95c 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. # -Ice.OA.Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1 +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 @@ Ice.OA.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. # -Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1 +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 5dafe9342dd..f79e0e891f7 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. # -Ice.OA.Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000 +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 8bfd51c9b3f..d5329e88926 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. # -Ice.OA.SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001 +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 b5c3978cbcf..4edc4c3c42b 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. # -Ice.OA.Chat.Client.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 +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. # -Ice.OA.Chat.Client.Endpoints= +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 d35d2a53ff2..a29d4a25a0e 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. # -Ice.OA.Glacier2.Client.Endpoints=ssl -p 10005 -h 127.0.0.1 +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 @@ Ice.OA.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. # -Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1 +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 21e486c5ffa..b77909532ea 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. # -Ice.OA.ChatServer.Endpoints=tcp -h 127.0.0.1 -p 10001 +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 d8cd4497f42..db8ff60a07f 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. # -Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +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 05c1345d404..147d3c96ade 100644 --- a/cpp/demo/Ice/async/config.server +++ b/cpp/demo/Ice/async/config.server @@ -3,7 +3,7 @@ # "Hello". The following line sets the endpoints for this # adapter. # -Ice.OA.Hello.Endpoints=tcp -p 10000 +Hello.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 f1409ce60a8..ef2745b172b 100644 --- a/cpp/demo/Ice/bidir/config.server +++ b/cpp/demo/Ice/bidir/config.server @@ -1,4 +1,4 @@ -Ice.OA.Callback.Server.Endpoints=tcp -p 10000 +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 95caf8d3eae..a4b00fb2984 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 -Ice.OA.Callback.Client.Endpoints=tcp:udp:ssl +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 795a07e8f27..deaef3f87de 100644 --- a/cpp/demo/Ice/callback/config.server +++ b/cpp/demo/Ice/callback/config.server @@ -1,4 +1,4 @@ -Ice.OA.Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +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 66f7d41e76b..d8d8d5800af 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. # -Ice.OA.Echo.Endpoints=tcp -p 10000 +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 aeff24452ac..bb2040f2cdc 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. # -Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +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 09fd8616e19..49e49e0ccd9 100644 --- a/cpp/demo/Ice/invoke/config.server +++ b/cpp/demo/Ice/invoke/config.server @@ -1 +1 @@ -Ice.OA.Printer.Endpoints=tcp -p 10000 +Printer.Endpoints=tcp -p 10000 diff --git a/cpp/demo/Ice/latency/config.server b/cpp/demo/Ice/latency/config.server index 66310cc399c..7df795b4165 100644 --- a/cpp/demo/Ice/latency/config.server +++ b/cpp/demo/Ice/latency/config.server @@ -1,4 +1,4 @@ -Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1 +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 d9034373aab..a88b1564997 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 -Ice.OA.Nested.Client.Endpoints=default -t 10000 +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 897e00f9832..d694e9de848 100644 --- a/cpp/demo/Ice/nested/config.server +++ b/cpp/demo/Ice/nested/config.server @@ -1,4 +1,4 @@ -Ice.OA.Nested.Server.Endpoints=default -p 10000 -t 10000 +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 2731a988e56..8aa8dfac36f 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. # -Ice.OA.SessionFactory.Endpoints=default -p 10000 +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 2323af329a9..9a13a908f00 100644 --- a/cpp/demo/Ice/throughput/config.server +++ b/cpp/demo/Ice/throughput/config.server @@ -1,4 +1,4 @@ -Ice.OA.Throughput.Endpoints=default -p 10000 +Throughput.Endpoints=default -p 10000 # # SSL Configuration diff --git a/cpp/demo/Ice/value/config.server b/cpp/demo/Ice/value/config.server index 175aeea84cc..8189baed470 100644 --- a/cpp/demo/Ice/value/config.server +++ b/cpp/demo/Ice/value/config.server @@ -1,4 +1,4 @@ # # The server's adapter endpoint. # -Ice.OA.Value.Endpoints=tcp -p 10000 +Value.Endpoints=tcp -p 10000 diff --git a/cpp/demo/IceBox/hello/config.icebox b/cpp/demo/IceBox/hello/config.icebox index c022c39a6fd..65c0c31d1a0 100644 --- a/cpp/demo/IceBox/hello/config.icebox +++ b/cpp/demo/IceBox/hello/config.icebox @@ -7,7 +7,7 @@ IceBox.InstanceName=DemoIceBox # # The IceBox server endpoint configuration # -Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 +IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 # # The hello service diff --git a/cpp/demo/IceBox/hello/config.service b/cpp/demo/IceBox/hello/config.service index 09a7bb9d445..f191bec4086 100644 --- a/cpp/demo/IceBox/hello/config.service +++ b/cpp/demo/IceBox/hello/config.service @@ -2,7 +2,7 @@ # The service creates one single object adapter with the name of the # service. The following line sets the endpoints for this adapter. # -Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +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 21ef3f442f7..94d4210bbfd 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. # -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.Client.Endpoints=default -p 12000 +IceGrid.Registry.Server.Endpoints=default +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 -Ice.OA.IceGrid.Node.Endpoints=default +IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cpp/demo/IceGrid/replication/config.master b/cpp/demo/IceGrid/replication/config.master index 08471143e9e..04d2053b5ab 100644 --- a/cpp/demo/IceGrid/replication/config.master +++ b/cpp/demo/IceGrid/replication/config.master @@ -3,9 +3,9 @@ IceGrid.InstanceName=DemoIceGrid # # IceGrid registry configuration. # -Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 -t 10000 -Ice.OA.IceGrid.Registry.Server.Endpoints=default -t 10000 -Ice.OA.IceGrid.Registry.Internal.Endpoints=default -t 10000 +IceGrid.Registry.Client.Endpoints=default -p 12000 -t 10000 +IceGrid.Registry.Server.Endpoints=default -t 10000 +IceGrid.Registry.Internal.Endpoints=default -t 10000 IceGrid.Registry.Data=db/master IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier diff --git a/cpp/demo/IceGrid/replication/config.node1 b/cpp/demo/IceGrid/replication/config.node1 index f9b805d0ed8..af6210aa273 100644 --- a/cpp/demo/IceGrid/replication/config.node1 +++ b/cpp/demo/IceGrid/replication/config.node1 @@ -4,7 +4,7 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 -t 10000:default -p 120 # IceGrid node configuration. # IceGrid.Node.Name=node1 -Ice.OA.IceGrid.Node.Endpoints=default -t 10000 +IceGrid.Node.Endpoints=default -t 10000 IceGrid.Node.Data=db/node1 Ice.StdErr=db/node1/stderr.txt diff --git a/cpp/demo/IceGrid/replication/config.node2 b/cpp/demo/IceGrid/replication/config.node2 index 26a9e595af1..f0a4d586dc3 100644 --- a/cpp/demo/IceGrid/replication/config.node2 +++ b/cpp/demo/IceGrid/replication/config.node2 @@ -4,7 +4,7 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 -t 10000:default -p 120 # IceGrid node configuration. # IceGrid.Node.Name=node2 -Ice.OA.IceGrid.Node.Endpoints=default -t 10000 +IceGrid.Node.Endpoints=default -t 10000 IceGrid.Node.Data=db/node2 Ice.StdErr=db/node2/stderr.txt diff --git a/cpp/demo/IceGrid/replication/config.replica1 b/cpp/demo/IceGrid/replication/config.replica1 index 8df5cb75bcd..98c9d2ea2ca 100644 --- a/cpp/demo/IceGrid/replication/config.replica1 +++ b/cpp/demo/IceGrid/replication/config.replica1 @@ -3,9 +3,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 -t 10000:default -p 120 # # IceGrid registry configuration. # -Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12001 -t 10000 -Ice.OA.IceGrid.Registry.Server.Endpoints=default -t 10000 -Ice.OA.IceGrid.Registry.Internal.Endpoints=default -t 10000 +IceGrid.Registry.Client.Endpoints=default -p 12001 -t 10000 +IceGrid.Registry.Server.Endpoints=default -t 10000 +IceGrid.Registry.Internal.Endpoints=default -t 10000 IceGrid.Registry.Data=db/replica1 IceGrid.Registry.ReplicaName=Replica1 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier diff --git a/cpp/demo/IceGrid/replication/config.replica2 b/cpp/demo/IceGrid/replication/config.replica2 index 732fa32d785..1f1499d2112 100644 --- a/cpp/demo/IceGrid/replication/config.replica2 +++ b/cpp/demo/IceGrid/replication/config.replica2 @@ -3,9 +3,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 -t 10000:default -p 120 # # IceGrid registry configuration. # -Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12002 -t 10000 -Ice.OA.IceGrid.Registry.Server.Endpoints=default -t 10000 -Ice.OA.IceGrid.Registry.Internal.Endpoints=default -t 10000 +IceGrid.Registry.Client.Endpoints=default -p 12002 -t 10000 +IceGrid.Registry.Server.Endpoints=default -t 10000 +IceGrid.Registry.Internal.Endpoints=default -t 10000 IceGrid.Registry.Data=db/replica2 IceGrid.Registry.ReplicaName=Replica2 IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier diff --git a/cpp/demo/IceGrid/sessionActivation/config.grid b/cpp/demo/IceGrid/sessionActivation/config.grid index 21ef3f442f7..94d4210bbfd 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. # -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.Client.Endpoints=default -p 12000 +IceGrid.Registry.Server.Endpoints=default +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 -Ice.OA.IceGrid.Node.Endpoints=default +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 21ef3f442f7..94d4210bbfd 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. # -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.Client.Endpoints=default -p 12000 +IceGrid.Registry.Server.Endpoints=default +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 -Ice.OA.IceGrid.Node.Endpoints=default +IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cpp/demo/IcePatch2/MFC/PatchClient.cpp b/cpp/demo/IcePatch2/MFC/PatchClient.cpp index abf5dfb629d..275fa480d9a 100755 --- a/cpp/demo/IcePatch2/MFC/PatchClient.cpp +++ b/cpp/demo/IcePatch2/MFC/PatchClient.cpp @@ -63,9 +63,9 @@ CPatchClientApp::InitInstance() } Ice::PropertiesPtr properties = communicator->getProperties(); - if(properties->getProperty("Ice.OA.IcePatch2.Endpoints").empty()) + if(properties->getProperty("IcePatch2.Endpoints").empty()) { - properties->setProperty("Ice.OA.IcePatch2.Endpoints", "tcp -h 127.0.0.1 -p 10000"); + properties->setProperty("IcePatch2.Endpoints", "tcp -h 127.0.0.1 -p 10000"); } CPatchDlg dlg(communicator); diff --git a/cpp/demo/IcePatch2/MFC/README b/cpp/demo/IcePatch2/MFC/README index 2808e2b4c87..6f0a3686113 100755 --- a/cpp/demo/IcePatch2/MFC/README +++ b/cpp/demo/IcePatch2/MFC/README @@ -16,7 +16,7 @@ Next, start the IcePatch2 server. Note that the trailing "." argument in the following command is required and directs the server to use the
current directory as its data directory:
-> icepatch2server --Ice.OA.IcePatch2.Endpoints="tcp -h 127.0.0.1 -p 10000" .
+> icepatch2server --IcePatch2.Endpoints="tcp -h 127.0.0.1 -p 10000" .
Before we start the patch client, we must first create an empty
directory where the downloaded files will be placed. For example, open
@@ -25,7 +25,7 @@ a new command window and execute this command: > mkdir C:\icepatch_download
Now you can start the IcePatch2 client (You will also need to pass a
-"Ice.OA.IcePatch2.Endpoints" argument if you use a endpoint other than the
+"IcePatch2.Endpoints" argument if you use a endpoint other than the
one shown above when you start icepatch2server):
> patch
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox index 2137d0ce61f..c94245fff29 100644 --- a/cpp/demo/IceStorm/clock/config.icebox +++ b/cpp/demo/IceStorm/clock/config.icebox @@ -1,7 +1,7 @@ # # The IceBox server endpoint configuration # -Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998 +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 0ed60e4cb34..b9930aa64d4 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. # -Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000 +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). # -Ice.OA.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001 +IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001 # # TopicManager Tracing diff --git a/cpp/demo/IceStorm/clock/config.sub b/cpp/demo/IceStorm/clock/config.sub index 4f60a8ca7c1..ad2ac555de8 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. # -Ice.OA.Clock.Subscriber.Endpoints=tcp:udp +Clock.Subscriber.Endpoints=tcp:udp # # 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 2137d0ce61f..c94245fff29 100644 --- a/cpp/demo/IceStorm/counter/config.icebox +++ b/cpp/demo/IceStorm/counter/config.icebox @@ -1,7 +1,7 @@ # # The IceBox server endpoint configuration # -Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998 +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 f027f8534ad..be119f2b1da 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. # -Ice.OA.Counter.Endpoints=tcp -p 12000 +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 15cd03ffd1f..f6deda26be5 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. # -Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000 +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. # -Ice.OA.IceStorm.Publish.Endpoints=default +IceStorm.Publish.Endpoints=default # # TopicManager Tracing diff --git a/cpp/demo/IceStorm/replicated/config.grid b/cpp/demo/IceStorm/replicated/config.grid index 21ef3f442f7..94d4210bbfd 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. # -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.Client.Endpoints=default -p 12000 +IceGrid.Registry.Server.Endpoints=default +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 -Ice.OA.IceGrid.Node.Endpoints=default +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 64601d0cb6f..681d31eaca5 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. # -Ice.OA.Clock.Subscriber.Endpoints=tcp +Clock.Subscriber.Endpoints=tcp # # Network Tracing diff --git a/cpp/install/rpm/glacier2router.conf b/cpp/install/rpm/glacier2router.conf index d06ec7e3d73..1b475bf47a1 100644 --- a/cpp/install/rpm/glacier2router.conf +++ b/cpp/install/rpm/glacier2router.conf @@ -25,7 +25,7 @@ Ice.ThreadPerConnection.StackSize=262144 # - 4063 (unsecure) # - 4064 (secure, using SSL) # -Ice.OA.Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1 +Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1 # # The server-visible endpoint of Glacier2. This endpoint is only @@ -34,7 +34,7 @@ Ice.OA.Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1 # on the loopback, so that the server is not directly accessible from # the Internet. # -Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1 +Glacier2.Server.Endpoints=tcp -h 127.0.0.1 # # This permissions verifier allows any user-id / password combination; diff --git a/cpp/install/rpm/icegridnode.conf b/cpp/install/rpm/icegridnode.conf index 9979a40a688..0f05162934e 100644 --- a/cpp/install/rpm/icegridnode.conf +++ b/cpp/install/rpm/icegridnode.conf @@ -17,7 +17,7 @@ IceGrid.Node.Name=node1 # The node object adapter listens on all interface using an OS- # assigned port # -Ice.OA.IceGrid.Node.Endpoints=tcp +IceGrid.Node.Endpoints=tcp # # The directory where the IceGrid node maintains its data diff --git a/cpp/install/rpm/icegridregistry.conf b/cpp/install/rpm/icegridregistry.conf index b86ce6e2356..83253c51819 100644 --- a/cpp/install/rpm/icegridregistry.conf +++ b/cpp/install/rpm/icegridregistry.conf @@ -15,16 +15,16 @@ IceGrid.InstanceName=SampleIceGrid # - 4061 (unsecure) # - 4062 (secure, using SSL) # -Ice.OA.IceGrid.Registry.Client.Endpoints=tcp -p 4061 -#Ice.OA.IceGrid.Registry.Client.Endpoints=ssl -p 4062 -#Ice.OA.IceGrid.Registry.Client.Endpoints=tcp -p 4061:ssl -p 4062 +IceGrid.Registry.Client.Endpoints=tcp -p 4061 +#IceGrid.Registry.Client.Endpoints=ssl -p 4062 +#IceGrid.Registry.Client.Endpoints=tcp -p 4061:ssl -p 4062 # # Server and Internal object adapters: listens on all interfaces # using an OS-assigned port number. # -Ice.OA.IceGrid.Registry.Server.Endpoints=tcp -Ice.OA.IceGrid.Registry.Internal.Endpoints=tcp +IceGrid.Registry.Server.Endpoints=tcp +IceGrid.Registry.Internal.Endpoints=tcp # # The registry DB home; must exist when icegridregistry starts diff --git a/cpp/install/windows/glacier2router.cfg b/cpp/install/windows/glacier2router.cfg index 19f2a9c6df7..068b0920c37 100644 --- a/cpp/install/windows/glacier2router.cfg +++ b/cpp/install/windows/glacier2router.cfg @@ -25,7 +25,7 @@ Ice.ThreadPerConnection.StackSize=262144 # - 4063 (unsecure)
# - 4064 (secure, using SSL)
#
-Ice.OA.Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1
+Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1
#
# The server-visible endpoint of Glacier2. This endpoint is only
@@ -34,7 +34,7 @@ Ice.OA.Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1 # on the loopback, so that the server is not directly accessible from
# the Internet.
#
-Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1
+Glacier2.Server.Endpoints=tcp -h 127.0.0.1
#
# This permissions verifier allows any user-id / password combination;
diff --git a/cpp/install/windows/icegridnode.cfg b/cpp/install/windows/icegridnode.cfg index 5c542e8e0e6..a4e68c6b946 100644 --- a/cpp/install/windows/icegridnode.cfg +++ b/cpp/install/windows/icegridnode.cfg @@ -17,7 +17,7 @@ IceGrid.Node.Name=node1 # The node object adapter listens on all interface using an OS-
# assigned port
#
-Ice.OA.IceGrid.Node.Endpoints=tcp
+IceGrid.Node.Endpoints=tcp
#
# The directory where the IceGrid node maintains its data
diff --git a/cpp/install/windows/icegridregistry.cfg b/cpp/install/windows/icegridregistry.cfg index c9f4e7d6ca6..10e364c8a3d 100644 --- a/cpp/install/windows/icegridregistry.cfg +++ b/cpp/install/windows/icegridregistry.cfg @@ -15,16 +15,16 @@ IceGrid.InstanceName=SampleIceGrid # - 4061 (unsecure)
# - 4062 (secure, using SSL)
#
-Ice.OA.IceGrid.Registry.Client.Endpoints=tcp -p 4061
-#Ice.OA.IceGrid.Registry.Client.Endpoints=ssl -p 4062
-#Ice.OA.IceGrid.Registry.Client.Endpoints=tcp -p 4061:ssl -p 4062
+IceGrid.Registry.Client.Endpoints=tcp -p 4061
+#IceGrid.Registry.Client.Endpoints=ssl -p 4062
+#IceGrid.Registry.Client.Endpoints=tcp -p 4061:ssl -p 4062
#
# Server and Internal object adapters: listens on all interfaces
# using an OS-assigned port number.
#
-Ice.OA.IceGrid.Registry.Server.Endpoints=tcp
-Ice.OA.IceGrid.Registry.Internal.Endpoints=tcp
+IceGrid.Registry.Server.Endpoints=tcp
+IceGrid.Registry.Internal.Endpoints=tcp
#
# The registry DB home; must exist when icegridregistry starts
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index c949bef73fe..9855723bd18 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -131,11 +131,8 @@ Glacier2::RouterService::start(int argc, char* argv[]) // // Initialize the client object adapter. // - // 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()) + const string clientEndpointsProperty = "Glacier2.Client.Endpoints"; + if(properties->getProperty(clientEndpointsProperty).empty()) { error("property `" + clientEndpointsProperty + "' is not set"); return false; @@ -146,12 +143,9 @@ Glacier2::RouterService::start(int argc, char* argv[]) // Initialize the server object adapter only if server endpoints // are defined. // - // DEPRECATED PROPERTY: Remove extra code in future release - // - const string serverEndpointsProperty = "Ice.OA.Glacier2.Server.Endpoints"; + const string serverEndpointsProperty = "Glacier2.Server.Endpoints"; ObjectAdapterPtr serverAdapter; - if(!properties->getProperty(serverEndpointsProperty).empty() || - !properties->getProperty("Glacier2.Server.Endpoints").empty()) + if(!properties->getProperty(serverEndpointsProperty).empty()) { serverAdapter = communicator()->createObjectAdapter("Glacier2.Server"); } @@ -160,12 +154,9 @@ Glacier2::RouterService::start(int argc, char* argv[]) // Initialize the admin object adapter only if admin endpoints // are defined. // - // DEPRECATED PROPERTY: Remove extra code in future release - // - const string adminEndpointsProperty = "Ice.OA.Glacier2.Admin.Endpoints"; + const string adminEndpointsProperty = "Glacier2.Admin.Endpoints"; ObjectAdapterPtr adminAdapter; - if(!properties->getProperty(adminEndpointsProperty).empty() || - !properties->getProperty("Glacier2.Admin.Endpoints").empty()) + if(!properties->getProperty(adminEndpointsProperty).empty()) { adminAdapter = communicator()->createObjectAdapter("Glacier2.Admin"); } @@ -176,7 +167,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("Ice.OA.Glacier2Internal.Verifiers.AdapterId", IceUtil::generateUUID()); + properties->setProperty("Glacier2Internal.Verifiers.AdapterId", IceUtil::generateUUID()); ObjectAdapterPtr verifierAdapter = communicator()->createObjectAdapter("Glacier2Internal.Verifiers"); // diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index d12170920bc..3f69ac6c40f 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -45,8 +45,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -string Ice::ObjectAdapterI::_propertyPrefix = "Ice.OA."; - string Ice::ObjectAdapterI::getName() const { @@ -103,11 +101,7 @@ Ice::ObjectAdapterI::activate() { 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; + registerProcess = properties->getPropertyAsInt(_name + ".RegisterProcess") > 0; } } @@ -757,57 +751,27 @@ 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) { - StringSeq props = filterProperties(_propertyPrefix + _name + "."); - if(oldProps.size() == 0 && props.size() == 0) - { - InitializationException ex(__FILE__, __LINE__); - ex.reason = "object adapter \"" + _name + "\" requires configuration."; - throw ex; - } - } - - 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]; - } + InitializationException ex(__FILE__, __LINE__); + ex.reason = "object adapter \"" + _name + "\" requires configuration."; + throw ex; } - 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")); + const_cast<string&>(_id) = properties->getProperty(_name + ".AdapterId"); + const_cast<string&>(_replicaGroupId) = properties->getProperty(_name + ".ReplicaGroupId"); __setNoDelete(true); try { - _threadPerConnection = properties->getPropertyAsInt(_propertyPrefix + _name + ".ThreadPerConnection") > 0; - - int threadPoolSize = properties->getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.Size"); - if(threadPoolSize == 0) - { - threadPoolSize = properties->getPropertyAsInt(_name + ".ThreadPool.Size"); - } - int threadPoolSizeMax = properties->getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.SizeMax"); - if(threadPoolSizeMax == 0) - { - threadPoolSizeMax = properties->getPropertyAsInt(_name + ".ThreadPool.SizeMax"); - } + _threadPerConnection = properties->getPropertyAsInt(_name + ".ThreadPerConnection") > 0; + int threadPoolSize = properties->getPropertyAsInt(_name + ".ThreadPool.Size"); + int threadPoolSizeMax = properties->getPropertyAsInt(_name + ".ThreadPool.SizeMax"); if(_threadPerConnection && (threadPoolSize > 0 || threadPoolSizeMax > 0)) { InitializationException ex(__FILE__, __LINE__); @@ -824,7 +788,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica if(_threadPerConnection) { int stackSize = - properties->getPropertyAsIntWithDefault(_propertyPrefix + _name + ".ThreadPerConnection.StackSize", + properties->getPropertyAsIntWithDefault(_name + ".ThreadPerConnection.StackSize", static_cast<Int>(_instance->threadPerConnectionStackSize())); if(stackSize < 0) { @@ -843,26 +807,13 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica // if(threadPoolSize > 0 || threadPoolSizeMax > 0) { - if(!properties->getProperty(_propertyPrefix + _name + ".ThreadPool.Size").empty() || - !properties->getProperty(_propertyPrefix + _name + ".ThreadPool.SizeMax").empty()) - { - _threadPool = new ThreadPool(_instance, _propertyPrefix + _name + ".ThreadPool", 0); - } - else - { - _threadPool = new ThreadPool(_instance, _name + ".ThreadPool", 0); - } + _threadPool = new ThreadPool(_instance, _name + ".ThreadPool", 0); } if(!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")); - } + _instance->proxyFactory()->propertyToProxy(_name + ".Router")); } if(router) { @@ -913,8 +864,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica vector<EndpointIPtr> endpoints; if(endpointInfo.empty()) { - endpoints = parseEndpoints(properties->getPropertyWithDefault(_propertyPrefix + _name + ".Endpoints", - properties->getProperty(_name + ".Endpoints"))); + endpoints = parseEndpoints(properties->getProperty(_name + ".Endpoints")); } else { @@ -938,8 +888,7 @@ 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 = properties->getPropertyWithDefault(_propertyPrefix + _name + ".PublishedEndpoints", - properties->getProperty(_name + ".PublishedEndpoints")); + string endpts = properties->getProperty(_name + ".PublishedEndpoints"); _publishedEndpoints = parseEndpoints(endpts); if(_publishedEndpoints.empty()) { @@ -954,12 +903,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica not1(Ice::constMemFun(&EndpointI::publish))), _publishedEndpoints.end()); } - string locatorProperty = _propertyPrefix + _name + ".Locator"; - if(!properties->getProperty(locatorProperty).empty()) - { - setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(locatorProperty))); - } - else if(!properties->getProperty(_name + ".Locator").empty()) + if(!properties->getProperty(_name + ".Locator").empty()) { setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Locator"))); } diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index b61b7e3e1a7..953bbdc2bc6 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -126,8 +126,6 @@ private: bool _threadPerConnection; size_t _threadPerConnectionStackSize; - static std::string _propertyPrefix; - class ProcessI : public Process { public: diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index d50446621b9..3a5c7d398bc 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', Tue Feb 13 09:45:20 2007 +// Generated by makeprops.py from file `../config/PropertyNames.def', Wed Feb 14 09:38:50 2007 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -55,19 +55,6 @@ 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.*.ThreadPerConnection", - "Ice.OA.*.ThreadPerConnection.StackSize", - "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", @@ -119,10 +106,14 @@ const char* IceInternal::PropertyNames::IceBoxProps[] = "IceBox.PrintServicesReady", "IceBox.Service.*", "IceBox.ServiceManager.AdapterId", - "IceBox.ServiceManager.ReplicaGroupId", "IceBox.ServiceManager.Endpoints", + "IceBox.ServiceManager.Locator", "IceBox.ServiceManager.PublishedEndpoints", "IceBox.ServiceManager.RegisterProcess", + "IceBox.ServiceManager.ReplicaGroupId", + "IceBox.ServiceManager.Router", + "IceBox.ServiceManager.ThreadPerConnection", + "IceBox.ServiceManager.ThreadPerConnection.StackSize", "IceBox.ServiceManager.ThreadPool.Size", "IceBox.ServiceManager.ThreadPool.SizeMax", "IceBox.ServiceManager.ThreadPool.SizeWarn", @@ -148,18 +139,22 @@ const char* IceInternal::PropertyNames::IceGridProps[] = "IceGrid.AdminGUI.Endpoints", "IceGrid.InstanceName", "IceGrid.Node.AdapterId", - "IceGrid.Node.ReplicaGroupId", - "IceGrid.Node.RegisterProcess", "IceGrid.Node.CollocateRegistry", "IceGrid.Node.Data", "IceGrid.Node.DisableOnFailure", "IceGrid.Node.Endpoints", + "IceGrid.Node.Locator", "IceGrid.Node.Name", "IceGrid.Node.Output", "IceGrid.Node.PrintServersReady", "IceGrid.Node.PropertiesOverride", "IceGrid.Node.PublishedEndpoints", "IceGrid.Node.RedirectErrToOut", + "IceGrid.Node.RegisterProcess", + "IceGrid.Node.ReplicaGroupId", + "IceGrid.Node.Router", + "IceGrid.Node.ThreadPerConnection", + "IceGrid.Node.ThreadPerConnection.StackSize", "IceGrid.Node.ThreadPool.Size", "IceGrid.Node.ThreadPool.SizeMax", "IceGrid.Node.ThreadPool.SizeWarn", @@ -180,15 +175,6 @@ const char* IceInternal::PropertyNames::IceGridProps[] = "IceGrid.Node.UserAccountMapper.CollocationOptimization", "IceGrid.Node.UserAccountMapper.ThreadPerConnection", "IceGrid.Node.WaitTime", - "IceGrid.Registry.SessionManager.AdapterId", - "IceGrid.Registry.SessionManager.ReplicaGroupId", - "IceGrid.Registry.SessionManager.Endpoints", - "IceGrid.Registry.SessionManager.PublishedEndpoints", - "IceGrid.Registry.SessionManager.RegisterProcess", - "IceGrid.Registry.SessionManager.ThreadPool.Size", - "IceGrid.Registry.SessionManager.ThreadPool.SizeMax", - "IceGrid.Registry.SessionManager.ThreadPool.SizeWarn", - "IceGrid.Registry.SessionManager.ThreadPool.StackSize", "IceGrid.Registry.AdminCryptPasswords", "IceGrid.Registry.AdminPermissionsVerifier", "IceGrid.Registry.AdminPermissionsVerifier.EndpointSelection", @@ -209,10 +195,14 @@ const char* IceInternal::PropertyNames::IceGridProps[] = "IceGrid.Registry.AdminSSLPermissionsVerifier.CollocationOptimization", "IceGrid.Registry.AdminSSLPermissionsVerifier.ThreadPerConnection", "IceGrid.Registry.Client.AdapterId", - "IceGrid.Registry.Client.ReplicaGroupId", "IceGrid.Registry.Client.Endpoints", + "IceGrid.Registry.Client.Locator", "IceGrid.Registry.Client.PublishedEndpoints", "IceGrid.Registry.Client.RegisterProcess", + "IceGrid.Registry.Client.ReplicaGroupId", + "IceGrid.Registry.Client.Router", + "IceGrid.Registry.Client.ThreadPerConnection", + "IceGrid.Registry.Client.ThreadPerConnection.StackSize", "IceGrid.Registry.Client.ThreadPool.Size", "IceGrid.Registry.Client.ThreadPool.SizeMax", "IceGrid.Registry.Client.ThreadPool.SizeWarn", @@ -222,10 +212,14 @@ const char* IceInternal::PropertyNames::IceGridProps[] = "IceGrid.Registry.DefaultTemplates", "IceGrid.Registry.DynamicRegistration", "IceGrid.Registry.Internal.AdapterId", - "IceGrid.Registry.Internal.ReplicaGroupId", "IceGrid.Registry.Internal.Endpoints", + "IceGrid.Registry.Internal.Locator", "IceGrid.Registry.Internal.PublishedEndpoints", "IceGrid.Register.Internal.RegisterProcess", + "IceGrid.Registry.Internal.ReplicaGroupId", + "IceGrid.Registry.Internal.Router", + "IceGrid.Registry.Internal.ThreadPerConnection", + "IceGrid.Registry.Internal.ThreadPerConnection.StackSize", "IceGrid.Registry.Internal.ThreadPool.Size", "IceGrid.Registry.Internal.ThreadPool.SizeMax", "IceGrid.Registry.Internal.ThreadPool.SizeWarn", @@ -243,14 +237,31 @@ const char* IceInternal::PropertyNames::IceGridProps[] = "IceGrid.Registry.ReplicaName", "IceGrid.Registry.ReplicaSessionTimeout", "IceGrid.Registry.Server.AdapterId", - "IceGrid.Registry.Server.ReplicaGroupId", "IceGrid.Registry.Server.Endpoints", + "IceGrid.Registry.Server.Locator", "IceGrid.Registry.Server.PublishedEndpoints", "IceGrid.Registry.Server.RegisterProcess", + "IceGrid.Registry.Server.ReplicaGroupId", + "IceGrid.Registry.Server.Router", + "IceGrid.Registry.Server.ThreadPerConnection", + "IceGrid.Registry.Server.ThreadPerConnection.StackSize", "IceGrid.Registry.Server.ThreadPool.Size", "IceGrid.Registry.Server.ThreadPool.SizeMax", "IceGrid.Registry.Server.ThreadPool.SizeWarn", "IceGrid.Registry.Server.ThreadPool.StackSize", + "IceGrid.Registry.SessionManager.AdapterId", + "IceGrid.Registry.SessionManager.Endpoints", + "IceGrid.Registry.SessionManager.Locator", + "IceGrid.Registry.SessionManager.PublishedEndpoints", + "IceGrid.Registry.SessionManager.RegisterProcess", + "IceGrid.Registry.SessionManager.ReplicaGroupId", + "IceGrid.Registry.SessionManager.Router", + "IceGrid.Registry.SessionManager.ThreadPerConnection", + "IceGrid.Registry.SessionManager.ThreadPerConnection.StackSize", + "IceGrid.Registry.SessionManager.ThreadPool.Size", + "IceGrid.Registry.SessionManager.ThreadPool.SizeMax", + "IceGrid.Registry.SessionManager.ThreadPool.SizeWarn", + "IceGrid.Registry.SessionManager.ThreadPool.StackSize", "IceGrid.Registry.SessionTimeout", "IceGrid.Registry.SSLPermissionsVerifier", "IceGrid.Registry.SSLPermissionsVerifier.EndpointSelection", @@ -277,12 +288,15 @@ const char* IceInternal::PropertyNames::IceGridProps[] = const char* IceInternal::PropertyNames::IcePatch2Props[] = { "IcePatch2.AdapterId", - "IcePatch2.ReplicaGroupId", "IcePatch2.Admin.AdapterId", - "IcePatch2.Admin.ReplicaGroupId", "IcePatch2.Admin.Endpoints", + "IcePatch2.Admin.Locator", "IcePatch2.Admin.PublishedEndpoints", "IcePatch2.Admin.RegisterProcess", + "IcePatch2.Admin.ReplicaGroupId", + "IcePatch2.Admin.Router", + "IcePatch2.Admin.ThreadPerConnection", + "IcePatch2.Admin.ThreadPerConnection.StackSize", "IcePatch2.Admin.ThreadPool.Size", "IcePatch2.Admin.ThreadPool.SizeMax", "IcePatch2.Admin.ThreadPool.SizeWarn", @@ -291,10 +305,15 @@ const char* IceInternal::PropertyNames::IcePatch2Props[] = "IcePatch2.Directory", "IcePatch2.Endpoints", "IcePatch2.InstanceName", + "IcePatch2.Locator", "IcePatch2.PublishedEndpoints", "IcePatch2.RegisterProcess", + "IcePatch2.ReplicaGroupId", "IcePatch2.Remove", + "IcePatch2.Router", "IcePatch2.Thorough", + "IcePatch2.ThreadPerConnection", + "IcePatch2.ThreadPerConnection.StackSize", "IcePatch2.ThreadPool.Size", "IcePatch2.ThreadPool.SizeMax", "IcePatch2.ThreadPool.SizeWarn", @@ -348,17 +367,21 @@ const char* IceInternal::PropertyNames::IceStormProps[] = "IceStorm.Flush.Timeout", "IceStorm.InstanceName", "IceStorm.Publish.AdapterId", - "IceStorm.Publish.ReplicaGroupId", "IceStorm.Publish.Endpoints", + "IceStorm.Publish.Locator", "IceStorm.Publish.PublishedEndpoints", "IceStorm.Publish.RegisterProcess", + "IceStorm.Publish.ReplicaGroupId", + "IceStorm.Publish.Router", + "IceStorm.Publish.ThreadPerConnection", + "IceStorm.Publish.ThreadPerConnection.StackSize", "IceStorm.Publish.ThreadPool.Size", "IceStorm.Publish.ThreadPool.SizeMax", "IceStorm.Publish.ThreadPool.SizeWarn", "IceStorm.Publish.ThreadPool.StackSize", "IceStorm.TopicManager.AdapterId", - "IceStorm.TopicManager.ReplicaGroupId", "IceStorm.TopicManager.Endpoints", + "IceStorm.TopicManager.Locator", "IceStorm.TopicManager.Proxy", "IceStorm.TopicManager.Proxy.EndpointSelection", "IceStorm.TopicManager.Proxy.ConnectionCached", @@ -370,6 +393,10 @@ const char* IceInternal::PropertyNames::IceStormProps[] = "IceStorm.TopicManager.Proxy.ThreadPerConnection", "IceStorm.TopicManager.PublishedEndpoints", "IceStorm.TopicManager.RegisterProcess", + "IceStorm.TopicManager.ReplicaGroupId", + "IceStorm.TopicManager.Router", + "IceStorm.TopicManager.ThreadPerConnection", + "IceStorm.TopicManager.ThreadPerConnection.StackSize", "IceStorm.TopicManager.ThreadPool.Size", "IceStorm.TopicManager.ThreadPool.SizeMax", "IceStorm.TopicManager.ThreadPool.SizeWarn", diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 53feb6627b7..a05bab33650 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', Tue Feb 13 09:45:20 2007 +// Generated by makeprops.py from file `../config/PropertyNames.def', Wed Feb 14 09:38:50 2007 // 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 74234008973..fce10f5681d 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -92,15 +92,10 @@ Client::run(int argc, char* argv[]) string managerProxy; if(properties->getProperty("Ice.Default.Locator").empty()) { - // - // DEPRECATED PROPERTY: Remove extra code in future release. - // - string managerEndpoints = - properties->getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.Endpoints", - properties->getProperty("IceBox.ServiceManager.Endpoints")); + string managerEndpoints = properties->getProperty("IceBox.ServiceManager.Endpoints"); if(managerEndpoints.empty()) { - cerr << appName() << ": property `Ice.OA.IceBox.ServiceManager.Endpoints' is not set" << endl; + cerr << appName() << ": property `IceBox.ServiceManager.Endpoints' is not set" << endl; return EXIT_FAILURE; } @@ -108,15 +103,10 @@ Client::run(int argc, char* argv[]) } else { - // - // DEPRECATED PROPERTY: Remove extra code in future release. - // - string managerAdapterId = - properties->getPropertyWithDefault("Ice.OA.IceBox.ServiceManager.AdapterId", - properties->getProperty("IceBox.ServiceManager.AdapterId")); + string managerAdapterId = properties->getProperty("IceBox.ServiceManager.AdapterId"); if(managerAdapterId.empty()) { - cerr << appName() << ": property `Ice.OA.IceBox.ServiceManager.AdapterId' is not set" << endl; + cerr << appName() << ": property `IceBox.ServiceManager.AdapterId' is not set" << endl; return EXIT_FAILURE; } diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp index 64b3f472bed..07453c4af41 100755 --- a/cpp/src/IcePatch2/ClientUtil.cpp +++ b/cpp/src/IcePatch2/ClientUtil.cpp @@ -156,9 +156,8 @@ IcePatch2::Patcher::Patcher(const CommunicatorPtr& communicator, const PatcherFe { PropertiesPtr properties = communicator->getProperties(); - const char* endpointsProperty = "Ice.OA.IcePatch2.Endpoints"; - string endpoints = properties->getPropertyWithDefault(endpointsProperty, - properties->getProperty("IcePatch2.Endpoints")); + const char* endpointsProperty = "IcePatch2.Endpoints"; + string endpoints = properties->getProperty(endpointsProperty); if(endpoints.empty()) { throw string("property `") + endpointsProperty + "' is not set"; diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp index 9b654414caf..814fb3f42cd 100644 --- a/cpp/src/IcePatch2/Server.cpp +++ b/cpp/src/IcePatch2/Server.cpp @@ -141,12 +141,8 @@ IcePatch2::PatcherService::start(int argc, char* argv[]) return false; } - // - // DEPRECATED PROPERTY: Remove extra code in future release - // - const string endpointsProperty = "Ice.OA.IcePatch2.Endpoints"; - string endpoints = properties->getPropertyWithDefault(endpointsProperty, - properties->getProperty("IcePatch2.Endpoints")); + const string endpointsProperty = "IcePatch2.Endpoints"; + string endpoints = properties->getProperty(endpointsProperty); if(endpoints.empty()) { error("property `" + endpointsProperty + "' is not set"); @@ -154,12 +150,8 @@ IcePatch2::PatcherService::start(int argc, char* argv[]) } ObjectAdapterPtr adapter = communicator()->createObjectAdapter("IcePatch2"); - // - // DEPRECATED PROPERTY: Remove extra code in future release - // ObjectAdapterPtr adminAdapter; - if(!properties->getProperty("Ice.OA.IcePatch2.Admin.Endpoints").empty() || - !properties->getProperty("IcePatch2.Admin.Endpoints").empty()) + if(!properties->getProperty("IcePatch2.Admin.Endpoints").empty()) { adminAdapter = communicator()->createObjectAdapter("IcePatch2.Admin"); } diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index be0eb01bc24..cc96dbaf927 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -50,7 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Ice.OA.Factory.Endpoints", "default -p 12010 -t 30000"); + communicator->getProperties()->setProperty("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 be0eb01bc24..cc96dbaf927 100644 --- a/cpp/test/Freeze/oldevictor/Server.cpp +++ b/cpp/test/Freeze/oldevictor/Server.cpp @@ -50,7 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Ice.OA.Factory.Endpoints", "default -p 12010 -t 30000"); + communicator->getProperties()->setProperty("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/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp index 87eb2268cb5..990d8193eb4 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("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("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 c4c85daafdd..37031621fb2 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' --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.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --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/dynamicFiltering/Server.cpp b/cpp/test/Glacier2/dynamicFiltering/Server.cpp index c40fa198d0c..0d5f292e9c9 100755 --- a/cpp/test/Glacier2/dynamicFiltering/Server.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/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("Ice.OA.TestControllerAdapter.Endpoints", "tcp -p 12013"); + communicator()->getProperties()->setProperty("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("Ice.OA.SessionControlAdapter.Endpoints", "tcp -p 12010"); + communicator()->getProperties()->setProperty("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("Ice.OA.BackendAdapter.Endpoints", "default -p 12012"); + communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "default -p 12012"); ObjectAdapterPtr backendAdapter = communicator()->createObjectAdapter("BackendAdapter"); backendAdapter->addServantLocator(new ServantLocatorI(backend), ""); backendAdapter->activate(); diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py index a4c8dd1ebad..daa7efd396a 100755 --- a/cpp/test/Glacier2/dynamicFiltering/run.py +++ b/cpp/test/Glacier2/dynamicFiltering/run.py @@ -34,9 +34,9 @@ print "ok" router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ - 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' --Ice.OA.Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \ + r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Glacier2.Server.Endpoints="default -p 12349 -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 afda833a376..4bd95274bb9 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("Ice.OA.CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("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 36ff4caed5d..b54ebe0c3c4 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' --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.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' --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 8a0d19cb148..45f48227294 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("Ice.OA.SessionControlAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("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 7cc29d5fc31..bac9cd799c0 100755 --- a/cpp/test/Glacier2/sessionControl/run.py +++ b/cpp/test/Glacier2/sessionControl/run.py @@ -34,9 +34,9 @@ print "ok" router = os.path.join(toplevel, "bin", "glacier2router") command = router + TestUtil.clientServerOptions + \ - 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' --Ice.OA.Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \ + r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' \ + r' --Glacier2.Server.Endpoints="default -p 12349 -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 627efff9342..93b9e4ea635 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' --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.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' --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/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp index e12ef11ac56..4e1e0c3caa3 100644 --- a/cpp/test/Glacier2/staticFiltering/Server.cpp +++ b/cpp/test/Glacier2/staticFiltering/Server.cpp @@ -127,10 +127,10 @@ int BackendServer::run(int argc, char* argv[]) { string endpoints = - communicator()->getProperties()->getPropertyWithDefault("Ice.OA.BackendAdapter.Endpoints", + communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", "tcp -p 12010 -t 20000:ssl -p 12011 -t 20000"); - communicator()->getProperties()->setProperty("Ice.OA.BackendAdapter.Endpoints", endpoints); + communicator()->getProperties()->setProperty("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/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py index efbd59a5456..fea6ee0badb 100755 --- a/cpp/test/Glacier2/staticFiltering/run.py +++ b/cpp/test/Glacier2/staticFiltering/run.py @@ -258,8 +258,8 @@ for testcase in testcases: serverOptions = TestUtil.serverProtocol + commonServerOptions routerCmd = router + serverOptions + " --Ice.Config=%s" % os.path.join(testdir, "router.cfg") + \ - 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.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/staticFiltering/passwords"' routerConfig = file(os.path.join(testdir, "router.cfg"), "w") @@ -301,7 +301,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("Ice.OA.BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") + serverConfig.write("BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") serverConfig.close() serverCmd = os.path.join(testdir, 'server') + serverOptions diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 3419752ac1d..eb3d96ac328 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("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 234a21708c8..14a03ec086b 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("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 ca6e34b3b7d..f0e882fb3c7 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 8407ebff887..28733b6af4e 100644 --- a/cpp/test/Ice/binding/TestI.cpp +++ b/cpp/test/Ice/binding/TestI.cpp @@ -20,7 +20,7 @@ RemoteCommunicatorI::createObjectAdapter(const string& name, const string& endpo Ice::CommunicatorPtr com = current.adapter->getCommunicator(); if(com->getProperties()->getPropertyAsIntWithDefault("Ice.ThreadPerConnection", 0) == 0) { - com->getProperties()->setProperty("Ice.OA." + name + ".ThreadPool.Size", "1"); + com->getProperties()->setProperty( 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 261564c6ca8..a568c56c84c 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 b7da06a2c82..5811f081c9b 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("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 15ef0f01bf9..2d38860ce4e 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("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 d4ccd779899..0090d191458 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("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 95009807260..2787dd81015 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("Ice.OA.TestAdapter0.Endpoints", "default"); + communicator->getProperties()->setProperty("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("Ice.OA.TestAdapter0.Endpoints") == "default"); + test(communicator->getProperties()->getProperty("TestAdapter0.Endpoints") == "default"); first->deactivate(); } cout << "ok" << endl; cout << "testing servant registration exceptions... " << flush; { - communicator->getProperties()->setProperty("Ice.OA.TestAdapter1.Endpoints", "default"); + communicator->getProperties()->setProperty("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("Ice.OA.TestAdapter2.Endpoints", "default"); + communicator->getProperties()->setProperty("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 19b9b0eff09..f261e28ef45 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 a21d497727d..6aa10af94c1 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 cb58072e087..a738f18cf6a 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 34090065ae0..bff0436b233 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("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default"); + communicator->getProperties()->setProperty("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 f1f5a14040a..76dd042beb0 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 34c8d3a10c7..5d732315ee2 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 089190cee08..c50cc24b784 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("Ice.OA.TestAdapter.Endpoints", endpts.str()); + communicator->getProperties()->setProperty("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 ba0dfe8fbba..cbf2c42d929 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 215c3a5e3b6..6ce61c5bb85 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 a28e1fa33a8..c25a0e15066 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 e327819beb1..4288b1c65a8 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("Ice.OA.ServerManager.Endpoints", "default -p 12010:udp"); + properties->setProperty("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 d5f22b48672..e9f2031a03e 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("Ice.OA.TestAdapter.Endpoints", "default"); - _initData.properties->setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter"); - _initData.properties->setProperty("Ice.OA.TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); + _initData.properties->setProperty("TestAdapter.Endpoints", "default"); + _initData.properties->setProperty("TestAdapter.AdapterId", "TestAdapter"); + _initData.properties->setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter"); - _initData.properties->setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); - _initData.properties->setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2"); + _initData.properties->setProperty("TestAdapter2.Endpoints", "default"); + _initData.properties->setProperty("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 ed26a370e30..aefff553880 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 25379cd3be7..ccffce2c338 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 784cee66f14..1a6af6b7876 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("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 85979d7424f..f78fda34785 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 0cac6d02a18..adfbac159bc 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 2fc3aa5d171..788ed2ec50b 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp index 53348a0799e..d9b0fa5d300 100644 --- a/cpp/test/Ice/servantLocator/Collocated.cpp +++ b/cpp/test/Ice/servantLocator/Collocated.cpp @@ -65,7 +65,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); adapter->addServantLocator(new ServantLocatorI(""), ""); adapter->addServantLocator(new ServantLocatorI("category"), "category"); diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp index 8777fcd5135..68348699177 100644 --- a/cpp/test/Ice/servantLocator/Server.cpp +++ b/cpp/test/Ice/servantLocator/Server.cpp @@ -64,7 +64,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp index 470a67c51c7..c52bedbec23 100644 --- a/cpp/test/Ice/servantLocator/ServerAMD.cpp +++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp @@ -64,7 +64,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp index 697d3b3cbfa..044dfafe302 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("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 16190251017..6b9bb7dea43 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("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 697d3b3cbfa..044dfafe302 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("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 16190251017..6b9bb7dea43 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator->getProperties()->setProperty("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/threads/Server.cpp b/cpp/test/Ice/threads/Server.cpp index 2685ccf6064..e403e700b25 100644 --- a/cpp/test/Ice/threads/Server.cpp +++ b/cpp/test/Ice/threads/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("server"); adapter->add(new ServerI(communicator), id); diff --git a/cpp/test/Ice/threads/TestI.cpp b/cpp/test/Ice/threads/TestI.cpp index 3520d56263c..a6e00f1b1c0 100644 --- a/cpp/test/Ice/threads/TestI.cpp +++ b/cpp/test/Ice/threads/TestI.cpp @@ -231,8 +231,8 @@ ServerI::ServerI(const Ice::CommunicatorPtr& communicator) // id.properties = communicator->getProperties()->clone(); id.properties->setProperty("Ice.ThreadPerConnection", "1"); - id.properties->setProperty("Ice.OA.Adapter3.ThreadPool.SizeMax", "2"); - id.properties->setProperty("Ice.OA.Adapter3.ThreadPool.SizeWarn", "0"); + id.properties->setProperty("Adapter3.ThreadPool.SizeMax", "2"); + id.properties->setProperty("Adapter3.ThreadPool.SizeWarn", "0"); comm = Ice::initialize(id); adapter = comm->createObjectAdapterWithEndpoints("Adapter3", "default"); ident = comm->stringToIdentity("adapter3"); @@ -247,7 +247,7 @@ ServerI::ServerI(const Ice::CommunicatorPtr& communicator) id.properties->setProperty("Ice.ThreadPerConnection", "0"); id.properties->setProperty("Ice.ThreadPool.Server.SizeMax", "2"); id.properties->setProperty("Ice.ThreadPool.Server.SizeWarn", "0"); - id.properties->setProperty("Ice.OA.Adapter4.ThreadPerConnection", "1"); + id.properties->setProperty("Adapter4.ThreadPerConnection", "1"); comm = Ice::initialize(id); adapter = comm->createObjectAdapterWithEndpoints("Adapter4", "default"); ident = comm->stringToIdentity("adapter4"); diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index cd1d2159c86..44f8c7be0e9 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("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("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 9c43011dddb..8e68bcc2b3b 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="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.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="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 8822d7c2dd0..91b492dbc96 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="Ice.OA.IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Ice.OA.IcePatch2.Admin.RegisterProcess" value="1"/> + <property name="IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="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/replicaGroup/TestI.cpp b/cpp/test/IceGrid/replicaGroup/TestI.cpp index e0a85fbc86e..2b395914c59 100644 --- a/cpp/test/IceGrid/replicaGroup/TestI.cpp +++ b/cpp/test/IceGrid/replicaGroup/TestI.cpp @@ -19,12 +19,12 @@ TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const Ice::PropertiesPtr& pro std::string TestI::getReplicaId(const Ice::Current&) { - return _properties->getProperty("Ice.OA." + _adapter->getName() + ".AdapterId"); + return _properties->getProperty(_adapter->getName() + ".AdapterId"); } std::string TestI::getReplicaIdAndShutdown(const Ice::Current&) { _adapter->getCommunicator()->shutdown(); - return _properties->getProperty("Ice.OA." + _adapter->getName() + ".AdapterId"); + return _properties->getProperty(_adapter->getName() + ".AdapterId"); } diff --git a/cpp/test/IceGrid/replication/AllTests.cpp b/cpp/test/IceGrid/replication/AllTests.cpp index 2ebf0731d48..3360ca70664 100644 --- a/cpp/test/IceGrid/replication/AllTests.cpp +++ b/cpp/test/IceGrid/replication/AllTests.cpp @@ -920,7 +920,7 @@ allTests(const Ice::CommunicatorPtr& comm) adapter.id = "TestAdapter.Server"; adapter.registerProcess = true; PropertyDescriptor property; - property.name = "Ice.OA.TestAdapter.Endpoints"; + property.name = "TestAdapter.Endpoints"; property.value = "default"; server->propertySet.properties.push_back(property); property.name = "Identity"; @@ -1092,7 +1092,7 @@ allTests(const Ice::CommunicatorPtr& comm) adapter.id = "TestAdapter.Server"; adapter.registerProcess = true; PropertyDescriptor property; - property.name = "Ice.OA.TestAdapter.Endpoints"; + property.name = "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 b0b1c2fad64..abcf5d4e1d4 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="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.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="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 75b2e6b6031..a74466ac0e6 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -1651,7 +1651,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, "Ice.OA.IceGrid.Node.Endpoints", "default"); +// addProperty(server, "IceGrid.Node.Endpoints", "default"); // NodeDescriptor node; // node.servers.push_back(server); // nodeApp.nodes["localnode"] = node; @@ -1782,7 +1782,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, "Ice.OA.IceGrid.Node.Endpoints", "default"); + addProperty(server, "IceGrid.Node.Endpoints", "default"); NodeDescriptor node; node.servers.push_back(server); nodeApp.nodes["localnode"] = node; @@ -1832,7 +1832,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter.registerProcess = true; adapter.serverLifetime = true; server->adapters.push_back(adapter); - addProperty(server, "Ice.OA.Server.Endpoints", "default"); + addProperty(server, "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 707c3e33bb6..ddc726028a2 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="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.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="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 adda46062b3..20993bfd697 100755 --- a/cpp/test/IceGrid/simple/run.py +++ b/cpp/test/IceGrid/simple/run.py @@ -26,8 +26,8 @@ name = os.path.join("IceGrid", "simple") # # Test client/server without on demand activation. # -IceGridAdmin.iceGridClientServerTest(name, "", "--Ice.OA.TestAdapter.Endpoints=default" + \ - " --Ice.OA.TestAdapter.AdapterId=TestAdapter") +IceGridAdmin.iceGridClientServerTest(name, "", "--TestAdapter.Endpoints=default" + \ + " --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 37ceba2b818..4d8c7e80837 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, "Ice.OA.Server.Endpoints", "default"); + addProperty(server, "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, "Ice.OA.Server.Endpoints", "default"); + addProperty(server, "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, "Ice.OA.${service}.Endpoints", "default"); + addProperty(service, "${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, "Ice.OA.IceGrid.Node.Endpoints", "default"); + addProperty(server, "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, "Ice.OA.Server.Endpoints", "default"); + addProperty(server, "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 b9978ab4b31..251d5605a87 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("Ice.OA.TestAdapter.Endpoints", "tcp -p 12010"); + communicator->getProperties()->setProperty("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 e1e472bc68e..c7763662b2b 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 = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" + \ " --IceBox.InheritProperties=1" 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 92ec55a1f4d..30b9b88df04 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -29,22 +29,22 @@ iceBox = TestUtil.getIceBox(exedir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default -p 12012"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --IceStorm.Publish.Endpoints="default -p 12012"' + \ ' --IceStorm.InstanceName=TestIceStorm1 ' + \ ' --IceStorm.Discard.Interval=2' + \ ' --IceBox.PrintServicesReady=IceStorm' + \ " --IceBox.InheritProperties=1" iceStormReference = ' --IceStorm.TopicManager.Proxy="TestIceStorm1/TopicManager: default -p 12011"' -iceBoxEndpoints2 = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator=' +iceBoxEndpoints2 = ' --IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator=' iceStormService2 = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12021"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default -p 12022"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12021"' + \ + ' --IceStorm.Publish.Endpoints="default -p 12022"' + \ ' --IceStorm.InstanceName=TestIceStorm2 ' + \ ' --IceStorm.Discard.Interval=2' + \ ' --IceBox.PrintServicesReady=IceStorm' + \ diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index d99b572faf6..4ba3958218d 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 = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default:udp"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --IceStorm.Publish.Endpoints="default:udp"' + \ " --IceBox.PrintServicesReady=IceStorm" + \ " --IceBox.InheritProperties=1" iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12011"' diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py index 503a4e89dc7..3df7e333cea 100755 --- a/cpp/test/IceStorm/stress/run.py +++ b/cpp/test/IceStorm/stress/run.py @@ -29,22 +29,22 @@ iceBox = TestUtil.getIceBox(exedir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' +iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12011"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default -p 12012"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ + ' --IceStorm.Publish.Endpoints="default -p 12012"' + \ ' --IceStorm.InstanceName=TestIceStorm1 ' + \ ' --IceStorm.Discard.Interval=2' + \ ' --IceBox.PrintServicesReady=IceStorm' + \ " --IceBox.InheritProperties=1" iceStormReference = ' --IceStorm.TopicManager.Proxy="TestIceStorm1/TopicManager: default -p 12011"' -iceBoxEndpoints2 = ' --Ice.OA.IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator=' +iceBoxEndpoints2 = ' --IceBox.ServiceManager.Endpoints="default -p 12020" --Ice.Default.Locator=' iceStormService2 = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ - ' --Ice.OA.IceStorm.TopicManager.Endpoints="default -p 12021"' + \ - ' --Ice.OA.IceStorm.Publish.Endpoints="default -p 12022"' + \ + ' --IceStorm.TopicManager.Endpoints="default -p 12021"' + \ + ' --IceStorm.Publish.Endpoints="default -p 12022"' + \ ' --IceStorm.InstanceName=TestIceStorm2 ' + \ ' --IceStorm.Discard.Interval=2' + \ ' --IceBox.PrintServicesReady=IceStorm' + \ |