diff options
50 files changed, 66 insertions, 72 deletions
diff --git a/py/CHANGES b/py/CHANGES index f967b7e5548..454a89e03c1 100644 --- a/py/CHANGES +++ b/py/CHANGES @@ -27,12 +27,6 @@ Changes since version 3.1.1 - Added missing implementation of the createIndirectProxy() method to the ObjectAdapter interface. -- Object adapter properties are now prefixed by "Ice.OA.". For example, - "Ice.OA.<Adpater name>.Endpoints" instead of "<Adpater name>.Endpoints". - The new properties can be set from the command line. The old style - property names have been deprecated and support will be removed in a - future release. - - Added Communicator::propertyToProxy() which creates a proxy from a set of properties. This function allows you to set various local proxy settings, such as the Locator cache timeout, which cannot be diff --git a/py/demo/Glacier2/callback/config.client b/py/demo/Glacier2/callback/config.client index 80783ab4894..b5b1b6d19a0 100644 --- a/py/demo/Glacier2/callback/config.client +++ b/py/demo/Glacier2/callback/config.client @@ -9,14 +9,14 @@ Ice.Default.Router=DemoGlacier2/router:ssl -p 10005 -h 127.0.0.1 # object adapter named Callback.Client. This router proxy must # match the value of Glacier2.Client.Endpoints. # -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/py/demo/Glacier2/callback/config.glacier2 b/py/demo/Glacier2/callback/config.glacier2 index bb37111f2f3..78585f8e95c 100644 --- a/py/demo/Glacier2/callback/config.glacier2 +++ b/py/demo/Glacier2/callback/config.glacier2 @@ -18,7 +18,7 @@ Ice.ThreadPerConnection.StackSize=262144 # The client-visible endpoint of Glacier2. This should be an endpoint # visible from the public Internet, and it should be secure. # -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/py/demo/Glacier2/callback/config.server b/py/demo/Glacier2/callback/config.server index 033b969d997..78e95043136 100644 --- a/py/demo/Glacier2/callback/config.server +++ b/py/demo/Glacier2/callback/config.server @@ -4,7 +4,7 @@ # loopback, so that the server is not directly accessible from the # Internet. # -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/py/demo/Glacier2/callback/config.sessionserver b/py/demo/Glacier2/callback/config.sessionserver index 3662d7fcea7..864d6bd5720 100644 --- a/py/demo/Glacier2/callback/config.sessionserver +++ b/py/demo/Glacier2/callback/config.sessionserver @@ -4,7 +4,7 @@ # loopback, so that the session server is not directly accessible from # the Internet. # -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/py/demo/Ice/async/config.server b/py/demo/Ice/async/config.server index 05c1345d404..147d3c96ade 100644 --- a/py/demo/Ice/async/config.server +++ b/py/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/py/demo/Ice/bidir/config.server b/py/demo/Ice/bidir/config.server index e81cb4a8e39..c36f2405d66 100644 --- a/py/demo/Ice/bidir/config.server +++ b/py/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/py/demo/Ice/callback/config.client b/py/demo/Ice/callback/config.client index 95caf8d3eae..a4b00fb2984 100644 --- a/py/demo/Ice/callback/config.client +++ b/py/demo/Ice/callback/config.client @@ -1,5 +1,5 @@ Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001 -Ice.OA.Callback.Client.Endpoints=tcp:udp:ssl +Callback.Client.Endpoints=tcp:udp:ssl # # Warn about connection exceptions diff --git a/py/demo/Ice/callback/config.server b/py/demo/Ice/callback/config.server index 795a07e8f27..deaef3f87de 100644 --- a/py/demo/Ice/callback/config.server +++ b/py/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/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server index aeff24452ac..bb2040f2cdc 100644 --- a/py/demo/Ice/hello/config.server +++ b/py/demo/Ice/hello/config.server @@ -3,7 +3,7 @@ # "Hello". The following line sets the endpoints for this # adapter. # -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/py/demo/Ice/latency/config.server b/py/demo/Ice/latency/config.server index 449847f90e6..f79409c7738 100644 --- a/py/demo/Ice/latency/config.server +++ b/py/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 #Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs diff --git a/py/demo/Ice/session/config.server b/py/demo/Ice/session/config.server index 2731a988e56..8aa8dfac36f 100644 --- a/py/demo/Ice/session/config.server +++ b/py/demo/Ice/session/config.server @@ -3,7 +3,7 @@ # "SessionFactory". The following line sets the endpoints for this # adapter. # -Ice.OA.SessionFactory.Endpoints=default -p 10000 +SessionFactory.Endpoints=default -p 10000 # # Warn about connection exceptions diff --git a/py/demo/Ice/throughput/config.server b/py/demo/Ice/throughput/config.server index 3b9fd7e7c6f..ddae4a1a27a 100644 --- a/py/demo/Ice/throughput/config.server +++ b/py/demo/Ice/throughput/config.server @@ -1,4 +1,4 @@ -Ice.OA.Throughput.Endpoints=default -p 10000 -h 127.0.0.1 +Throughput.Endpoints=default -p 10000 -h 127.0.0.1 #Ice.Plugin.IceSSL=IceSSL:createIceSSL IceSSL.DefaultDir=../../../certs diff --git a/py/demo/Ice/value/config.server b/py/demo/Ice/value/config.server index 52e81b9e331..8f2cf355ffc 100644 --- a/py/demo/Ice/value/config.server +++ b/py/demo/Ice/value/config.server @@ -1 +1 @@ -Ice.OA.Value.Endpoints=default -p 10000 +Value.Endpoints=default -p 10000 diff --git a/py/demo/IceGrid/allocate/config.grid b/py/demo/IceGrid/allocate/config.grid index 1da5a23446c..3ca2082ddfb 100644 --- a/py/demo/IceGrid/allocate/config.grid +++ b/py/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/py/demo/IceGrid/sessionActivation/config.grid b/py/demo/IceGrid/sessionActivation/config.grid index 1da5a23446c..3ca2082ddfb 100644 --- a/py/demo/IceGrid/sessionActivation/config.grid +++ b/py/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/py/demo/IceGrid/simple/config.grid b/py/demo/IceGrid/simple/config.grid index 1da5a23446c..3ca2082ddfb 100644 --- a/py/demo/IceGrid/simple/config.grid +++ b/py/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/py/demo/IceStorm/clock/config.icebox b/py/demo/IceStorm/clock/config.icebox index 2137d0ce61f..c94245fff29 100644 --- a/py/demo/IceStorm/clock/config.icebox +++ b/py/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/py/demo/IceStorm/clock/config.service b/py/demo/IceStorm/clock/config.service index d88d9be996a..818ad2f761b 100644 --- a/py/demo/IceStorm/clock/config.service +++ b/py/demo/IceStorm/clock/config.service @@ -7,7 +7,7 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000 # This property defines the endpoints on which the IceStorm # TopicManager listens. # -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=default -p 10001:udp -p 10001 +IceStorm.Publish.Endpoints=default -p 10001:udp -p 10001 # # TopicManager Tracing diff --git a/py/demo/IceStorm/clock/config.sub b/py/demo/IceStorm/clock/config.sub index 4f60a8ca7c1..ad2ac555de8 100644 --- a/py/demo/IceStorm/clock/config.sub +++ b/py/demo/IceStorm/clock/config.sub @@ -2,7 +2,7 @@ # This property is used to configure the endpoints of the clock # subscriber adapter. # -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/py/test/Ice/adapterDeactivation/Collocated.py b/py/test/Ice/adapterDeactivation/Collocated.py index 10673221477..9cf160806bd 100644 --- a/py/test/Ice/adapterDeactivation/Collocated.py +++ b/py/test/Ice/adapterDeactivation/Collocated.py @@ -26,7 +26,7 @@ import Test, TestI, AllTests class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = self.communicator().createObjectAdapter("TestAdapter") locator = TestI.ServantLocatorI() diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py index 23e756c4c0c..9f41c4f4770 100644 --- a/py/test/Ice/adapterDeactivation/Server.py +++ b/py/test/Ice/adapterDeactivation/Server.py @@ -26,7 +26,7 @@ import Test, TestI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = self.communicator().createObjectAdapter("TestAdapter") locator = TestI.ServantLocatorI() diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py index b2142d821a1..6a5622a47c7 100644 --- a/py/test/Ice/binding/Server.py +++ b/py/test/Ice/binding/Server.py @@ -26,7 +26,7 @@ import Test, TestI def run(args, communicator): communicator.getProperties().setProperty("Ice.Warn.Connections", "0") - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("communicator") adapter.add(TestI.RemoteCommunicatorI(), id) diff --git a/py/test/Ice/binding/TestI.py b/py/test/Ice/binding/TestI.py index d74c8285474..b1a39887b0f 100644 --- a/py/test/Ice/binding/TestI.py +++ b/py/test/Ice/binding/TestI.py @@ -14,7 +14,7 @@ class RemoteCommunicatorI(Test.RemoteCommunicator): def createObjectAdapter(self, name, endpoints, current=None): 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") adapter = com.createObjectAdapterWithEndpoints(name, endpoints) return Test.RemoteObjectAdapterPrx.uncheckedCast(current.adapter.addWithUUID(RemoteObjectAdapterI(adapter))) diff --git a/py/test/Ice/checksum/Server.py b/py/test/Ice/checksum/Server.py index 69070f8481f..05b964bc777 100644 --- a/py/test/Ice/checksum/Server.py +++ b/py/test/Ice/checksum/Server.py @@ -46,7 +46,7 @@ class ChecksumI(Test.Checksum): self._adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = ChecksumI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py index b995b0b566a..1e1cf4b7ac0 100644 --- a/py/test/Ice/custom/Server.py +++ b/py/test/Ice/custom/Server.py @@ -88,7 +88,7 @@ class CustomI(Test.Custom): self._adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = CustomI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/exceptions/AllTests.py b/py/test/Ice/exceptions/AllTests.py index d4947952ab5..e3c1c2c248e 100644 --- a/py/test/Ice/exceptions/AllTests.py +++ b/py/test/Ice/exceptions/AllTests.py @@ -289,7 +289,7 @@ class AMI_WrongOperation_noSuchOperationI(CallbackBase): def allTests(communicator): print "testing servant registration exceptions... ", - communicator.getProperties().setProperty("Ice.OA.TestAdapter1.Endpoints", "default") + communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default") adapter = communicator.createObjectAdapter("TestAdapter1") obj = EmptyI() adapter.add(obj, communicator.stringToIdentity("x")) @@ -310,7 +310,7 @@ def allTests(communicator): print "ok" print "testing servant locator registrations exceptions... ", - communicator.getProperties().setProperty("Ice.OA.TestAdapter2.Endpoints", "default") + communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default") adapter = communicator.createObjectAdapter("TestAdapter2") loc = ServantLocatorI() adapter.addServantLocator(loc, "x") diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py index d65a6c517ec..27d68f8890c 100644 --- a/py/test/Ice/exceptions/Collocated.py +++ b/py/test/Ice/exceptions/Collocated.py @@ -27,7 +27,7 @@ import Test, TestI, AllTests def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py index 6ef430af44a..70491527f80 100644 --- a/py/test/Ice/exceptions/Server.py +++ b/py/test/Ice/exceptions/Server.py @@ -27,7 +27,7 @@ import Test, TestI def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py index db0b09f2bfc..baa0c6e75fd 100644 --- a/py/test/Ice/exceptions/ServerAMD.py +++ b/py/test/Ice/exceptions/ServerAMD.py @@ -125,7 +125,7 @@ class ThrowerI(Test.Thrower): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = communicator.createObjectAdapter("TestAdapter") object = ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/facets/AllTests.py b/py/test/Ice/facets/AllTests.py index 3a2ed91360e..d853de68d65 100644 --- a/py/test/Ice/facets/AllTests.py +++ b/py/test/Ice/facets/AllTests.py @@ -19,7 +19,7 @@ class EmptyI(Test.Empty): def allTests(communicator): print "testing facet registration exceptions... ", - communicator.getProperties().setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default") + communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default") adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter") obj = EmptyI() adapter.add(obj, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/facets/Collocated.py b/py/test/Ice/facets/Collocated.py index 8fe64ca6849..c74920b94b7 100644 --- a/py/test/Ice/facets/Collocated.py +++ b/py/test/Ice/facets/Collocated.py @@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() adapter.add(d, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py index a205741b861..d6914fbccb8 100644 --- a/py/test/Ice/facets/Server.py +++ b/py/test/Ice/facets/Server.py @@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() adapter.add(d, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/faultTolerance/Server.py b/py/test/Ice/faultTolerance/Server.py index 56964b96f8b..21b49272577 100644 --- a/py/test/Ice/faultTolerance/Server.py +++ b/py/test/Ice/faultTolerance/Server.py @@ -64,7 +64,7 @@ def run(args, communicator): return False endpts = "default -p " + str(port) + ":udp" - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", endpts) + communicator.getProperties().setProperty("TestAdapter.Endpoints", endpts) adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/inheritance/Collocated.py b/py/test/Ice/inheritance/Collocated.py index c550d001566..db5e7657d0f 100644 --- a/py/test/Ice/inheritance/Collocated.py +++ b/py/test/Ice/inheritance/Collocated.py @@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) adapter.add(object, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/inheritance/Server.py b/py/test/Ice/inheritance/Server.py index 7242557fa04..86e599f1226 100644 --- a/py/test/Ice/inheritance/Server.py +++ b/py/test/Ice/inheritance/Server.py @@ -25,7 +25,7 @@ Ice.loadSlice('Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) adapter.add(object, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/location/Server.py b/py/test/Ice/location/Server.py index c7e839fe9ef..3ac2cdc6ea8 100644 --- a/py/test/Ice/location/Server.py +++ b/py/test/Ice/location/Server.py @@ -85,10 +85,10 @@ class ServerManagerI(Test.ServerManager): self._registry = registry self._communicators = [] self._initData = initData - self._initData.properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default") - self._initData.properties.setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter") - self._initData.properties.setProperty("Ice.OA.TestAdapter2.Endpoints", "default") - self._initData.properties.setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2") + self._initData.properties.setProperty("TestAdapter.Endpoints", "default") + self._initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter") + self._initData.properties.setProperty("TestAdapter2.Endpoints", "default") + self._initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2") def startServer(self, current=None): @@ -154,7 +154,7 @@ def run(args, communicator, initData): # properties = communicator.getProperties() properties.setProperty("Ice.ThreadPool.Server.Size", "2") - properties.setProperty("Ice.OA.ServerManager.Endpoints", "default -p 12010:udp") + properties.setProperty("ServerManager.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("ServerManager") diff --git a/py/test/Ice/objects/Collocated.py b/py/test/Ice/objects/Collocated.py index b5532c5bfe3..39e34fe8af2 100644 --- a/py/test/Ice/objects/Collocated.py +++ b/py/test/Ice/objects/Collocated.py @@ -26,7 +26,7 @@ Ice.loadSlice('ClientPrivate.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) adapter.add(initial, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/objects/Server.py b/py/test/Ice/objects/Server.py index 9960997c496..7bd89497ff1 100644 --- a/py/test/Ice/objects/Server.py +++ b/py/test/Ice/objects/Server.py @@ -26,7 +26,7 @@ Ice.loadSlice('ServerPrivate.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) adapter.add(initial, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py index 012f7ccebd8..1aaa010917d 100644 --- a/py/test/Ice/operations/Collocated.py +++ b/py/test/Ice/operations/Collocated.py @@ -35,7 +35,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("test") adapter.add(TestI.MyDerivedClassI(adapter, id), id) diff --git a/py/test/Ice/operations/Server.py b/py/test/Ice/operations/Server.py index a3cc2f96277..1d6aa7bf1e3 100644 --- a/py/test/Ice/operations/Server.py +++ b/py/test/Ice/operations/Server.py @@ -36,7 +36,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("test") adapter.add(TestI.MyDerivedClassI(adapter, id), id) diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py index efedfc29c3a..93caf055fd6 100644 --- a/py/test/Ice/operations/ServerAMD.py +++ b/py/test/Ice/operations/ServerAMD.py @@ -229,7 +229,7 @@ class TestCheckedCastI(Test.TestCheckedCast): return Test.TestCheckedCast.ice_isA(self, s, current) def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("test") adapter.add(MyDerivedClassI(adapter, id), id) diff --git a/py/test/Ice/retry/Server.py b/py/test/Ice/retry/Server.py index 5289c617375..1513707f30e 100644 --- a/py/test/Ice/retry/Server.py +++ b/py/test/Ice/retry/Server.py @@ -36,7 +36,7 @@ Ice.loadSlice('-I' + slice_dir + '/slice Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("retry") adapter.add(TestI.RetryI(), id) diff --git a/py/test/Ice/servantLocator/Collocated.py b/py/test/Ice/servantLocator/Collocated.py index e29bf7cc9c1..7ad527092ee 100644 --- a/py/test/Ice/servantLocator/Collocated.py +++ b/py/test/Ice/servantLocator/Collocated.py @@ -26,7 +26,7 @@ import Test, TestI, AllTests class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/servantLocator/Server.py b/py/test/Ice/servantLocator/Server.py index 5888be8e7ac..8fa23923ad5 100644 --- a/py/test/Ice/servantLocator/Server.py +++ b/py/test/Ice/servantLocator/Server.py @@ -26,7 +26,7 @@ import Test, TestI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/servantLocator/ServerAMD.py b/py/test/Ice/servantLocator/ServerAMD.py index 008d2debbea..4fc33ebf65e 100644 --- a/py/test/Ice/servantLocator/ServerAMD.py +++ b/py/test/Ice/servantLocator/ServerAMD.py @@ -26,7 +26,7 @@ import Test, TestAMDI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/slicing/exceptions/Server.py b/py/test/Ice/slicing/exceptions/Server.py index 6f760032fe7..cb68efb3d34 100644 --- a/py/test/Ice/slicing/exceptions/Server.py +++ b/py/test/Ice/slicing/exceptions/Server.py @@ -117,7 +117,7 @@ class TestI(Test.TestIntf): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, Ice.stringToIdentity("Test")) diff --git a/py/test/Ice/slicing/exceptions/ServerAMD.py b/py/test/Ice/slicing/exceptions/ServerAMD.py index f7e6841339c..4ee7ab21f96 100644 --- a/py/test/Ice/slicing/exceptions/ServerAMD.py +++ b/py/test/Ice/slicing/exceptions/ServerAMD.py @@ -118,7 +118,7 @@ class TestI(Test.TestIntf): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, Ice.stringToIdentity("Test")) diff --git a/py/test/Ice/slicing/objects/Server.py b/py/test/Ice/slicing/objects/Server.py index e172b1f1820..4a810ec213c 100644 --- a/py/test/Ice/slicing/objects/Server.py +++ b/py/test/Ice/slicing/objects/Server.py @@ -279,7 +279,7 @@ class TestI(Test.TestIntf): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, Ice.stringToIdentity("Test")) diff --git a/py/test/Ice/slicing/objects/ServerAMD.py b/py/test/Ice/slicing/objects/ServerAMD.py index 3a44ebe1dd8..b715ed3cad6 100644 --- a/py/test/Ice/slicing/objects/ServerAMD.py +++ b/py/test/Ice/slicing/objects/ServerAMD.py @@ -304,7 +304,7 @@ class TestI(Test.TestIntf): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI(adapter) adapter.add(object, Ice.stringToIdentity("Test")) |