diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2003-11-26 15:52:02 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2003-11-26 15:52:02 +0000 |
| commit | 2733344573da38f0ec26f451a3991702a18d0407 (patch) | |
| tree | 325232ba9bc7173e8c229209e20ee20fcea54ce5 /cpp/src | |
| parent | Fixes to support DB_CONFIG properties (diff) | |
| download | ice-2733344573da38f0ec26f451a3991702a18d0407.tar.bz2 ice-2733344573da38f0ec26f451a3991702a18d0407.tar.xz ice-2733344573da38f0ec26f451a3991702a18d0407.zip | |
Fixes to support DB_CONFIG properties
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePack/ComponentBuilder.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IcePack/ComponentBuilder.h | 2 | ||||
| -rw-r--r-- | cpp/src/IcePack/ServiceBuilder.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IcePack/ComponentBuilder.cpp b/cpp/src/IcePack/ComponentBuilder.cpp index 60cd5356a3e..d13c1cde46a 100644 --- a/cpp/src/IcePack/ComponentBuilder.cpp +++ b/cpp/src/IcePack/ComponentBuilder.cpp @@ -189,7 +189,7 @@ class GenerateConfiguration : public Task string operator()(const Ice::PropertyDict::value_type& p) const { - return p.first + _sep + p.second.substr(_prefix.length()); + return p.first.substr(_prefix.length()) + _sep + p.second; } private: diff --git a/cpp/src/IcePack/ComponentBuilder.h b/cpp/src/IcePack/ComponentBuilder.h index 31abf783323..fcb270065f3 100644 --- a/cpp/src/IcePack/ComponentBuilder.h +++ b/cpp/src/IcePack/ComponentBuilder.h @@ -118,7 +118,7 @@ public: protected: - void generateConfigFile(const std::string&, const std::string&, const Ice::PropertiesPtr&); + void generateConfigFile(const std::string&, const std::string&, const std::string&, const Ice::PropertiesPtr&); Ice::CommunicatorPtr _communicator; ObjectRegistryPrx _objectRegistry; diff --git a/cpp/src/IcePack/ServiceBuilder.cpp b/cpp/src/IcePack/ServiceBuilder.cpp index 683dcc83049..76ccc66eb23 100644 --- a/cpp/src/IcePack/ServiceBuilder.cpp +++ b/cpp/src/IcePack/ServiceBuilder.cpp @@ -170,13 +170,13 @@ IcePack::ServiceBuilder::setDBEnv(const string& dir) addProperty("Freeze.DbEnv." + getVariable("name") + ".DbHome", path); string dbConfigFile = path + "/DB_CONFIG"; - generateConfigFile(" ", dbConfigFile, _dbProperties); + generateConfigFile(" ", "BdB.", dbConfigFile, _dbProperties); } void IcePack::ServiceBuilder::addDatabaseProperty(const string& name, const string& value) { - _dbProperties->setProperty(name, value); + _dbProperties->setProperty("BdB." + name, value); } // |