1 files changed, 38 insertions, 6 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java
index eaef3f1d4..9fc6f799d 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/ssl/MOAIDTrustManager.java
@@ -57,11 +57,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.logging.LoggingContext;
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
+import at.gv.egovernment.moaspss.logging.LoggingContext;
+import at.gv.egovernment.moaspss.logging.LoggingContextManager;
 import iaik.pki.jsse.IAIKX509TrustManager;
 
+
 /**
  * <code>TrustManager</code> implementation featuring CRL checking (inherited from
  * <code>IAIKX509TrustManager</code>), plus server-end-SSL-certificate checking.
@@ -95,14 +95,14 @@ public class MOAIDTrustManager extends IAIKX509TrustManager {
    * Fixes a bug occuring in the case MOA-SP is called by API.
    * In this case, IAIKX509TrustManager uses the LogginConfig of MOA-SP.
    * This method must be called before a MOAIDTrustManager is constructed,
-   * from every thread.
-   */
+   * from every thread. 
+   */ 
   public static void initializeLoggingContext() {  
     if (LoggingContextManager.getInstance().getLoggingContext() == null)
     LoggingContextManager.getInstance().setLoggingContext(
       new LoggingContext(Thread.currentThread().getName()));
   }
-
+ 
   
   /**
    * Builds an Array of accepted server certificates from an URL,
@@ -161,4 +161,36 @@ public class MOAIDTrustManager extends IAIKX509TrustManager {
   {
     return true;
   }
+  
+//  public void init(PKIConfiguration pkiConfig, PKIProfile pkiProfile) throws PKIException  {
+//	  if (pkiProfile == null) {
+//		  throw new NullPointerException("pkiConfig parameter must not be null");
+//		  
+//	  }
+//	  	  
+//	  TransactionId tid = new TransactionIdImpl("Init");
+//	  log_.info(tid, "Setting up IAIKX509TrustManager", null);
+//	  if (pkiConfig != null) {
+//		  PKIFactory.getInstance().configure(pkiConfig, tid);
+////		  log_.info(tid, "Registering LDAP protocol handler", null);
+////		  String protocolHandlers = 
+////				  System.getProperty("java.protocol.handler.pkgs");
+////		  if (protocolHandlers == null) {
+////			  protocolHandlers = "iaik.pki";
+////			  
+////		  } else {
+////			  protocolHandlers = protocolHandlers + "|iaik.pki";
+////			  
+////		  }
+////      
+////		  System.setProperty("java.protocol.handler.pkgs", protocolHandlers);
+////		  log_.info(tid, "Registered protocol handlers: " + protocolHandlers, null);
+//
+//	  }
+//	  
+//	  pkiProfile_ = pkiProfile;
+//	  pkiFactory_ = PKIFactory.getInstance();
+//	  initialized_ = true;
+//  }
+  
 }