diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-07-26 15:06:00 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-07-26 15:06:00 +0000 |
| commit | a0f867abe948df7cadcfc6daa4ec4024caeabc93 (patch) | |
| tree | cef194e219ef62f98c3ffd0f5ab2347f78596675 /cpp/src | |
| parent | Finally got all the bloody VC++ projects fixed up I think... (diff) | |
| download | ice-a0f867abe948df7cadcfc6daa4ec4024caeabc93.tar.bz2 ice-a0f867abe948df7cadcfc6daa4ec4024caeabc93.tar.xz ice-a0f867abe948df7cadcfc6daa4ec4024caeabc93.zip | |
Fix
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePack/ApplicationDeployer.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/src/IcePack/ApplicationDeployer.cpp b/cpp/src/IcePack/ApplicationDeployer.cpp index a3aa919da83..28384fec7ca 100644 --- a/cpp/src/IcePack/ApplicationDeployer.cpp +++ b/cpp/src/IcePack/ApplicationDeployer.cpp @@ -97,6 +97,12 @@ IcePack::ApplicationDeployHandler::startElement(const XMLCh *const name, Attribu string str = toString(name); if(str == "server") { + string basedir = getAttributeValueWithDefault(attrs, "basedir", ""); + if(!basedir.empty()) + { + _deployer.overrideBaseDir(basedir); + } + string name = getAttributeValue(attrs, "name"); string descriptor = getAttributeValue(attrs, "descriptor"); string binpath = getAttributeValueWithDefault(attrs, "binpath", ""); @@ -136,6 +142,8 @@ IcePack::ApplicationDeployer::addServer(const string& name, throw DeploySAXParseException("descriptor attribute value is empty", _locator); } - _tasks.push_back(new AddServer(_admin, name, descriptor, binpath, libpath, _targets)); + string xmlFile = descriptor[0] != '/' ? _variables["basedir"] + "/" + descriptor : descriptor; + + _tasks.push_back(new AddServer(_admin, name, xmlFile, binpath, libpath, _targets)); } |