Renaming Ice.Trace.Security to IceSSL.Trace.Security Cleaning up IceSSL

    dependencies on Ice core

1 files changed, 32 insertions, 6 deletions

diff --git a/cpp/src/IceSSL/PluginBaseI.cpp b/cpp/src/IceSSL/PluginBaseI.cpp
index 4a2f065112e..c2cb4ea42a8 100644
--- a/cpp/src/IceSSL/PluginBaseI.cpp
+++ b/cpp/src/IceSSL/PluginBaseI.cpp
@@ -8,8 +8,10 @@
 //
 // **********************************************************************
 
-#include <Ice/Instance.h>
+#include <Ice/ProtocolPluginFacade.h>
+#include <Ice/Communicator.h>
 #include <IceSSL/PluginBaseI.h>
+#include <IceSSL/TraceLevels.h>
 
 using namespace std;
 using namespace Ice;
@@ -23,14 +25,38 @@ void IceInternal::decRef(PluginBaseI* p) { p->__decRef(); }
 // Protected Methods
 //
 
-IceSSL::PluginBaseI::PluginBaseI(const InstancePtr& instance) :
-    _instance(instance),
-    _traceLevels(instance->traceLevels()),
-    _logger(instance->logger()),
-    _properties(instance->properties())
+IceSSL::PluginBaseI::PluginBaseI(const ProtocolPluginFacadePtr& protocolPluginFacade) :
+    _protocolPluginFacade(protocolPluginFacade)
 {
+    _logger = _protocolPluginFacade->getCommunicator()->getLogger();
+    _properties = _protocolPluginFacade->getCommunicator()->getProperties();
+    _traceLevels = new TraceLevels(_protocolPluginFacade);
 }
 
 IceSSL::PluginBaseI::~PluginBaseI()
 {
 }
+
+TraceLevelsPtr
+IceSSL::PluginBaseI::getTraceLevels() const
+{
+    return _traceLevels;
+}
+
+LoggerPtr
+IceSSL::PluginBaseI::getLogger() const
+{
+    return _logger;
+}
+
+PropertiesPtr
+IceSSL::PluginBaseI::getProperties() const
+{
+    return _properties;
+}
+
+ProtocolPluginFacadePtr
+IceSSL::PluginBaseI::getProtocolPluginFacade() const
+{
+    return _protocolPluginFacade;
+}