diff options
Diffstat (limited to 'cpp/config')
| -rw-r--r-- | cpp/config/IceGridAdmin.py | 12 | ||||
| -rw-r--r-- | cpp/config/PropertyNames.def | 25 | ||||
| -rw-r--r-- | cpp/config/makeprops.py | 4 | ||||
| -rw-r--r-- | cpp/config/templates.xml | 12 |
4 files changed, 32 insertions, 21 deletions
diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py index e1933b29af1..cedcb429bf1 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -27,7 +27,7 @@ else: iceGridPort = 12010; nodeOptions = r' --Ice.Warn.Connections=0' + \ - r' --IceGrid.Node.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Node.Endpoints=default' + \ r' --IceGrid.Node.WaitTime=30' + \ r' --Ice.ProgramName=icegridnode' + \ r' --IceGrid.Node.Trace.Replica=0' + \ @@ -45,9 +45,9 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.AdminPermissionsVerifier=IceGrid/NullPermissionsVerifier' + \ r' --IceGrid.Registry.SSLPermissionsVerifier=IceGrid/NullSSLPermissionsVerifier' + \ r' --IceGrid.Registry.AdminSSLPermissionsVerifier=IceGrid/NullSSLPermissionsVerifier' + \ - r' --IceGrid.Registry.Server.Endpoints=default' + \ - r' --IceGrid.Registry.Internal.Endpoints=default' + \ - r' --IceGrid.Registry.SessionManager.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.Server.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.Internal.Endpoints=default' + \ + r' --Ice.OA.IceGrid.Registry.SessionManager.Endpoints=default' + \ r' --IceGrid.Registry.Trace.Session=0' + \ r' --IceGrid.Registry.Trace.Application=0' + \ r' --IceGrid.Registry.Trace.Node=0' + \ @@ -58,7 +58,7 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.Trace.Locator=0' + \ r' --Ice.ThreadPool.Server.Size=0 ' + \ r' --Ice.ThreadPool.Client.SizeWarn=0' + \ - r' --IceGrid.Registry.Client.ThreadPool.SizeWarn=0' + \ + r' --Ice.OA.IceGrid.Registry.Client.ThreadPool.SizeWarn=0' + \ r' --Ice.ServerIdleTime=0' + \ r' --IceGrid.Registry.DefaultTemplates=' + os.path.join(toplevel, "config", "templates.xml") @@ -97,7 +97,7 @@ def startIceGridRegistry(testdir, dynamicRegistration = False): print "starting icegrid " + name + "...", cmd = command + \ r' --Ice.ProgramName=' + name + \ - r' --IceGrid.Registry.Client.Endpoints="default -p ' + str(iceGridPort + i) + ' -t 30000" ' + \ + r' --Ice.OA.IceGrid.Registry.Client.Endpoints="default -p ' + str(iceGridPort + i) + ' -t 30000" ' + \ r' --IceGrid.Registry.Data=' + dataDir if i > 0: diff --git a/cpp/config/PropertyNames.def b/cpp/config/PropertyNames.def index 96f9e4433e9..3429e8b5595 100644 --- a/cpp/config/PropertyNames.def +++ b/cpp/config/PropertyNames.def @@ -148,6 +148,17 @@ Ice: MonitorConnections Nohup NullHandleAbort + OA.<any>.AdapterId + OA.<any>.Endpoints + OA.<any>.Locator + OA.<any>.PublishedEndpoints + OA.<any>.RegisterProcess + OA.<any>.ReplicaGroupId + OA.<any>.Router + OA.<any>.ThreadPool.Size + OA.<any>.ThreadPool.SizeMax + OA.<any>.ThreadPool.SizeWarn + OA.<any>.ThreadPool.StackSize Override.Compress Override.ConnectTimeout Override.Timeout @@ -336,8 +347,8 @@ IceSSL: DefaultDir DH.<any> EntropyDaemon - FindCert.<any>.<any> - ImportCert.<any>.<any> + FindCert.<any> + ImportCert.<any> KeyFile Keystore KeystorePassword @@ -470,11 +481,11 @@ Freeze: DbEnv.<any>.DbRecoverFatal DbEnv.<any>.OldLogsAutoDelete DbEnv.<any>.PeriodicCheckpointMinSize - Evictor.<any>.<any>.MaxTxSize - Evictor.<any>.<any>.SavePeriod - Evictor.<any>.<any>.SaveSizeTrigger - Evictor.<any>.<any>.StreamTimeout - Evictor.<any>.<any>.PopulateEmptyIndices + Evictor.<any>.MaxTxSize + Evictor.<any>.SavePeriod + Evictor.<any>.SaveSizeTrigger + Evictor.<any>.StreamTimeout + Evictor.<any>.PopulateEmptyIndices Evictor.UseNonmutating Trace.DbEnv Trace.Evictor diff --git a/cpp/config/makeprops.py b/cpp/config/makeprops.py index cbf1b89ecb1..518be25a330 100644 --- a/cpp/config/makeprops.py +++ b/cpp/config/makeprops.py @@ -221,11 +221,11 @@ def writeEntry(lang, label, entry): file.write(" \"" + label + '.' + string.replace(entry, "<any>", "*") + "\",\n") elif lang == "java": pattern = string.replace(entry, ".", "\\\\.") - pattern = string.replace(pattern, "<any>", "[^\\\\s.]+") + pattern = string.replace(pattern, "<any>", "[^\\\\s]+") file.write(" " + "\"^" + label + "\\\\." + pattern + "$\",\n") elif lang == "cs": pattern = string.replace(entry, ".", "\\.") - pattern = string.replace(pattern, "<any>", "[^\\s.]+") + pattern = string.replace(pattern, "<any>", "[^\\s]+") file.write(" " + "@\"^" + label + "\\." + pattern + "$\",\n") def processFile(lang): diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index 784f4c00a10..ef3eb97f006 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -25,8 +25,8 @@ </adapter> <properties> - <property name="IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="IcePatch2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.IcePatch2.Admin.RegisterProcess" value="1"/> <property name="IcePatch2.InstanceName" value="${instance-name}"/> <property name="IcePatch2.Directory" value="${directory}"/> </properties> @@ -44,10 +44,10 @@ <server id="${instance-name}" exe="glacier2router"> <properties> - <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/> - <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/> - <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> - <property name="Glacier2.Admin.RegisterProcess" value="1"/> + <property name="Ice.OA.Glacier2.Client.Endpoints" value="${client-endpoints}"/> + <property name="Ice.OA.Glacier2.Server.Endpoints" value="${server-endpoints}"/> + <property name="Ice.OA.Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/> + <property name="Ice.OA.Glacier2.Admin.RegisterProcess" value="1"/> <property name="Glacier2.InstanceName" value="${instance-name}"/> <property name="Glacier2.SessionTimeout" value="${session-timeout}"/> </properties> |