diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-02-16 17:47:43 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-02-16 17:47:43 +0000 |
| commit | 7b8dbbebc0363d607711e7b33b6b44a902ecddbd (patch) | |
| tree | 4b46127a7c732f2ab85a51733e1ea7c84f4d4ebc /java/config/TestUtil.py | |
| parent | rearranged components (diff) | |
| download | ice-7b8dbbebc0363d607711e7b33b6b44a902ecddbd.tar.bz2 ice-7b8dbbebc0363d607711e7b33b6b44a902ecddbd.tar.xz ice-7b8dbbebc0363d607711e7b33b6b44a902ecddbd.zip | |
Fixed a bug in RouterInfo which could cause a NullPointerException when
comparing references.
Added certificates for the C++ IceSSL plugin (needed by demos to start SSL
enabled services).
Added Glacier2 callback demo.
Diffstat (limited to 'java/config/TestUtil.py')
| -rw-r--r-- | java/config/TestUtil.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index c2e5d6f246a..c8113ed91f9 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -13,8 +13,8 @@ # protocol. Otherwise TCP is used. # -protocol = "" -#protocol = "ssl" +#protocol = "" +protocol = "ssl" # # Set compressed to 1 in case you want to run the tests with @@ -161,8 +161,6 @@ else: os.environ["CLASSPATH"] = os.path.join(toplevel, "lib") + sep + os.getenv("CLASSPATH", "") -iceHome = os.environ["ICE_HOME"] - if protocol == "ssl": plugin = " --Ice.Plugin.IceSSL=IceSSL.PluginFactory" clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ @@ -182,15 +180,15 @@ if protocol == "ssl": " --IceSSL.Server.Password=password" cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:create" cppClientProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.CertPath=" + os.path.join(iceHome, "certs") + \ + " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs", "cpp") + \ " --IceSSL.Client.Config=client_sslconfig.xml" cppServerProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Server.CertPath=" + os.path.join(iceHome, "certs") + \ + " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs", "cpp") + \ " --IceSSL.Server.Config=server_sslconfig.xml" cppClientServerProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.CertPath=" + os.path.join(iceHome, "certs") + \ + " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs", "cpp") + \ " --IceSSL.Client.Config=sslconfig.xml" + \ - " --IceSSL.Server.CertPath=" + os.path.join(iceHome, "certs") + \ + " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs", "cpp") + \ " --IceSSL.Server.Config=sslconfig.xml" else: clientProtocol = "" |