3 files changed, 227 insertions, 0 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/CertValidatorImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/CertValidatorImpl.java
index 125233c1..3b2d1b99 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/CertValidatorImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/CertValidatorImpl.java
@@ -1,7 +1,9 @@
 package at.gv.egiz.bku.conf;
 
+import iaik.logging.LogConfigurationException;
 import iaik.logging.TransactionId;
 import iaik.logging.impl.TransactionIdImpl;
+import iaik.logging.LoggerConfig;
 import iaik.pki.DefaultPKIConfiguration;
 import iaik.pki.DefaultPKIProfile;
 import iaik.pki.PKIConfiguration;
@@ -18,6 +20,7 @@ import iaik.x509.X509Certificate;
 
 import java.io.File;
 import java.util.Date;
+import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -37,6 +40,27 @@ public class CertValidatorImpl implements CertValidator {
    * @see at.gv.egiz.bku.conf.CertValidator#init(java.io.File, java.io.File)
    */
   public void init(File certDir, File caDir) {
+    // initialize IAIK logging for PKI module
+    log.debug("Configuring logging for IAIK PKI module");
+    iaik.logging.LogFactory.configure(new LoggerConfig() {
+      
+      @Override
+      public Properties getProperties() throws LogConfigurationException {
+        return null;
+      }
+      
+      @Override
+      public String getNodeId() {
+        return "pki";
+      }
+      
+      @Override
+      public String getFactory() {
+        return IAIKCommonsLogFactory.class.getName();
+      }
+    });
+    
+    
     // the parameters specifying the directory certstore
     CertStoreParameters[] certStoreParameters = { new DefaultDirectoryCertStoreParameters(
         "CS-001", certDir.getAbsolutePath(), true, false) };
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKCommonsLog.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKCommonsLog.java
new file mode 100644
index 00000000..1b7dd189
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKCommonsLog.java
@@ -0,0 +1,144 @@
+/**
+ * 
+ */
+package at.gv.egiz.bku.conf;
+
+import iaik.logging.Log;
+import iaik.logging.TransactionId;
+
+/**
+ * @author mcentner
+ *
+ */
+public class IAIKCommonsLog implements Log {
+  
+  /**
+   * The id that will be written to the log if the transactionid == null
+   */
+  public final static String NO_ID = "Null-ID";
+
+  protected org.apache.commons.logging.Log commonsLog;
+  
+  protected String nodeId;
+
+  public IAIKCommonsLog(org.apache.commons.logging.Log log) {
+    this.commonsLog = log;
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#debug(iaik.logging.TransactionId, java.lang.Object, java.lang.Throwable)
+   */
+  @Override
+  public void debug(TransactionId transactionId, Object message, Throwable t) {
+    if (commonsLog.isDebugEnabled()) {
+      commonsLog.debug(nodeId + ": "
+          + ((transactionId != null) ? transactionId.getLogID() : NO_ID) + ": "
+          + message, t);
+    }
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#info(iaik.logging.TransactionId, java.lang.Object, java.lang.Throwable)
+   */
+  @Override
+  public void info(TransactionId transactionId, Object message, Throwable t) {
+    if (commonsLog.isInfoEnabled()) {
+      commonsLog.info(nodeId + ": "
+          + ((transactionId != null) ? transactionId.getLogID() : NO_ID) + ": "
+          + message, t);
+    }
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#warn(iaik.logging.TransactionId, java.lang.Object, java.lang.Throwable)
+   */
+  @Override
+  public void warn(TransactionId transactionId, Object message, Throwable t) {
+    if (commonsLog.isWarnEnabled()) {
+      commonsLog.warn(nodeId + ": "
+          + ((transactionId != null) ? transactionId.getLogID() : NO_ID) + ": "
+          + message, t);
+    }
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#error(iaik.logging.TransactionId, java.lang.Object, java.lang.Throwable)
+   */
+  @Override
+  public void error(TransactionId transactionId, Object message, Throwable t) {
+    if (commonsLog.isErrorEnabled()) {
+      commonsLog.error(nodeId + ": "
+          + ((transactionId != null) ? transactionId.getLogID() : NO_ID) + ": "
+          + message, t);
+    }
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#fatal(iaik.logging.TransactionId, java.lang.Object, java.lang.Throwable)
+   */
+  @Override
+  public void fatal(TransactionId transactionId, Object message, Throwable t) {
+    if (commonsLog.isFatalEnabled()) {
+      commonsLog.fatal(nodeId + ": "
+          + ((transactionId != null) ? transactionId.getLogID() : NO_ID) + ": "
+          + message, t);
+    }
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#setNodeId(java.lang.String)
+   */
+  @Override
+  public void setNodeId(String nodeId) {
+    this.nodeId = nodeId;
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#getNodeId()
+   */
+  @Override
+  public String getNodeId() {
+    return nodeId;
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#isDebugEnabled()
+   */
+  @Override
+  public boolean isDebugEnabled() {
+    return commonsLog.isDebugEnabled();
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#isInfoEnabled()
+   */
+  @Override
+  public boolean isInfoEnabled() {
+    return commonsLog.isInfoEnabled();
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#isWarnEnabled()
+   */
+  @Override
+  public boolean isWarnEnabled() {
+    return commonsLog.isWarnEnabled();
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#isErrorEnabled()
+   */
+  @Override
+  public boolean isErrorEnabled() {
+    return commonsLog.isErrorEnabled();
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.Log#isFatalEnabled()
+   */
+  @Override
+  public boolean isFatalEnabled() {
+    return commonsLog.isFatalEnabled();
+  }
+
+}
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKCommonsLogFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKCommonsLogFactory.java
new file mode 100644
index 00000000..14e2c757
--- /dev/null
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/IAIKCommonsLogFactory.java
@@ -0,0 +1,59 @@
+/**
+ * 
+ */
+package at.gv.egiz.bku.conf;
+
+import org.apache.commons.logging.impl.WeakHashtable;
+
+import iaik.logging.Log;
+import iaik.logging.LogConfigurationException;
+import iaik.logging.LogFactory;
+
+/**
+ * @author mcentner
+ *
+ */
+public class IAIKCommonsLogFactory extends LogFactory {
+
+  protected WeakHashtable instances = new WeakHashtable();
+  
+  /* (non-Javadoc)
+   * @see iaik.logging.LogFactory#getInstance(java.lang.String)
+   */
+  @Override
+  public Log getInstance(String name) throws LogConfigurationException {
+    org.apache.commons.logging.Log commonsLog = org.apache.commons.logging.LogFactory.getLog(name);
+    Log log = (Log) instances.get(commonsLog);
+    if (log == null) {
+      log = new IAIKCommonsLog(commonsLog);
+      log.setNodeId(node_id_);
+      instances.put(commonsLog, log);
+    }
+    return log;
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.LogFactory#getInstance(java.lang.Class)
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public Log getInstance(Class clazz) throws LogConfigurationException {
+    org.apache.commons.logging.Log commonsLog = org.apache.commons.logging.LogFactory.getLog(clazz);
+    Log log = (Log) instances.get(commonsLog);
+    if (log == null) {
+      log = new IAIKCommonsLog(commonsLog);
+      log.setNodeId(node_id_);
+      instances.put(commonsLog, log);
+    }
+    return log;
+  }
+
+  /* (non-Javadoc)
+   * @see iaik.logging.LogFactory#release()
+   */
+  @Override
+  public void release() {
+    instances.clear();
+  }
+
+}