Renamed all the Ssl* files. Modified the config/TestUtil.py file to include

    a clientServerHybridTest - handles the test case that client and server
    are BOTH client and server roles.

1 files changed, 11 insertions, 11 deletions

diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index efd8f5bde83..0ee66450e23 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -22,8 +22,8 @@
 #include <Ice/Properties.h>
 #include <Ice/LoggerI.h>
 #include <Ice/Network.h>
-#include <Ice/SslSystemInternal.h>

-#include <Ice/SslFactory.h>

+#include <Ice/SystemInternal.h>
+#include <Ice/SslFactory.h>
 
 #ifndef WIN32
 #   include <Ice/SysLoggerI.h>
@@ -116,12 +116,12 @@ IceInternal::Instance::defaultHost()
     // No mutex lock, immutable.
     return _defaultHost;
 }
-

-::IceSSL::SystemInternalPtr

-IceInternal::Instance::getSslSystem()

-{

-    return _sslSystem;

-}

+
+::IceSSL::SystemInternalPtr
+IceInternal::Instance::getSslSystem()
+{
+    return _sslSystem;
+}
 
 RouterManagerPtr
 IceInternal::Instance::routerManager()
@@ -299,9 +299,9 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 	_userExceptionFactoryManager = new UserExceptionFactoryManager();
 	_objectAdapterFactory = new ObjectAdapterFactory(this);
 	_threadPool = new ThreadPool(this);
-	__setNoDelete(false);

-

-        // Get our instance of the SSL System

+	__setNoDelete(false);
+
+        // Get our instance of the SSL System
         _sslSystem = IceSSL::Factory::getSystem(this);
     }
     catch(...)