4 files changed, 0 insertions, 260 deletions
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java b/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
deleted file mode 100644
index 068fab5ca..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package at.gv.egovernment.moa.spss.server.logging;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import iaik.logging.TransactionId;
-
-/**
- * An implementation of the <code>iaik.logging.Log</code>
- * interface that is based on Jakarta Commons-Logging.
- * 
- * @author Fatemeh Philippi
- * @version $Id$
- */
-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);
-  /** The node ID to use. */
-  private String nodeId;
-  
-  /**
-   * Create a new <code>IaikLog</code>.
-   * 
-   * @param nodeId The node ID for this <code>Log</code> object. 
-   */
-  public IaikLog(String nodeId) {
-    this.nodeId = nodeId;
-  }
-
-  /**
-   * @see iaik.logging.Log#isDebugEnabled()
-   */
-  public boolean isDebugEnabled() {
-    return log.isDebugEnabled();
-  }
-
-  /**
-   * @see iaik.logging.Log#debug(TransactionId, Object, Throwable)
-   */
-  public void debug(TransactionId transactionId, Object message, Throwable t) {
-    IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
-    log.debug(msg, t);
-  }
-
-  /**
-   * @see iaik.logging.Log#isInfoEnabled()
-   */
-  public boolean isInfoEnabled() {
-    return log.isInfoEnabled();
-  }
-
-  /**
-   * @see iaik.logging.Log#info(TransactionId, Object, Throwable)
-   */
-  public void info(TransactionId transactionId, Object message, Throwable t) {
-    IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
-    log.info(msg, t);
-  }
-
-  /**
-   * @see iaik.logging.Log#isWarnEnabled()
-   */
-  public boolean isWarnEnabled() {
-    return log.isWarnEnabled();
-  }
-
-  /**
-   * @see iaik.logging.Log#warn(TransactionId, Object, Throwable)
-   */
-  public void warn(TransactionId transactionId, Object message, Throwable t) {
-    IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
-    log.warn(msg, t);
-  }
-
-  /**
-   * @see iaik.logging.Log#isErrorEnabled()
-   */
-  public boolean isErrorEnabled() {
-    return log.isErrorEnabled();
-  }
-
-  /**
-   * @see iaik.logging.Log#error(TransactionId, Object, Throwable)
-   */
-  public void error(TransactionId transactionId, Object message, Throwable t) {
-    IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
-    log.error(msg, t);
-  }
-
-  /**
-   * @see iaik.logging.Log#isFatalEnabled()
-   */
-  public boolean isFatalEnabled() {
-    return log.isFatalEnabled();
-  }
-
-  /**
-   * @see iaik.logging.Log#fatal(TransactionId, Object, Throwable)
-   */
-  public void fatal(TransactionId transactionId, Object message, Throwable t) {
-    IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message);
-
-    log.fatal(msg, t);
-  }
-
-  /**
-   * @see iaik.logging.Log#setNodeId(String)
-   */
-  public void setNodeId(String nodeId) {
-    this.nodeId = nodeId;
-  }
-
-  /**
-   * @see iaik.logging.Log#getNodeId()
-   */
-  public String getNodeId() {
-    return nodeId;
-  }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
deleted file mode 100644
index a0e4def86..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package at.gv.egovernment.moa.spss.server.logging;
-
-import iaik.logging.Log;
-import iaik.logging.LogConfigurationException;
-import iaik.logging.LogFactory;
-
-import at.gv.egovernment.moa.logging.LoggingContextManager;
-
-/**
- * An implementation of the <code>iaik.logging.LogFactory</code> abstract
- * class to log messages to the MOA logging subsystem.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class IaikLogFactory extends LogFactory {
-
-  public Log getInstance(Class clazz) throws LogConfigurationException {
-    return getInstanceImpl();
-  }
-
-  public Log getInstance(String name) throws LogConfigurationException {
-    return getInstanceImpl();
-  }
-
-  /**
-   * Return an instance of <code>iaik.logging.Log</code>.
-   * 
-   * @return The <code>iaik.logging.Log</code> object to log messages to.
-   */  
-  private Log getInstanceImpl() {
-    String nodeID = 
-      LoggingContextManager.getInstance().getLoggingContext().getNodeID();
-      
-    return new IaikLog(nodeID);
-  }
-
-  public void release() {
-    // we do not hold any resources
-  }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java b/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java
deleted file mode 100644
index 75fb388a9..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/IaikLogMsg.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package at.gv.egovernment.moa.spss.server.logging;
-
-import iaik.logging.TransactionId;
-
-/**
- * A unified message type to log messages from the IAIK subsystem.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class IaikLogMsg {
-  
-  /** The transaction ID of this message. */
-  private TransactionId transactionId;
-  /** The node ID of this message. */
-  private String nodeId;
-  /** The message to log. */
-  private Object message;
-  
-  /**
-   * Create a <code>IaikLogMsg</code> object.
-   * 
-   * @param transactionId The transaction id of the transaction which
-   * generated this log message. May be <code>null</code>.
-   * @param nodeId The node id where this message was generated. May be
-   * <code>null</code>.
-   * @param message The actual message to log. May be <code>null</code>.
-   */
-  public IaikLogMsg(TransactionId transactionId, String nodeId, Object message) {
-    this.transactionId = transactionId;
-    this.nodeId = nodeId;
-    this.message = message;
-  }
-
-  
-  /**
-   * Convert this log message to a <code>String</code>.
-   * 
-   * @return The <code>String</code> representation of this log message. 
-   */
-  public String toString() {
-    StringBuffer msg = new StringBuffer();
-    
-    msg.append("TID=");
-    msg.append(transactionId != null ? transactionId.getLogID() : "<null>");
-    msg.append(" NID=");
-    msg.append(nodeId != null ? nodeId : "<null>");
-    msg.append(" MSG=");
-    msg.append(message != null ? message.toString() : "<null>");
-    
-    return msg.toString();
-  }
-
-}
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java b/spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java
deleted file mode 100644
index 9e0239464..000000000
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/logging/TransactionId.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package at.gv.egovernment.moa.spss.server.logging;
-
-/**
- * An implementation of the <code>iaik.logging.TransactionId</code> interface.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class TransactionId implements iaik.logging.TransactionId {
-  
-  /** The String representation for logging the transaction ID. */
-  private String logID;
-  
-  /**
-   * Create a <code>TransactionId</code> object.
-   * 
-   * @param logID The transaction id as it should be presented to the logging
-   * subsystem.
-   */
-  public TransactionId(String logID) {
-    this.logID = logID;
-  }
-
-  /**
-   * @see iaik.logging.TransactionId#getLogID()
-   */
-  public String getLogID() {
-    return logID;
-  }
-  
-  /**
-   * @see java.lang.Object#toString()
-   */
-  public String toString() {
-    return getLogID();
-  }
-
-}