summaryrefslogtreecommitdiff
path: root/java/config/TestUtil.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2005-01-10 23:55:22 +0000
committerMark Spruiell <mes@zeroc.com>2005-01-10 23:55:22 +0000
commit05b9d2a3ae71dd70d6442b430a468232d7da7724 (patch)
tree62d26c33a804d119099c08247a57befbf8ac8722 /java/config/TestUtil.py
parentSSL is off by default (diff)
downloadice-05b9d2a3ae71dd70d6442b430a468232d7da7724.tar.bz2
ice-05b9d2a3ae71dd70d6442b430a468232d7da7724.tar.xz
ice-05b9d2a3ae71dd70d6442b430a468232d7da7724.zip
changing KeyStore to Keystore in property names
Diffstat (limited to 'java/config/TestUtil.py')
-rw-r--r--java/config/TestUtil.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py
index f28e3d7c815..9301080460c 100644
--- a/java/config/TestUtil.py
+++ b/java/config/TestUtil.py
@@ -14,7 +14,7 @@
#
protocol = ""
-#protocol = "ssl"
+protocol = "ssl"
#
# Set compressed to 1 in case you want to run the tests with
@@ -166,18 +166,18 @@ iceHome = os.environ["ICE_HOME"]
if protocol == "ssl":
plugin = " --Ice.Plugin.IceSSL=IceSSL.PluginFactory"
clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Client.KeyStore=" + os.path.join(toplevel, "certs", "client.jks") + \
+ " --IceSSL.Client.Keystore=" + os.path.join(toplevel, "certs", "client.jks") + \
" --IceSSL.Client.Certs=" + os.path.join(toplevel, "certs", "certs.jks") + \
" --IceSSL.Client.Password=password"
serverProtocol = plugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Server.KeyStore=" + os.path.join(toplevel, "certs", "server.jks") + \
+ " --IceSSL.Server.Keystore=" + os.path.join(toplevel, "certs", "server.jks") + \
" --IceSSL.Server.Certs=" + os.path.join(toplevel, "certs", "certs.jks") + \
" --IceSSL.Server.Password=password"
clientServerProtocol = plugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Client.KeyStore=" + os.path.join(toplevel, "certs", "client.jks") + \
+ " --IceSSL.Client.Keystore=" + os.path.join(toplevel, "certs", "client.jks") + \
" --IceSSL.Client.Certs=" + os.path.join(toplevel, "certs", "certs.jks") + \
" --IceSSL.Client.Password=password" + \
- " --IceSSL.Server.KeyStore=" + os.path.join(toplevel, "certs", "server.jks") + \
+ " --IceSSL.Server.Keystore=" + os.path.join(toplevel, "certs", "server.jks") + \
" --IceSSL.Server.Certs=" + os.path.join(toplevel, "certs", "certs.jks") + \
" --IceSSL.Server.Password=password"
cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:create"