Got rid of properties IceSSL.[Client|Server].CertificateVerifier - these

    were test properties, not part of the IceSSL plugin.
Previously, Ice was unable to allow the pass-through of non Ice or IceSSL
    command line parameters into the Properties. This was fixed, but these
    properties in the certificateVerification test were missed. Somehow
    they ended up in the src/Ice/PropertiesI.cpp file as constants.
Have modified doc/Properties.sgml to include a proper description of the
    Glacier.Router.AcceptCert property.

1 files changed, 7 insertions, 3 deletions

diff --git a/cpp/test/IceSSL/certificateVerification/Client.cpp b/cpp/test/IceSSL/certificateVerification/Client.cpp
index 298a58a684c..6371ab18a4f 100644
--- a/cpp/test/IceSSL/certificateVerification/Client.cpp
+++ b/cpp/test/IceSSL/certificateVerification/Client.cpp
@@ -44,13 +44,13 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::PropertiesPtr properties = communicator->getProperties();
 
     // Use test related paths - override values in TestUtil.py
-    std::string clientCertPath = properties->getProperty("IceSSL.Client.CertPath.Test");
-    std::string serverCertPath = properties->getProperty("IceSSL.Server.CertPath.Test");
+    std::string clientCertPath = properties->getProperty("TestSSL.Client.CertPath");
+    std::string serverCertPath = properties->getProperty("TestSSL.Server.CertPath");
     properties->setProperty("IceSSL.Client.CertPath", clientCertPath);
     properties->setProperty("IceSSL.Server.CertPath", serverCertPath);
 
     bool singleCertVerifier = false;
-    if(properties->getProperty("IceSSL.Client.CertificateVerifier") == "singleCert")
+    if(properties->getProperty("TestSSL.Client.CertificateVerifier") == "singleCert")
     {
         singleCertVerifier = true;
     }
@@ -190,6 +190,10 @@ main(int argc, char* argv[])
     try
     {
 	communicator = Ice::initialize(argc, argv);
+        Ice::PropertiesPtr properties = communicator->getProperties();
+        Ice::StringSeq args = Ice::argsToStringSeq(argc, argv);
+        args = properties->parseCommandLineOptions("TestSSL", args);
+        Ice::stringSeqToArgs(args, argc, argv);
 	status = run(argc, argv, communicator);
     }
     catch(const Ice::Exception& ex)