summaryrefslogtreecommitdiff
path: root/cpp/src/IcePack/ApplicationDeployer.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2002-08-09 14:46:06 +0000
committerBenoit Foucher <benoit@zeroc.com>2002-08-09 14:46:06 +0000
commitdb3b68cb56c951f2f54fd63685039ab908acab06 (patch)
treea2fc0e7e9fde3634b96f6da41b268fb1582b4f44 /cpp/src/IcePack/ApplicationDeployer.cpp
parentadded dummy file (diff)
downloadice-db3b68cb56c951f2f54fd63685039ab908acab06.tar.bz2
ice-db3b68cb56c951f2f54fd63685039ab908acab06.tar.xz
ice-db3b68cb56c951f2f54fd63685039ab908acab06.zip
Added new IcePack test suite, add IcePack tracing properties, added IcePack
server shutdown.
Diffstat (limited to 'cpp/src/IcePack/ApplicationDeployer.cpp')
-rw-r--r--cpp/src/IcePack/ApplicationDeployer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/IcePack/ApplicationDeployer.cpp b/cpp/src/IcePack/ApplicationDeployer.cpp
index 28384fec7ca..19cbcf3e8c5 100644
--- a/cpp/src/IcePack/ApplicationDeployer.cpp
+++ b/cpp/src/IcePack/ApplicationDeployer.cpp
@@ -142,8 +142,7 @@ IcePack::ApplicationDeployer::addServer(const string& name,
throw DeploySAXParseException("descriptor attribute value is empty", _locator);
}
- string xmlFile = descriptor[0] != '/' ? _variables["basedir"] + "/" + descriptor : descriptor;
-
- _tasks.push_back(new AddServer(_admin, name, xmlFile, binpath, libpath, _targets));
+ _tasks.push_back(new AddServer(_admin, name, toLocation(descriptor), toLocation(binpath), toLocation(libpath),
+ _targets));
}