IAIK Moa CAdES added, cms verification not working

1 files changed, 9 insertions, 7 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
index 10dc79d..dcb1397 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
@@ -26,6 +26,8 @@ package at.gv.egovernment.moa.spss.server.logging;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import iaik.logging.TransactionId;
 
@@ -40,7 +42,7 @@ public class IaikLog implements iaik.logging.Log {
   /** The hierarchy to log all IAIK output to. */
   public static final String IAIK_LOG_HIERARCHY = "iaik.server";
   /** The commons-loggin <code>Log</code> to use for logging the messages. */
-  private static Log log = LogFactory.getLog(IAIK_LOG_HIERARCHY);
+  private static Logger log = LoggerFactory.getLogger(IAIK_LOG_HIERARCHY);
   /** The node ID to use. */
   private String nodeId;
   
@@ -66,7 +68,7 @@ public class IaikLog implements iaik.logging.Log {
   public void debug(TransactionId transactionId, Object message, Throwable t) {
     IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
 
-    log.debug(msg, t);
+    log.debug(msg.toString(), t);
   }
 
   /**
@@ -82,7 +84,7 @@ public class IaikLog implements iaik.logging.Log {
   public void info(TransactionId transactionId, Object message, Throwable t) {
     IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
 
-    log.info(msg, t);
+    log.info(msg.toString(), t);
   }
 
   /**
@@ -98,7 +100,7 @@ public class IaikLog implements iaik.logging.Log {
   public void warn(TransactionId transactionId, Object message, Throwable t) {
     IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
 
-    log.warn(msg, t);
+    log.warn(msg.toString(), t);
   }
 
   /**
@@ -114,14 +116,14 @@ public class IaikLog implements iaik.logging.Log {
   public void error(TransactionId transactionId, Object message, Throwable t) {
     IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
 
-    log.error(msg, t);
+    log.error(msg.toString(), t);
   }
 
   /**
    * @see iaik.logging.Log#isFatalEnabled()
    */
   public boolean isFatalEnabled() {
-    return log.isFatalEnabled();
+    return log.isErrorEnabled();
   }
 
   /**
@@ -130,7 +132,7 @@ public class IaikLog implements iaik.logging.Log {
   public void fatal(TransactionId transactionId, Object message, Throwable t) {
     IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
 
-    log.fatal(msg, t);
+    log.error(msg.toString(), t);
   }
 
   /**