diff options
Diffstat (limited to 'cs')
58 files changed, 227 insertions, 119 deletions
diff --git a/cs/CHANGES b/cs/CHANGES index 7fb3a930f5e..bb42983c1c7 100644 --- a/cs/CHANGES +++ b/cs/CHANGES @@ -1,6 +1,12 @@ Changes since version 3.1.1 --------------------------- +- Object adapter properties are now prefixed by "Ice.OA.". For example, + "Ice.OA.<Adpater name>.Endpoints" instead of "<Adpater name>.Endpoints". + The new properties can be set from the command line. The old style + property names have been deprecated and support will be removed in a + future release. + - The communcator object adapter now throw an InitializationException if the adapter has no configuration. It is possible to explicitly create a adapter with no configuration, useful for use with diff --git a/cs/config/IceGridAdmin.py b/cs/config/IceGridAdmin.py index 0e6fa9e3313..203b1fcfa19 100644 --- a/cs/config/IceGridAdmin.py +++ b/cs/config/IceGridAdmin.py @@ -27,7 +27,7 @@ ice_home = os.environ['ICE_HOME'] iceGridPort = "12010"; nodeOptions = r' --Ice.Warn.Connections=0' + \ - r' --IceGrid.Node.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Node.Endpoints=default' + \ r' --IceGrid.Node.WaitTime=30' + \ r' --Ice.ProgramName=icegridnode' + \ r' --IceGrid.Node.Trace.Replica=0' + \ @@ -41,9 +41,9 @@ nodeOptions = r' --Ice.Warn.Connections=0' + \ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.PermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ r' --IceGrid.Registry.AdminPermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ - r' --IceGrid.Registry.Server.Endpoints=default' + \ - r' --IceGrid.Registry.Internal.Endpoints=default' + \ - r' --IceGrid.Registry.SessionManager.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.Server.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.Internal.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.SessionManager.Endpoints=default' + \ r' --IceGrid.Registry.Trace.Session=0' + \ r' --IceGrid.Registry.Trace.Application=0' + \ r' --IceGrid.Registry.Trace.Node=0' + \ @@ -67,7 +67,7 @@ def startIceGridRegistry(testdir, dynamicRegistration = False): print "starting icegrid registry...", command = iceGrid + TestUtil.cppClientServerOptions + ' --nowarn ' + registryOptions + \ - r' --IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \ + r' --Ice.OA.IceGrid.Registry.Client.Endpoints="default -p ' + iceGridPort + ' -t 30000" ' + \ r' --IceGrid.Registry.Data=' + dataDir + \ r' --IceGrid.Registry.DefaultTemplates=' + os.path.join(ice_home, "config", "templates.xml") diff --git a/cs/demo/Glacier2/callback/config.client b/cs/demo/Glacier2/callback/config.client index 3a5f413680b..4bb252f4066 100644 --- a/cs/demo/Glacier2/callback/config.client +++ b/cs/demo/Glacier2/callback/config.client @@ -15,14 +15,14 @@ Ice.Default.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h # match the value of Glacier2.Client.Endpoints. # (The SSL endpoint is ignored with .NET 1.1.) # -Callback.Client.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1: ssl -p 10005 -h 127.0.0.1 +Ice.OA.Callback.Client.Router=DemoGlacier2/router:tcp -p 10006 -h 127.0.0.1: ssl -p 10005 -h 127.0.0.1 # # We don't need any endpoints for the client if we use a # router. Incoming requests are received through connections # established from the client to the router. # -Callback.Client.Endpoints= +Ice.OA.Callback.Client.Endpoints= # # This must match the value of Callback.Server.Endpoints in diff --git a/cs/demo/Glacier2/callback/config.glacier2 b/cs/demo/Glacier2/callback/config.glacier2 index 1d3527e8445..0971540187f 100644 --- a/cs/demo/Glacier2/callback/config.glacier2 +++ b/cs/demo/Glacier2/callback/config.glacier2 @@ -15,7 +15,7 @@ Ice.ThreadPerConnection.StackSize=262144 # The client-visible endpoint of Glacier2. This should be an endpoint # visible from the public Internet, and it should be secure. # -Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1 +Ice.OA.Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1 # # The server-visible endpoint of Glacier2. This endpoint is only @@ -24,7 +24,7 @@ Glacier2.Client.Endpoints=tcp -p 10006 -h 127.0.0.1:ssl -p 10005 -h 127.0.0.1 # on the loopback, so that the server is not directly accessible from # the Internet. # -Glacier2.Server.Endpoints=tcp -h 127.0.0.1 +Ice.OA.Glacier2.Server.Endpoints=tcp -h 127.0.0.1 # # The configures the session manager. If no external session manager diff --git a/cs/demo/Glacier2/callback/config.server b/cs/demo/Glacier2/callback/config.server index 78e95043136..033b969d997 100644 --- a/cs/demo/Glacier2/callback/config.server +++ b/cs/demo/Glacier2/callback/config.server @@ -4,7 +4,7 @@ # loopback, so that the server is not directly accessible from the # Internet. # -Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000 +Ice.OA.Callback.Server.Endpoints=tcp -h 127.0.0.1 -p 10000 # # Warn about connection exceptions diff --git a/cs/demo/Glacier2/callback/config.sessionserver b/cs/demo/Glacier2/callback/config.sessionserver index d5329e88926..8bfd51c9b3f 100644 --- a/cs/demo/Glacier2/callback/config.sessionserver +++ b/cs/demo/Glacier2/callback/config.sessionserver @@ -4,7 +4,7 @@ # loopback, so that the session server is not directly accessible from # the Internet. # -SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001 +Ice.OA.SessionServer.Endpoints=tcp -h 127.0.0.1 -p 10001 # # Warn about connection exceptions diff --git a/cs/demo/Ice/async/config.server b/cs/demo/Ice/async/config.server index fd72066f5a5..c7d7b368b1b 100644 --- a/cs/demo/Ice/async/config.server +++ b/cs/demo/Ice/async/config.server @@ -3,7 +3,7 @@ # "Queue". The following line sets the endpoints for this # adapter. # -Queue.Endpoints=tcp -p 10000 +Ice.OA.Queue.Endpoints=tcp -p 10000 # # Warn about connection exceptions diff --git a/cs/demo/Ice/bidir/config.server b/cs/demo/Ice/bidir/config.server index 95b5cc10bb9..f71ed60c03c 100755 --- a/cs/demo/Ice/bidir/config.server +++ b/cs/demo/Ice/bidir/config.server @@ -1,4 +1,4 @@ -Callback.Server.Endpoints=tcp -p 10000
+Ice.OA.Callback.Server.Endpoints=tcp -p 10000
#
# Warn about connection exceptions
diff --git a/cs/demo/Ice/callback/config.client b/cs/demo/Ice/callback/config.client index 40f54c6a767..936c2b0ffd3 100644 --- a/cs/demo/Ice/callback/config.client +++ b/cs/demo/Ice/callback/config.client @@ -4,7 +4,7 @@ # (The ssl endpoints are ignored with .NET 1.1.) # Callback.Client.CallbackServer=callback:tcp -p 10000:udp -p 10000:ssl -p 10001 -Callback.Client.Endpoints=tcp:udp:ssl +Ice.OA.Callback.Client.Endpoints=tcp:udp:ssl # # Warn about connection exceptions diff --git a/cs/demo/Ice/callback/config.server b/cs/demo/Ice/callback/config.server index 3987f9ac249..58ba6cb10fc 100644 --- a/cs/demo/Ice/callback/config.server +++ b/cs/demo/Ice/callback/config.server @@ -2,7 +2,7 @@ # The server listens at the following endpoints. (The SSL # endpoint is ignored with .NET 1.1.) # -Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +Ice.OA.Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions diff --git a/cs/demo/Ice/hello/config.server b/cs/demo/Ice/hello/config.server index 9662f9db910..4bf1d1b584d 100644 --- a/cs/demo/Ice/hello/config.server +++ b/cs/demo/Ice/hello/config.server @@ -3,7 +3,7 @@ # "Hello". The following line sets the endpoints for this # adapter. (The SSL endpoint is ignored with .NET 1.1.) # -Hello.Endpoints=tcp -p 10000:udp -c -p 10000:ssl -p 10001 +Ice.OA.Hello.Endpoints=tcp -p 10000:udp -c -p 10000:ssl -p 10001 # # Warn about connection exceptions. diff --git a/cs/demo/Ice/invoke/config.server b/cs/demo/Ice/invoke/config.server index 693d0c89d21..a44665f4cad 100644 --- a/cs/demo/Ice/invoke/config.server +++ b/cs/demo/Ice/invoke/config.server @@ -3,7 +3,7 @@ # "helloadapater". The following line sets the endpoints for this # adapter # -Printer.Endpoints=tcp -p 10000:udp -p 10000 +Ice.OA.Printer.Endpoints=tcp -p 10000:udp -p 10000 # # Warn about connection exceptions diff --git a/cs/demo/Ice/latency/config.server b/cs/demo/Ice/latency/config.server index 6d82f1a7f2e..33cbd33492e 100644 --- a/cs/demo/Ice/latency/config.server +++ b/cs/demo/Ice/latency/config.server @@ -1 +1 @@ -Latency.Endpoints=default -p 10000 -h 127.0.0.1 +Ice.OA.Latency.Endpoints=default -p 10000 -h 127.0.0.1 diff --git a/cs/demo/Ice/nested/config.client b/cs/demo/Ice/nested/config.client index a895324d0b5..cc7b8c0a0fb 100644 --- a/cs/demo/Ice/nested/config.client +++ b/cs/demo/Ice/nested/config.client @@ -1,5 +1,5 @@ Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000 -Nested.Client.Endpoints=default -t 10000 +Ice.OA.Nested.Client.Endpoints=default -t 10000 Ice.ThreadPool.Server.Size=5 Ice.ThreadPool.Server.SizeWarn=5 diff --git a/cs/demo/Ice/nested/config.server b/cs/demo/Ice/nested/config.server index e0073284155..87c9057ed0d 100644 --- a/cs/demo/Ice/nested/config.server +++ b/cs/demo/Ice/nested/config.server @@ -1,4 +1,4 @@ -Nested.Server.Endpoints=default -p 10000 -t 10000 +Ice.OA.Nested.Server.Endpoints=default -p 10000 -t 10000 Ice.ThreadPool.Server.Size=5 Ice.ThreadPool.Server.SizeWarn=5 diff --git a/cs/demo/Ice/session/config.server b/cs/demo/Ice/session/config.server index 8aa8dfac36f..2731a988e56 100755 --- a/cs/demo/Ice/session/config.server +++ b/cs/demo/Ice/session/config.server @@ -3,7 +3,7 @@ # "SessionFactory". The following line sets the endpoints for this # adapter. # -SessionFactory.Endpoints=default -p 10000 +Ice.OA.SessionFactory.Endpoints=default -p 10000 # # Warn about connection exceptions diff --git a/cs/demo/Ice/throughput/config.server b/cs/demo/Ice/throughput/config.server index dec5cfe8eb9..70da150f767 100644 --- a/cs/demo/Ice/throughput/config.server +++ b/cs/demo/Ice/throughput/config.server @@ -1 +1 @@ -Throughput.Endpoints=default -p 10000 -h 127.0.0.1 +Ice.OA.Throughput.Endpoints=default -p 10000 -h 127.0.0.1 diff --git a/cs/demo/Ice/value/config.server b/cs/demo/Ice/value/config.server index 8f2cf355ffc..52e81b9e331 100644 --- a/cs/demo/Ice/value/config.server +++ b/cs/demo/Ice/value/config.server @@ -1 +1 @@ -Value.Endpoints=default -p 10000 +Ice.OA.Value.Endpoints=default -p 10000 diff --git a/cs/demo/IceBox/hello/config.icebox b/cs/demo/IceBox/hello/config.icebox index 2fb767f56fb..484c25d8947 100644 --- a/cs/demo/IceBox/hello/config.icebox +++ b/cs/demo/IceBox/hello/config.icebox @@ -4,7 +4,7 @@ IceBox.InstanceName=DemoIceBox # The IceBox server endpoint configuration. (The SSL # endpoint is ignored with .NET 1.1.) # -IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 +Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998:ssl -p 9999 # # The hello service @@ -16,7 +16,7 @@ IceBox.Service.Hello=helloservice.dll:HelloServiceI # the service. The following line sets the endpoints for this # adapter. (The SSL endpoint is ignored with .NET 1.1.) # -Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 +Ice.OA.Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions diff --git a/cs/demo/IceGrid/allocate/config.grid b/cs/demo/IceGrid/allocate/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cs/demo/IceGrid/allocate/config.grid +++ b/cs/demo/IceGrid/allocate/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cs/demo/IceGrid/sessionActivation/config.grid b/cs/demo/IceGrid/sessionActivation/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cs/demo/IceGrid/sessionActivation/config.grid +++ b/cs/demo/IceGrid/sessionActivation/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cs/demo/IceGrid/simple/config.grid b/cs/demo/IceGrid/simple/config.grid index 3ca2082ddfb..1da5a23446c 100644 --- a/cs/demo/IceGrid/simple/config.grid +++ b/cs/demo/IceGrid/simple/config.grid @@ -8,9 +8,9 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -p 12000 # # IceGrid registry configuration. # -IceGrid.Registry.Client.Endpoints=default -p 12000 -IceGrid.Registry.Server.Endpoints=default -IceGrid.Registry.Internal.Endpoints=default +Ice.OA.IceGrid.Registry.Client.Endpoints=default -p 12000 +Ice.OA.IceGrid.Registry.Server.Endpoints=default +Ice.OA.IceGrid.Registry.Internal.Endpoints=default IceGrid.Registry.Data=db/registry IceGrid.Registry.PermissionsVerifier=DemoIceGrid/NullPermissionsVerifier IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier @@ -21,7 +21,7 @@ IceGrid.Registry.AdminSSLPermissionsVerifier=DemoIceGrid/NullSSLPermissionsVerif # IceGrid node configuration. # IceGrid.Node.Name=localhost -IceGrid.Node.Endpoints=default +Ice.OA.IceGrid.Node.Endpoints=default IceGrid.Node.Data=db/node IceGrid.Node.CollocateRegistry=1 #IceGrid.Node.Output=db diff --git a/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox index 07fb2e3cb6c..cd05e35ff37 100644 --- a/cs/demo/IceStorm/clock/config.icebox +++ b/cs/demo/IceStorm/clock/config.icebox @@ -1,7 +1,7 @@ # # The IceBox server endpoint configuration # -IceBox.ServiceManager.Endpoints=tcp -p 9998 +Ice.OA.IceBox.ServiceManager.Endpoints=tcp -p 9998 # # The IceStorm service diff --git a/cs/demo/IceStorm/clock/config.service b/cs/demo/IceStorm/clock/config.service index 539369861b0..4f1edc9ad3f 100644 --- a/cs/demo/IceStorm/clock/config.service +++ b/cs/demo/IceStorm/clock/config.service @@ -7,7 +7,7 @@ IceStorm.TopicManager.Proxy=DemoIceStorm/TopicManager:default -p 10000 # This property defines the endpoints on which the IceStorm # TopicManager listens. # -IceStorm.TopicManager.Endpoints=default -p 10000 +Ice.OA.IceStorm.TopicManager.Endpoints=default -p 10000 # # The IceStorm service instance name. @@ -20,7 +20,7 @@ IceStorm.InstanceName=DemoIceStorm # IceStorm instances this must run on a fixed port (or use # IceGrid). # -IceStorm.Publish.Endpoints=default -p 10001 +Ice.OA.IceStorm.Publish.Endpoints=default -p 10001 # # TopicManager Tracing diff --git a/cs/demo/IceStorm/clock/config.sub b/cs/demo/IceStorm/clock/config.sub index d383e34e641..cb6b50d94f0 100644 --- a/cs/demo/IceStorm/clock/config.sub +++ b/cs/demo/IceStorm/clock/config.sub @@ -2,7 +2,7 @@ # This property is used to configure the endpoints of the clock # subscriber adapter. # -Clock.Subscriber.Endpoints=tcp +Ice.OA.Clock.Subscriber.Endpoints=tcp # # This property is used by the clients to connect to IceStorm. diff --git a/cs/src/Ice/CommunicatorI.cs b/cs/src/Ice/CommunicatorI.cs index 3f94dddfd42..c2b5f744426 100755 --- a/cs/src/Ice/CommunicatorI.cs +++ b/cs/src/Ice/CommunicatorI.cs @@ -54,7 +54,7 @@ namespace Ice public ObjectAdapter createObjectAdapter(string name) { - return createObjectAdapterWithEndpoints(name, getProperties().getProperty(name + ".Endpoints")); + return instance_.objectAdapterFactory().createObjectAdapter(name, "", null); } public ObjectAdapter createObjectAdapterWithEndpoints(string name, string endpoints) diff --git a/cs/src/Ice/ObjectAdapterI.cs b/cs/src/Ice/ObjectAdapterI.cs index e2657eb31cb..a50898f9fb4 100755 --- a/cs/src/Ice/ObjectAdapterI.cs +++ b/cs/src/Ice/ObjectAdapterI.cs @@ -69,7 +69,12 @@ namespace Ice if(!_noConfig) { Properties properties = instance_.initializationData().properties; - registerProcess = properties.getPropertyAsInt(_name + ".RegisterProcess") > 0; + // + // DEPRECATED PROPERTY: Remove extra code in future release. + // + registerProcess = properties.getPropertyAsIntWithDefault( + _propertyPrefix + _name + ".RegisterProcess", + properties.getPropertyAsInt(_name + ".RegisterProcess")) > 0; printAdapterReady = properties.getPropertyAsInt("Ice.PrintAdapterReady") > 0; } } @@ -715,27 +720,51 @@ namespace Ice } // + // DEPRECATED PROPERTIES: Remove extra code in future release. + // + + // // Make sure named adapter has configuration. // + Properties properties = instance_.initializationData().properties; + string[] oldProps = filterProperties(_name + "."); if(endpointInfo.Length == 0 && router == null) { - PropertyDict oaProps = instance.initializationData().properties.getPropertiesForPrefix(_name + "."); - if(oaProps.Count == 0) + string[] props = filterProperties(_propertyPrefix + _name + "."); + if(props.Length == 0 && oldProps.Length == 0) { InitializationException ex = new InitializationException(); ex.reason = "Object adapter \"" + _name + "\" requires configuration."; throw ex; } } + + if(oldProps.Length != 0) + { + string message = "The following properties have been deprecated, please prepend \"Ice.OA.\":"; + for(int i = 0; i < oldProps.Length; ++i) + { + message += "\n " + oldProps[i]; + } + instance_.initializationData().logger.warning(message); + } - _id = instance.initializationData().properties.getProperty(name + ".AdapterId"); - _replicaGroupId = instance.initializationData().properties.getProperty(name + ".ReplicaGroupId"); + _id = properties.getPropertyWithDefault(_propertyPrefix + _name + ".AdapterId", + properties.getProperty(_name + ".AdapterId")); + _replicaGroupId = properties.getPropertyWithDefault(_propertyPrefix + _name + ".ReplicaGroupId", + properties.getProperty(_name + ".ReplicaGroupId")); try { if(router == null) { - router = RouterPrxHelper.uncheckedCast(instance_.proxyFactory().propertyToProxy(name + ".Router")); + router = RouterPrxHelper.uncheckedCast( + instance_.proxyFactory().propertyToProxy(_propertyPrefix + _name + ".Router")); + if(router == null) + { + router = RouterPrxHelper.uncheckedCast( + instance_.proxyFactory().propertyToProxy(_name + ".Router")); + } } if(router != null) { @@ -804,7 +833,17 @@ namespace Ice // The connection factory might change it, for example, to // fill in the real port number. // - ArrayList endpoints = parseEndpoints(endpointInfo); + ArrayList endpoints; + if(endpointInfo.Length == 0) + { + endpoints = parseEndpoints(properties.getPropertyWithDefault( + _propertyPrefix + _name + ".Endpoints", + properties.getProperty(_name + ".Endpoints"))); + } + else + { + endpoints = parseEndpoints(endpointInfo); + } for(int i = 0; i < endpoints.Count; ++i) { IceInternal.EndpointI endp = (IceInternal.EndpointI)endpoints[i]; @@ -817,7 +856,7 @@ namespace Ice if(tl.network >= 2) { instance_.initializationData().logger.trace(tl.networkCat, - "created adapter `" + name + "' without endpoints"); + "created adapter `" + _name + "' without endpoints"); } } @@ -825,7 +864,8 @@ namespace Ice // Parse published endpoints. If set, these are used in proxies // instead of the connection factory endpoints. // - string endpts = instance_.initializationData().properties.getProperty(name + ".PublishedEndpoints"); + string endpts = properties.getPropertyWithDefault(_propertyPrefix + _name + ".PublishedEndpoints", + properties.getProperty(_name + ".PublishedEndpoints")); _publishedEndpoints = parseEndpoints(endpts); if(_publishedEndpoints.Count == 0) { @@ -849,12 +889,17 @@ namespace Ice _publishedEndpoints = tmp; } - string locatorProperty = name + ".Locator"; - if(instance_.initializationData().properties.getProperty(locatorProperty).Length > 0) + string locatorProperty = _propertyPrefix + _name + ".Locator"; + if(properties.getProperty(locatorProperty).Length > 0) { setLocator(LocatorPrxHelper.uncheckedCast( instance_.proxyFactory().propertyToProxy(locatorProperty))); } + else if(properties.getProperty(_name + ".Locator").Length > 0) + { + setLocator(LocatorPrxHelper.uncheckedCast( + instance_.proxyFactory().propertyToProxy(_name + ".Locator"))); + } else { setLocator(instance_.referenceFactory().getDefaultLocator()); @@ -862,12 +907,26 @@ namespace Ice if(!instance_.threadPerConnection()) { - int size = instance_.initializationData().properties.getPropertyAsInt(_name + ".ThreadPool.Size"); - int sizeMax = - instance_.initializationData().properties.getPropertyAsInt(_name + ".ThreadPool.SizeMax"); - if(size > 0 || sizeMax > 0) + if(properties.getProperty(_propertyPrefix + _name + ".ThreadPool.Size").Length != 0 || + properties.getProperty(_propertyPrefix + _name + ".ThreadPool.SizeMax").Length != 0) + { + int size = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.Size"); + int sizeMax = properties.getPropertyAsInt(_propertyPrefix + _name + ".ThreadPool.SizeMax"); + if(size > 0 || sizeMax > 0) + { + _threadPool = + new IceInternal.ThreadPool(instance_, _propertyPrefix + _name + ".ThreadPool", 0); + } + } + else { - _threadPool = new IceInternal.ThreadPool(instance_, _name + ".ThreadPool", 0); + int size = properties.getPropertyAsInt(_name + ".ThreadPool.Size"); + int sizeMax = properties.getPropertyAsInt(_name + ".ThreadPool.SizeMax"); + if(size > 0 || sizeMax > 0) + { + _threadPool = + new IceInternal.ThreadPool(instance_, _name + ".ThreadPool", 0); + } } } } @@ -1168,6 +1227,37 @@ namespace Ice } } + static private readonly string[] _suffixes = + { + "AdapterId", + "Endpoints", + "Locator", + "PublishedEndpoints", + "RegisterProcess", + "ReplicaGroupId", + "Router", + "ThreadPool.Size", + "ThreadPool.SizeMax", + "ThreadPool.SizeWarn", + "ThreadPool.StackSize" + }; + + private string[] + filterProperties(string prefix) + { + ArrayList propertySet = new ArrayList(); + PropertyDict props = instance_.initializationData().properties.getPropertiesForPrefix(prefix); + for(int i = 0; i < _suffixes.Length; ++i) + { + if(props.Contains(prefix + _suffixes[i])) + { + propertySet.Add(prefix + _suffixes[i]); + } + } + + return (string[])propertySet.ToArray(typeof(string)); + } + private sealed class ProcessI : ProcessDisp_ { public ProcessI(Communicator communicator) @@ -1220,6 +1310,6 @@ namespace Ice private bool _waitForActivate; private bool _waitForDeactivate; private bool _noConfig; + static private string _propertyPrefix = "Ice.OA."; } - } diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs index 34b02d34f6a..88acc2f65fd 100644 --- a/cs/src/Ice/PropertyNames.cs +++ b/cs/src/Ice/PropertyNames.cs @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `./config/PropertyNames.def', Mon Dec 11 11:13:50 2006 +// Generated by makeprops.py from file `../config/PropertyNames.def', Mon Dec 18 13:40:21 2006 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -52,12 +52,23 @@ namespace IceInternal @"^Ice\.MonitorConnections$", @"^Ice\.Nohup$", @"^Ice\.NullHandleAbort$", + @"^Ice\.OA\.[^\s]+\.AdapterId$", + @"^Ice\.OA\.[^\s]+\.Endpoints$", + @"^Ice\.OA\.[^\s]+\.Locator$", + @"^Ice\.OA\.[^\s]+\.PublishedEndpoints$", + @"^Ice\.OA\.[^\s]+\.RegisterProcess$", + @"^Ice\.OA\.[^\s]+\.ReplicaGroupId$", + @"^Ice\.OA\.[^\s]+\.Router$", + @"^Ice\.OA\.[^\s]+\.ThreadPool\.Size$", + @"^Ice\.OA\.[^\s]+\.ThreadPool\.SizeMax$", + @"^Ice\.OA\.[^\s]+\.ThreadPool\.SizeWarn$", + @"^Ice\.OA\.[^\s]+\.ThreadPool\.StackSize$", @"^Ice\.Override\.Compress$", @"^Ice\.Override\.ConnectTimeout$", @"^Ice\.Override\.Timeout$", @"^Ice\.Override\.Secure$", - @"^Ice\.Package\.[^\s.]+$", - @"^Ice\.Plugin\.[^\s.]+$", + @"^Ice\.Package\.[^\s]+$", + @"^Ice\.Plugin\.[^\s]+$", @"^Ice\.PluginLoadOrder$", @"^Ice\.PrintAdapterReady$", @"^Ice\.PrintProcessId$", @@ -101,7 +112,7 @@ namespace IceInternal @"^IceBox\.InstanceName$", @"^IceBox\.LoadOrder$", @"^IceBox\.PrintServicesReady$", - @"^IceBox\.Service\.[^\s.]+$", + @"^IceBox\.Service\.[^\s]+$", @"^IceBox\.ServiceManager\.AdapterId$", @"^IceBox\.ServiceManager\.ReplicaGroupId$", @"^IceBox\.ServiceManager\.Endpoints$", @@ -111,7 +122,7 @@ namespace IceInternal @"^IceBox\.ServiceManager\.ThreadPool\.SizeMax$", @"^IceBox\.ServiceManager\.ThreadPool\.SizeWarn$", @"^IceBox\.ServiceManager\.ThreadPool\.StackSize$", - @"^IceBox\.UseSharedCommunicator\.[^\s.]+$", + @"^IceBox\.UseSharedCommunicator\.[^\s]+$", null }; @@ -253,10 +264,10 @@ namespace IceInternal @"^IceSSL\.CheckCRL$", @"^IceSSL\.Ciphers$", @"^IceSSL\.DefaultDir$", - @"^IceSSL\.DH\.[^\s.]+$", + @"^IceSSL\.DH\.[^\s]+$", @"^IceSSL\.EntropyDaemon$", - @"^IceSSL\.FindCert\.[^\s.]+\.[^\s.]+$", - @"^IceSSL\.ImportCert\.[^\s.]+\.[^\s.]+$", + @"^IceSSL\.FindCert\.[^\s]+$", + @"^IceSSL\.ImportCert\.[^\s]+$", @"^IceSSL\.KeyFile$", @"^IceSSL\.Keystore$", @"^IceSSL\.KeystorePassword$", @@ -274,7 +285,7 @@ namespace IceInternal @"^IceSSL\.TrustOnly$", @"^IceSSL\.TrustOnly\.Client$", @"^IceSSL\.TrustOnly\.Server$", - @"^IceSSL\.TrustOnly\.Server\.[^\s.]+$", + @"^IceSSL\.TrustOnly\.Server\.[^\s]+$", null }; @@ -392,17 +403,17 @@ namespace IceInternal public static string[] FreezeProps = { - @"^Freeze\.DbEnv\.[^\s.]+\.CheckpointPeriod$", - @"^Freeze\.DbEnv\.[^\s.]+\.DbHome$", - @"^Freeze\.DbEnv\.[^\s.]+\.DbPrivate$", - @"^Freeze\.DbEnv\.[^\s.]+\.DbRecoverFatal$", - @"^Freeze\.DbEnv\.[^\s.]+\.OldLogsAutoDelete$", - @"^Freeze\.DbEnv\.[^\s.]+\.PeriodicCheckpointMinSize$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.MaxTxSize$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.SavePeriod$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.SaveSizeTrigger$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.StreamTimeout$", - @"^Freeze\.Evictor\.[^\s.]+\.[^\s.]+\.PopulateEmptyIndices$", + @"^Freeze\.DbEnv\.[^\s]+\.CheckpointPeriod$", + @"^Freeze\.DbEnv\.[^\s]+\.DbHome$", + @"^Freeze\.DbEnv\.[^\s]+\.DbPrivate$", + @"^Freeze\.DbEnv\.[^\s]+\.DbRecoverFatal$", + @"^Freeze\.DbEnv\.[^\s]+\.OldLogsAutoDelete$", + @"^Freeze\.DbEnv\.[^\s]+\.PeriodicCheckpointMinSize$", + @"^Freeze\.Evictor\.[^\s]+\.MaxTxSize$", + @"^Freeze\.Evictor\.[^\s]+\.SavePeriod$", + @"^Freeze\.Evictor\.[^\s]+\.SaveSizeTrigger$", + @"^Freeze\.Evictor\.[^\s]+\.StreamTimeout$", + @"^Freeze\.Evictor\.[^\s]+\.PopulateEmptyIndices$", @"^Freeze\.Evictor\.UseNonmutating$", @"^Freeze\.Trace\.DbEnv$", @"^Freeze\.Trace\.Evictor$", diff --git a/cs/test/Glacier2/attack/Server.cs b/cs/test/Glacier2/attack/Server.cs index 40bd0be82b0..256bb44ce99 100644 --- a/cs/test/Glacier2/attack/Server.cs +++ b/cs/test/Glacier2/attack/Server.cs @@ -37,7 +37,7 @@ class Server : Ice.Application { public override int run(string[] args) { - communicator().getProperties().setProperty("BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("BackendAdapter"); adapter.addServantLocator(new ServantLocatorI(), ""); adapter.activate(); diff --git a/cs/test/Glacier2/attack/run.py b/cs/test/Glacier2/attack/run.py index fbadcee93e0..48fb18554b8 100755 --- a/cs/test/Glacier2/attack/run.py +++ b/cs/test/Glacier2/attack/run.py @@ -31,8 +31,8 @@ router = os.path.join(ice_home, "bin", "glacier2router") command = router + TestUtil.cppClientServerOptions + \ r' --Ice.PrintProcessId' \ r' --Glacier2.RoutingTable.MaxSize=10' + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/attack/passwords"' print "starting router...", diff --git a/cs/test/Glacier2/router/Server.cs b/cs/test/Glacier2/router/Server.cs index 0a3cb67036a..ab1cbbba6ae 100644 --- a/cs/test/Glacier2/router/Server.cs +++ b/cs/test/Glacier2/router/Server.cs @@ -13,7 +13,7 @@ public class Server : Ice.Application { public override int run(string[] args) { - communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py index d830b6b0514..0939f538011 100755 --- a/cs/test/Glacier2/router/run.py +++ b/cs/test/Glacier2/router/run.py @@ -34,9 +34,9 @@ command = router + TestUtil.cppClientServerOptions + \ r' --Glacier2.Filter.Category.Accept="c1 c2"' + \ r' --Glacier2.Filter.Category.AcceptUser="2"' + \ r' --Glacier2.SessionTimeout="30"' + \ - r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ - r' --Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + r' --Ice.OA.Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ + r' --Ice.OA.Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ + r' --Ice.OA.Glacier2.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ r' --Glacier2.CryptPasswords="' + toplevel + r'/test/Glacier2/router/passwords"' print "starting router...", diff --git a/cs/test/Ice/adapterDeactivation/Collocated.cs b/cs/test/Ice/adapterDeactivation/Collocated.cs index 07e119ecabe..d5802776d45 100755 --- a/cs/test/Ice/adapterDeactivation/Collocated.cs +++ b/cs/test/Ice/adapterDeactivation/Collocated.cs @@ -15,7 +15,7 @@ public class Collocated { public override int run(string[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); diff --git a/cs/test/Ice/adapterDeactivation/Server.cs b/cs/test/Ice/adapterDeactivation/Server.cs index 2f5cc80f864..9cfc66909dd 100755 --- a/cs/test/Ice/adapterDeactivation/Server.cs +++ b/cs/test/Ice/adapterDeactivation/Server.cs @@ -13,7 +13,7 @@ public class Server { public override int run(string[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + communicator().getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); diff --git a/cs/test/Ice/binding/RemoteCommunicatorI.cs b/cs/test/Ice/binding/RemoteCommunicatorI.cs index eafc1aa4043..c22235c3707 100644 --- a/cs/test/Ice/binding/RemoteCommunicatorI.cs +++ b/cs/test/Ice/binding/RemoteCommunicatorI.cs @@ -15,7 +15,7 @@ public class RemoteCommunicatorI : RemoteCommunicatorDisp_ createObjectAdapter(string name, string endpoints, Ice.Current current) { Ice.Communicator com = current.adapter.getCommunicator(); - com.getProperties().setProperty(name + ".ThreadPool.Size", "1"); + com.getProperties().setProperty("Ice.OA." + name + ".ThreadPool.Size", "1"); Ice.ObjectAdapter adapter = com.createObjectAdapterWithEndpoints(name, endpoints); return RemoteObjectAdapterPrxHelper.uncheckedCast( current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter))); diff --git a/cs/test/Ice/binding/Server.cs b/cs/test/Ice/binding/Server.cs index 9c6a5f6b282..2fd4fede356 100755 --- a/cs/test/Ice/binding/Server.cs +++ b/cs/test/Ice/binding/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); diff --git a/cs/test/Ice/checksum/server/Server.cs b/cs/test/Ice/checksum/server/Server.cs index 80de1224a55..e9919705a16 100755 --- a/cs/test/Ice/checksum/server/Server.cs +++ b/cs/test/Ice/checksum/server/Server.cs @@ -13,7 +13,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new Test.ChecksumI(adapter); adapter.add(@object, communicator.stringToIdentity("test")); diff --git a/cs/test/Ice/exceptions/AllTests.cs b/cs/test/Ice/exceptions/AllTests.cs index 1301d38f7f4..c3dec48c091 100755 --- a/cs/test/Ice/exceptions/AllTests.cs +++ b/cs/test/Ice/exceptions/AllTests.cs @@ -676,7 +676,7 @@ public class AllTests // Expected } - communicator.getProperties().setProperty("TestAdapter0.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter0.Endpoints", "default"); first = communicator.createObjectAdapter("TestAdapter0"); try { @@ -703,14 +703,14 @@ public class AllTests { // Expected } - test(communicator.getProperties().getProperty("TestAdapter0.Endpoints").Equals("default")); + test(communicator.getProperties().getProperty("Ice.OA.TestAdapter0.Endpoints").Equals("default")); first.deactivate(); Console.WriteLine("ok"); } { Console.Write("testing servant registration exceptions... "); - communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter1.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter1"); Ice.Object obj = new EmptyI(); adapter.add(obj, communicator.stringToIdentity("x")); @@ -738,7 +738,7 @@ public class AllTests { Console.Write("testing servant locator registration exceptions... "); - communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter2.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter2"); Ice.ServantLocator loc = new ServantLocatorI(); adapter.addServantLocator(loc, "x"); diff --git a/cs/test/Ice/exceptions/Collocated.cs b/cs/test/Ice/exceptions/Collocated.cs index d2141318b3d..15a983dc1b6 100755 --- a/cs/test/Ice/exceptions/Collocated.cs +++ b/cs/test/Ice/exceptions/Collocated.cs @@ -12,7 +12,7 @@ public class Collocated private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new ThrowerI(adapter); adapter.add(obj, communicator.stringToIdentity("thrower")); diff --git a/cs/test/Ice/exceptions/Server.cs b/cs/test/Ice/exceptions/Server.cs index fd4e8916410..0a696111a7d 100755 --- a/cs/test/Ice/exceptions/Server.cs +++ b/cs/test/Ice/exceptions/Server.cs @@ -33,7 +33,7 @@ public class Server Ice.Properties properties = communicator.getProperties(); // We don't need to disable warnings because we have a dummy logger. //properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new ThrowerI(adapter); adapter.add(@object, communicator.stringToIdentity("thrower")); diff --git a/cs/test/Ice/facets/AllTests.cs b/cs/test/Ice/facets/AllTests.cs index b0ff31b165c..6e8027acda6 100755 --- a/cs/test/Ice/facets/AllTests.cs +++ b/cs/test/Ice/facets/AllTests.cs @@ -23,7 +23,7 @@ public class AllTests public static GPrx allTests(Ice.Communicator communicator) { Console.Write("testing facet registration exceptions... "); - communicator.getProperties().setProperty("FacetExceptionTestAdapter.Endpoints", "default"); + communicator.getProperties().setProperty("Ice.OA.FacetExceptionTestAdapter.Endpoints", "default"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter"); Ice.Object obj = new EmptyI(); adapter.add(obj, communicator.stringToIdentity("d")); diff --git a/cs/test/Ice/facets/Collocated.cs b/cs/test/Ice/facets/Collocated.cs index 29a24de16da..aa84bb58d08 100755 --- a/cs/test/Ice/facets/Collocated.cs +++ b/cs/test/Ice/facets/Collocated.cs @@ -11,7 +11,7 @@ public class Collocated { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/cs/test/Ice/facets/Server.cs b/cs/test/Ice/facets/Server.cs index f18dcfcafa1..1be531133a7 100755 --- a/cs/test/Ice/facets/Server.cs +++ b/cs/test/Ice/facets/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/cs/test/Ice/faultTolerance/Server.cs b/cs/test/Ice/faultTolerance/Server.cs index 51a2f633fe7..4d0e30e8c5e 100755 --- a/cs/test/Ice/faultTolerance/Server.cs +++ b/cs/test/Ice/faultTolerance/Server.cs @@ -52,7 +52,7 @@ public class Server return 1; } - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port + ":udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p " + port + ":udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(adapter); adapter.add(obj, communicator.stringToIdentity("test")); diff --git a/cs/test/Ice/hold/Server.cs b/cs/test/Ice/hold/Server.cs index 02f7034555b..00e960a38f0 100644 --- a/cs/test/Ice/hold/Server.cs +++ b/cs/test/Ice/hold/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new HoldI(), communicator.stringToIdentity("hold")); adapter.activate(); diff --git a/cs/test/Ice/inheritance/Collocated.cs b/cs/test/Ice/inheritance/Collocated.cs index ed01a2cc2b7..13533733f88 100755 --- a/cs/test/Ice/inheritance/Collocated.cs +++ b/cs/test/Ice/inheritance/Collocated.cs @@ -12,7 +12,7 @@ public class Collocated private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new InitialI(adapter); adapter.add(obj, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/inheritance/Server.cs b/cs/test/Ice/inheritance/Server.cs index 72f0c2f56f5..4928176493d 100755 --- a/cs/test/Ice/inheritance/Server.cs +++ b/cs/test/Ice/inheritance/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); adapter.add(@object, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/location/Server.cs b/cs/test/Ice/location/Server.cs index bc19ac0b5fb..6a12a8de3be 100755 --- a/cs/test/Ice/location/Server.cs +++ b/cs/test/Ice/location/Server.cs @@ -19,7 +19,7 @@ public class Server // Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.ThreadPool.Server.Size", "2"); - properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp"); + properties.setProperty("Ice.OA.ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter"); diff --git a/cs/test/Ice/location/ServerManagerI.cs b/cs/test/Ice/location/ServerManagerI.cs index 5e5e9ab636d..241add27aa0 100755 --- a/cs/test/Ice/location/ServerManagerI.cs +++ b/cs/test/Ice/location/ServerManagerI.cs @@ -19,11 +19,11 @@ public class ServerManagerI : ServerManagerDisp_ _registry = registry; _communicators = new ArrayList();
_initData = initData;
- _initData.properties.setProperty("TestAdapter.Endpoints", "default");
- _initData.properties.setProperty("TestAdapter.AdapterId", "TestAdapter");
- _initData.properties.setProperty("TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
- _initData.properties.setProperty("TestAdapter2.Endpoints", "default");
- _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2");
+ _initData.properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default");
+ _initData.properties.setProperty("Ice.OA.TestAdapter.AdapterId", "TestAdapter");
+ _initData.properties.setProperty("Ice.OA.TestAdapter.ReplicaGroupId", "ReplicatedAdapter");
+ _initData.properties.setProperty("Ice.OA.TestAdapter2.Endpoints", "default");
+ _initData.properties.setProperty("Ice.OA.TestAdapter2.AdapterId", "TestAdapter2");
} public override void startServer(Ice.Current current) diff --git a/cs/test/Ice/objects/Collocated.cs b/cs/test/Ice/objects/Collocated.cs index 060b17a0152..efaba31354f 100755 --- a/cs/test/Ice/objects/Collocated.cs +++ b/cs/test/Ice/objects/Collocated.cs @@ -14,7 +14,7 @@ public class Client private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); adapter.add(initial, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/objects/Server.cs b/cs/test/Ice/objects/Server.cs index 157b5578d7a..81788bb95dd 100755 --- a/cs/test/Ice/objects/Server.cs +++ b/cs/test/Ice/objects/Server.cs @@ -11,7 +11,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); adapter.add(@object, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/operations/Collocated.cs b/cs/test/Ice/operations/Collocated.cs index 338f68eb64b..ad893001941 100755 --- a/cs/test/Ice/operations/Collocated.cs +++ b/cs/test/Ice/operations/Collocated.cs @@ -13,7 +13,7 @@ public class Collocated { private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("test"); adapter.add(new MyDerivedClassI(adapter, id), id); diff --git a/cs/test/Ice/operations/Server.cs b/cs/test/Ice/operations/Server.cs index d9f817f7fa8..125bcc6a845 100755 --- a/cs/test/Ice/operations/Server.cs +++ b/cs/test/Ice/operations/Server.cs @@ -18,7 +18,7 @@ public class Server // communicator.getProperties().setProperty("Ice.Warn.Connections", "0"); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("test"); adapter.add(new MyDerivedClassI(adapter, id), id); diff --git a/cs/test/Ice/retry/Server.cs b/cs/test/Ice/retry/Server.cs index 26b55404e4a..b95c1f64b03 100644 --- a/cs/test/Ice/retry/Server.cs +++ b/cs/test/Ice/retry/Server.cs @@ -13,7 +13,7 @@ public class Server { public static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new RetryI(), communicator.stringToIdentity("retry")); adapter.activate(); diff --git a/cs/test/Ice/slicing/exceptions/Server.cs b/cs/test/Ice/slicing/exceptions/Server.cs index 62c4aa7568c..428ab61fbe7 100755 --- a/cs/test/Ice/slicing/exceptions/Server.cs +++ b/cs/test/Ice/slicing/exceptions/Server.cs @@ -13,7 +13,7 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new TestI(adapter); adapter.add(@object, communicator.stringToIdentity("Test")); diff --git a/cs/test/Ice/slicing/objects/Server.cs b/cs/test/Ice/slicing/objects/Server.cs index a6f678f73cf..76e901258a8 100755 --- a/cs/test/Ice/slicing/objects/Server.cs +++ b/cs/test/Ice/slicing/objects/Server.cs @@ -13,7 +13,7 @@ public class Server { Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + properties.setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 2000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new TestI(adapter); adapter.add(obj, communicator.stringToIdentity("Test")); diff --git a/cs/test/Ice/timeout/Server.cs b/cs/test/Ice/timeout/Server.cs index 77f934cfcb3..28a88ec7092 100644 --- a/cs/test/Ice/timeout/Server.cs +++ b/cs/test/Ice/timeout/Server.cs @@ -13,7 +13,7 @@ public class Server { public static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("Ice.OA.TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new TimeoutI(), communicator.stringToIdentity("timeout")); adapter.activate(); diff --git a/cs/test/IceGrid/simple/run.py b/cs/test/IceGrid/simple/run.py index e47e4137ea8..4e190bf017c 100755 --- a/cs/test/IceGrid/simple/run.py +++ b/cs/test/IceGrid/simple/run.py @@ -31,7 +31,8 @@ testdir = os.path.join(toplevel, "test", name) # # Test client/server without on demand activation. # -IceGridAdmin.iceGridClientServerTest(name, "", "--TestAdapter.Endpoints=default --TestAdapter.AdapterId=TestAdapter") +IceGridAdmin.iceGridClientServerTest(name, "", "--Ice.OA.TestAdapter.Endpoints=default" + \ + " --Ice.OA.TestAdapter.AdapterId=TestAdapter") # # Test client/server with on demand activation. |