summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2002-07-25 03:31:45 +0000
committerBenoit Foucher <benoit@zeroc.com>2002-07-25 03:31:45 +0000
commit7cadd3a93f9aa9b68cd1e92976d8a186d77dd494 (patch)
tree1fc52660afa0be4a9d4a965a9373c0d7d7448a30 /java
parentAdded targets and application descriptors. (diff)
downloadice-7cadd3a93f9aa9b68cd1e92976d8a186d77dd494.tar.bz2
ice-7cadd3a93f9aa9b68cd1e92976d8a186d77dd494.tar.xz
ice-7cadd3a93f9aa9b68cd1e92976d8a186d77dd494.zip
Fixes
Diffstat (limited to 'java')
-rw-r--r--java/config/IcePackAdmin.py6
-rwxr-xr-xjava/test/IcePack/simple/run.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/java/config/IcePackAdmin.py b/java/config/IcePackAdmin.py
index 722acd08e26..d6a00bab4f3 100644
--- a/java/config/IcePackAdmin.py
+++ b/java/config/IcePackAdmin.py
@@ -59,7 +59,7 @@ def shutdownIcePack(toplevel, icePackPipe):
sys.exit(1)
-def addServer(toplevel, name, server, libpath, serverDescriptor):
+def addServer(toplevel, name, serverDescriptor, server, libpath, targets):
global icePackPort
icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
@@ -68,8 +68,8 @@ def addServer(toplevel, name, server, libpath, serverDescriptor):
command = icePackAdmin + options + \
r' "--Ice.Default.Locator=IcePack/locator:default -p ' + icePackPort + '" ' + \
- r' -e "server add \"' + name + '\\" \\"' + server + '\\" ' + \
- r' \"' + libpath + '\\" ' + serverDescriptor + '\"'
+ r' -e "server add \"' + name + '\\" \\"' + serverDescriptor + '\\" ' + \
+ r' \"' + server + '\\" \\"' + libpath + '\\" ' + targets + '\"'
icePackAdminPipe = os.popen(command)
icePackAdminStatus = icePackAdminPipe.close()
diff --git a/java/test/IcePack/simple/run.py b/java/test/IcePack/simple/run.py
index 0bce2068ea1..3cf7578fc6b 100755
--- a/java/test/IcePack/simple/run.py
+++ b/java/test/IcePack/simple/run.py
@@ -83,7 +83,7 @@ if TestUtil.isWin32() == 0:
client = "java -ea -classpath \"" + classpath + "\" Client "
print "registering server with icepack...",
- IcePackAdmin.addServer(ice_home, "server", "", classpath, os.path.join(testdir, "simple_server.xml"));
+ IcePackAdmin.addServer(ice_home, "server", os.path.join(testdir, "simple_server.xml"), "", classpath, "");
print "ok"
print "testing adapter registration...",