removing client/server properties for IceSSL

1 files changed, 173 insertions, 173 deletions

diff --git a/java/test/IceSSL/configuration/AllTests.java b/java/test/IceSSL/configuration/AllTests.java
index 3eb3266a703..6a50398243b 100644
--- a/java/test/IceSSL/configuration/AllTests.java
+++ b/java/test/IceSSL/configuration/AllTests.java
@@ -143,17 +143,17 @@ public class AllTests
 	{
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
 	    initData.properties.setProperty("IceSSL.DelayInit", "1");
-	    initData.properties.setProperty("IceSSL.Client.Ciphers", "NONE (.*DH_anon.*)");
+	    initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    IceSSL.Plugin plugin = (IceSSL.Plugin)comm.getPluginManager().getPlugin("IceSSL");
 	    test(plugin != null);
-	    plugin.initialize(null, null);
+	    plugin.initialize(null);
 	    Ice.ObjectPrx obj = comm.stringToProxy(factoryRef);
 	    test(obj != null);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.Ciphers", "NONE (.*DH_anon.*)");
-	    d.put("IceSSL.Server.VerifyPeer", "0");
+	    d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+	    d.put("IceSSL.VerifyPeer", "0");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -172,21 +172,21 @@ public class AllTests
 	System.out.flush();
 	{
 	    //
-	    // Test IceSSL.Server.VerifyPeer=0. Client does not have a certificate,
+	    // Test IceSSL.VerifyPeer=0. Client does not have a certificate,
 	    // but it still verifies the server's.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "0");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "0");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -199,20 +199,20 @@ public class AllTests
 	    fact.destroyServer(server);
 
 	    //
-	    // Test IceSSL.Server.VerifyPeer=1. Client does not have a certificate.
+	    // Test IceSSL.VerifyPeer=1. Client does not have a certificate.
 	    //
 	    initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    comm = Ice.Util.initialize(args, initData);
 	    fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "1");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "1");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -225,15 +225,15 @@ public class AllTests
 	    fact.destroyServer(server);
 
 	    //
-	    // Test IceSSL.Server.VerifyPeer=2. This should fail because the client
+	    // Test IceSSL.VerifyPeer=2. This should fail because the client
 	    // does not supply a certificate.
 	    //
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -253,21 +253,21 @@ public class AllTests
 	    comm.destroy();
 
 	    //
-	    // Test IceSSL.Server.VerifyPeer=1. Client has a certificate.
+	    // Test IceSSL.VerifyPeer=1. Client has a certificate.
 	    //
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    comm = Ice.Util.initialize(args, initData);
 	    fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "1");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "1");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -280,14 +280,14 @@ public class AllTests
 	    fact.destroyServer(server);
 
 	    //
-	    // Test IceSSL.Server.VerifyPeer=2. Client has a certificate.
+	    // Test IceSSL.VerifyPeer=2. Client has a certificate.
 	    //
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -302,23 +302,23 @@ public class AllTests
 	    comm.destroy();
 
 	    //
-	    // Test IceSSL.Server.VerifyPeer=1. This should fail because the
+	    // Test IceSSL.VerifyPeer=1. This should fail because the
 	    // client doesn't trust the server's CA.
 	    //
 	    initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca2.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert2.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca2.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert2.jks");
 	    comm = Ice.Util.initialize(args, initData);
 	    fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "1");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "1");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -338,25 +338,25 @@ public class AllTests
 	    comm.destroy();
 
 	    //
-	    // Test IceSSL.Server.VerifyPeer=2. This should fail because the
+	    // Test IceSSL.VerifyPeer=2. This should fail because the
 	    // server doesn't trust the client's CA.
 	    //
 	    // NOTE: In C++ this test fails with VerifyPeer=1, but JSSE seems
 	    // to allow the handshake to continue unless we set VerifyPeer=2.
 	    //
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca2.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca2.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    comm = Ice.Util.initialize(args, initData);
 	    fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -383,7 +383,7 @@ public class AllTests
 	    // ADH is allowed but will not have a certificate.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.Ciphers", "NONE (.*DH_anon.*)");
+	    initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    IceSSL.Plugin plugin = (IceSSL.Plugin)comm.getPluginManager().getPlugin("IceSSL");
 	    test(plugin != null);
@@ -393,8 +393,8 @@ public class AllTests
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.Ciphers", "NONE (.*DH_anon.*)");
-	    d.put("IceSSL.Server.VerifyPeer", "0");
+	    d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+	    d.put("IceSSL.VerifyPeer", "0");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -440,10 +440,10 @@ public class AllTests
 	    // Verify that a server certificate is present.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    IceSSL.Plugin plugin = (IceSSL.Plugin)comm.getPluginManager().getPlugin("IceSSL");
 	    test(plugin != null);
@@ -453,11 +453,11 @@ public class AllTests
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -483,21 +483,21 @@ public class AllTests
 	    // in common.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Protocols", "ssl3");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.Protocols", "ssl3");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
-	    d.put("IceSSL.Server.Protocols", "tls1");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
+	    d.put("IceSSL.Protocols", "tls1");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -522,12 +522,12 @@ public class AllTests
 	    fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
-	    d.put("IceSSL.Server.Protocols", "tls1, ssl3");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
+	    d.put("IceSSL.Protocols", "tls1, ssl3");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -549,19 +549,19 @@ public class AllTests
 	    // This should fail because the server's certificate is expired.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1_exp.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1_exp.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -582,19 +582,19 @@ public class AllTests
 	    //
 	    // This should fail because the client's certificate is expired.
 	    //
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca1_exp.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1_exp.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    comm = Ice.Util.initialize(args, initData);
 	    fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -622,19 +622,19 @@ public class AllTests
 	System.out.flush();
 	{
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacerts.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacerts.jks");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca2.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacerts.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca2.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacerts.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -653,10 +653,10 @@ public class AllTests
 	System.out.flush();
 	{
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1.jks");
 	    // Don't specify the password.
-	    //initData.properties.setProperty("IceSSL.Client.Password", "password");
+	    //initData.properties.setProperty("IceSSL.Password", "password");
 	    try
 	    {
 		Ice.Util.initialize(args, initData);
@@ -681,17 +681,17 @@ public class AllTests
 	    // negotiate to use ADH since we explicitly enable it.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.Ciphers", "NONE (.*DH_anon.*)");
+	    initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.Ciphers", "ALL");
-	    d.put("IceSSL.Server.VerifyPeer", "1");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.Ciphers", "ALL");
+	    d.put("IceSSL.VerifyPeer", "1");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -711,19 +711,19 @@ public class AllTests
 	    // First try a client with a DSA certificate.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_dsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_dsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_dsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "1");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_dsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "1");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -740,19 +740,19 @@ public class AllTests
 	    // Next try a client with an RSA certificate.
 	    //
 	    initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_rsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
 	    comm = Ice.Util.initialize(args, initData);
 	    fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_dsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "1");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_dsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "1");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -769,16 +769,16 @@ public class AllTests
 	    // Next try a client with ADH. This should fail.
 	    //
 	    initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.Ciphers", "NONE (.*DH_anon.*)");
+	    initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
 	    comm = Ice.Util.initialize(args, initData);
 	    fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_dsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "1");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_dsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "1");
 	    server = fact.createServer(d);
 	    try
 	    {
@@ -801,20 +801,20 @@ public class AllTests
 	    // Configure a server with RSA and a client with DSA. This should fail.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_dsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Ciphers", "NONE (.*DSS.*)");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_dsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DSS.*)");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_ca1.jks");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_ca1.jks");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {
@@ -838,21 +838,21 @@ public class AllTests
 	    // Alias property to select the RSA certificate. This should fail.
 	    //
 	    Ice.InitializationData initData = createClientProps(testDir, defaultHost);
-	    initData.properties.setProperty("IceSSL.Client.DefaultDir", defaultDir);
-	    initData.properties.setProperty("IceSSL.Client.Keystore", "c_dsa_ca1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Password", "password");
-	    initData.properties.setProperty("IceSSL.Client.Truststore", "cacert1.jks");
-	    initData.properties.setProperty("IceSSL.Client.Ciphers", "NONE (.*DSS.*)");
+	    initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
+	    initData.properties.setProperty("IceSSL.Keystore", "c_dsa_ca1.jks");
+	    initData.properties.setProperty("IceSSL.Password", "password");
+	    initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks");
+	    initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DSS.*)");
 	    Ice.Communicator comm = Ice.Util.initialize(args, initData);
 	    Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
 	    test(fact != null);
 	    java.util.Map d = createServerProps(testDir, defaultHost);
-	    d.put("IceSSL.Server.DefaultDir", defaultDir);
-	    d.put("IceSSL.Server.Keystore", "s_rsa_dsa_ca1.jks");
-	    d.put("IceSSL.Server.Alias", "rsacert");
-	    d.put("IceSSL.Server.Password", "password");
-	    d.put("IceSSL.Server.Truststore", "cacert1.jks");
-	    d.put("IceSSL.Server.VerifyPeer", "2");
+	    d.put("IceSSL.DefaultDir", defaultDir);
+	    d.put("IceSSL.Keystore", "s_rsa_dsa_ca1.jks");
+	    d.put("IceSSL.Alias", "rsacert");
+	    d.put("IceSSL.Password", "password");
+	    d.put("IceSSL.Truststore", "cacert1.jks");
+	    d.put("IceSSL.VerifyPeer", "2");
 	    Test.ServerPrx server = fact.createServer(d);
 	    try
 	    {