summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/icegridregistry.cfg2
-rw-r--r--cpp/src/Ice/PropertyNames.cpp4
-rw-r--r--cpp/src/Ice/PropertyNames.h2
-rw-r--r--cpp/src/IceGrid/Database.cpp4
-rw-r--r--cpp/src/IceGrid/RegistryI.cpp6
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.cpp6
-rwxr-xr-xcpp/test/IceGrid/fileLock/run.py2
-rw-r--r--cpp/test/IceGrid/replication/application.xml2
8 files changed, 14 insertions, 14 deletions
diff --git a/cpp/config/icegridregistry.cfg b/cpp/config/icegridregistry.cfg
index b611344f8c0..fa1b0213bc1 100644
--- a/cpp/config/icegridregistry.cfg
+++ b/cpp/config/icegridregistry.cfg
@@ -50,7 +50,7 @@ IceGrid.Registry.Internal.Endpoints=tcp -h localhost
# The path name below is merely a suggestion, based on the assumption
# that the registry is running under the LocalService account.
#
-IceGrid.Registry.Data=C:\Windows\ServiceProfiles\LocalService\AppData\Local\ZeroC\icegrid\registry
+IceGrid.Registry.LMDB.Path=C:\Windows\ServiceProfiles\LocalService\AppData\Local\ZeroC\icegrid\registry
#
# Authentication/authorization
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index e6278635e3c..7011be23d06 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Nov 6 09:55:41 2015
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Nov 9 08:34:24 2015
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -727,7 +727,6 @@ const IceInternal::Property IceGridPropsData[] =
IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadPriority", false, 0),
IceInternal::Property("IceGrid.Registry.Client.MessageSizeMax", false, 0),
IceInternal::Property("IceGrid.Registry.CryptPasswords", false, 0),
- IceInternal::Property("IceGrid.Registry.Data", false, 0),
IceInternal::Property("IceGrid.Registry.DefaultTemplates", false, 0),
IceInternal::Property("IceGrid.Registry.Discovery.ACM.Timeout", false, 0),
IceInternal::Property("IceGrid.Registry.Discovery.ACM.Heartbeat", false, 0),
@@ -809,6 +808,7 @@ const IceInternal::Property IceGridPropsData[] =
IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadPriority", false, 0),
IceInternal::Property("IceGrid.Registry.Internal.MessageSizeMax", false, 0),
IceInternal::Property("IceGrid.Registry.LMDB.MapSize", false, 0),
+ IceInternal::Property("IceGrid.Registry.LMDB.Path", false, 0),
IceInternal::Property("IceGrid.Registry.NodeSessionTimeout", false, 0),
IceInternal::Property("IceGrid.Registry.PermissionsVerifier.EndpointSelection", false, 0),
IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ConnectionCached", false, 0),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 823aa1174f1..e4c62ee27e9 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Nov 6 09:55:41 2015
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Nov 9 08:34:24 2015
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index f1bb78bbd90..6115c85b111 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -215,8 +215,8 @@ Database::Database(const Ice::ObjectAdapterPtr& registryAdapter,
_objectCache(_communicator),
_allocatableObjectCache(_communicator),
_serverCache(_communicator, _instanceName, _nodeCache, _adapterCache, _objectCache, _allocatableObjectCache),
- _dbLock(_communicator->getProperties()->getProperty("IceGrid.Registry.Data") + "/icedb.lock"),
- _env(_communicator->getProperties()->getProperty("IceGrid.Registry.Data"), 8,
+ _dbLock(_communicator->getProperties()->getProperty("IceGrid.Registry.LMDB.Path") + "/icedb.lock"),
+ _env(_communicator->getProperties()->getProperty("IceGrid.Registry.LMDB.Path"), 8,
_communicator->getProperties()->getPropertyAsIntWithDefault("IceGrid.Registry.LMDB.MapSize", 100) *1024*1024),
_pluginFacade(RegistryPluginFacadeIPtr::dynamicCast(getRegistryPluginFacade())),
_lock(0)
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index ee099559b2e..3593c868113 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -322,11 +322,11 @@ RegistryI::startImpl()
//
// Create the registry database.
//
- string dbPath = _communicator->getProperties()->getProperty("IceGrid.Registry.Data");
+ string dbPath = _communicator->getProperties()->getProperty("IceGrid.Registry.LMDB.Path");
if(dbPath.empty())
{
Ice::Error out(_communicator->getLogger());
- out << "property `IceGrid.Registry.Data' is not set";
+ out << "property `IceGrid.Registry.LMDB.Path' is not set";
return false;
}
else
@@ -337,7 +337,7 @@ RegistryI::startImpl()
ex.error = IceInternal::getSystemErrno();
Ice::Error out(_communicator->getLogger());
- out << "property `IceGrid.Registry.Data' is set to an invalid path:\n" << ex;
+ out << "property `IceGrid.Registry.LMDB.Path' is set to an invalid path:\n" << ex;
return false;
}
}
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
index e08024d5bc8..66b3ccf995e 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
@@ -150,14 +150,14 @@ IceServiceInstaller::install(const PropertiesPtr& properties)
throw "The IceGrid registry service can't depend on itself";
}
- string registryDataDir = fixDirSeparator(_serviceProperties->getProperty("IceGrid.Registry.Data"));
+ string registryDataDir = fixDirSeparator(_serviceProperties->getProperty("IceGrid.Registry.LMDB.Path"));
if(registryDataDir == "")
{
- throw "IceGrid.Registry.Data must be set in " + _configFile;
+ throw "IceGrid.Registry.LMDB.Path must be set in " + _configFile;
}
if(!IceUtilInternal::isAbsolutePath(registryDataDir))
{
- throw "'" + registryDataDir + "' is a relative path; IceGrid.Registry.Data must be an absolute path";
+ throw "'" + registryDataDir + "' is a relative path; IceGrid.Registry.LMDB.Path must be an absolute path";
}
if(!mkdir(registryDataDir))
diff --git a/cpp/test/IceGrid/fileLock/run.py b/cpp/test/IceGrid/fileLock/run.py
index 658b16ee70f..fee37e42d6c 100755
--- a/cpp/test/IceGrid/fileLock/run.py
+++ b/cpp/test/IceGrid/fileLock/run.py
@@ -36,7 +36,7 @@ def runIceGridRegistry():
cmd = command + ' ' + \
r' --Ice.ProgramName=registry' + \
r' --IceGrid.Registry.Client.Endpoints="default -p ' + str(IceGridAdmin.iceGridPort) + '" ' + \
- r' --IceGrid.Registry.Data="' + dataDir + '"'
+ r' --IceGrid.Registry.LMDB.Path="' + dataDir + '"'
driverConfig = TestUtil.DriverConfig("server")
driverConfig.lang = "cpp"
diff --git a/cpp/test/IceGrid/replication/application.xml b/cpp/test/IceGrid/replication/application.xml
index 049a7e0ac3b..a05e4f75b16 100644
--- a/cpp/test/IceGrid/replication/application.xml
+++ b/cpp/test/IceGrid/replication/application.xml
@@ -45,7 +45,7 @@
<property name="IceGrid.Registry.SessionManager.Endpoints" value="default"/>
<property name="IceGrid.Registry.AdminSessionManager.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.LMDB.Path" value="${node.datadir}/servers/${server}/dbs/data"/>
<property name="IceGrid.Registry.PermissionsVerifier" value="RepTestIceGrid/NullPermissionsVerifier"/>
<property name="IceGrid.Registry.SSLPermissionsVerifier" value="RepTestIceGrid/NullSSLPermissionsVerifier"/>
<property name="IceGrid.Registry.AdminPermissionsVerifier" value="RepTestIceGrid/NullPermissionsVerifier"/>
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:01:47 +0000