From 057f884903954203339182649daa100ef4ce89e3 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 22 Dec 2003 17:28:21 +0000
Subject: This commit was manufactured by cvs2svn to create tag 'Build_001'.
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/tags/Build_001@85 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
.../src/at/gv/egovernment/moa/logging/LogMsg.java | 43 -----
.../src/at/gv/egovernment/moa/logging/Logger.java | 175 ---------------------
.../gv/egovernment/moa/logging/LoggingContext.java | 46 ------
.../moa/logging/LoggingContextManager.java | 56 -------
4 files changed, 320 deletions(-)
delete mode 100644 common/src/at/gv/egovernment/moa/logging/LogMsg.java
delete mode 100644 common/src/at/gv/egovernment/moa/logging/Logger.java
delete mode 100644 common/src/at/gv/egovernment/moa/logging/LoggingContext.java
delete mode 100644 common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java
(limited to 'common/src/at/gv/egovernment/moa/logging')
diff --git a/common/src/at/gv/egovernment/moa/logging/LogMsg.java b/common/src/at/gv/egovernment/moa/logging/LogMsg.java
deleted file mode 100644
index 4d04fc72d..000000000
--- a/common/src/at/gv/egovernment/moa/logging/LogMsg.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.gv.egovernment.moa.logging;
-
-/**
- * A unified message type to log messages from inside the MOA subsystem.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class LogMsg {
- /** The message to log. */
- private Object message;
-
- /**
- * Create a LogMsg
object.
- *
- * @param message The actual message to log. May be null
.
- */
- public LogMsg(Object message) {
- this.message = message;
- }
-
- /**
- * Convert this log message to a String
.
- *
- * @return The String
representation of this log message.
- */
- public String toString() {
- StringBuffer msg = new StringBuffer();
- LoggingContext ctx =
- LoggingContextManager.getInstance().getLoggingContext();
- String tid = ctx != null ? ctx.getTransactionID() : null;
- String nodeId = ctx != null ? ctx.getNodeID() : null;
-
- msg.append("TID=");
- msg.append(tid != null ? tid : "");
- msg.append(" NID=");
- msg.append(nodeId != null ? nodeId : "");
- msg.append(" MSG=");
- msg.append(message != null ? message.toString() : "");
-
- return msg.toString();
- }
-}
diff --git a/common/src/at/gv/egovernment/moa/logging/Logger.java b/common/src/at/gv/egovernment/moa/logging/Logger.java
deleted file mode 100644
index eb7aa5634..000000000
--- a/common/src/at/gv/egovernment/moa/logging/Logger.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package at.gv.egovernment.moa.logging;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A utility class acting as a facade to the logging subsystem.
- *
- * Configure the logging defaultHierarchy that the Logger
uses by
- * calling setHierarchy
once before calling any of the logging
- * output functions.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class Logger {
-
- /** The default logging hierarchy. */
- private static String defaultHierarchy = "";
-
- /**
- * Get the Log
object for the default hierarchy.
- *
- * @return The Log
object to write log messages to.
- */
- private static Log getLog() {
- return LogFactory.getLog(defaultHierarchy);
- }
-
- /**
- * Get the Log
object for a given hierarchy.
- *
- * @param hierarchy The logging hierarchy for which to return the logger.
- * @return The Log
object to write log messages to.
- */
- private static Log getLog(String hierarchy) {
- return LogFactory.getLog(hierarchy);
- }
-
- /**
- * Set the default hierarchy to which the Logger
should send its
- * logging output.
- * @param hierarchy The logging defaultHierarchy.
- */
- public static void setHierarchy(String hierarchy) {
- defaultHierarchy = hierarchy;
- }
-
- /**
- * Test, if the trace log level is enabled.
- *
- * @return boolean true
, if tracing output is enabled
- * false
otherwise.
- */
- public static boolean isTraceEnabled() {
- return getLog().isTraceEnabled();
- }
-
- /**
- * Test, if the trace log level is enabled for a given hierarchy.
- *
- * @param hierarchy requested log hierarchy
- * @return boolean true
, if tracing output is enabled
- * false
otherwise.
- */
- public static boolean isTraceEnabled(String hierarchy) {
- return getLog(hierarchy).isTraceEnabled();
- }
-
- /**
- * Trace a message.
- *
- * @param message The message to trace.
- */
- public static void trace(Object message) {
- getLog().trace(message);
- }
-
- /**
- * Test, if the debug log level is enabled.
- *
- * @return boolean true
, if debug output is enabled
- * false
otherwise.
- */
- public static boolean isDebugEnabled() {
- return getLog().isDebugEnabled();
- }
-
- /**
- * Test, if the debug log level is enabled for a given hierarchy.
- *
- * @param hierarchy requested log hierarchy
- * @return boolean true
, if debug output is enabled
- * false
otherwise.
- */
- public static boolean isDebugEnabled(String hierarchy) {
- return getLog(hierarchy).isDebugEnabled();
- }
-
- /**
- * Log a debug message.
- *
- * @param message The message to log.
- */
- public static void debug(Object message) {
- getLog().debug(message);
- }
-
- /**
- * Log an info message.
- *
- * @param message The message to log.
- */
- public static void info(Object message) {
- getLog().info(message);
- }
-
- /**
- * Log a warning message.
- *
- * @param message The message to log.
- */
- public static void warn(Object message) {
- getLog().warn(message);
- }
-
- /**
- * Log a warning message.
- *
- * @param message The message to log.
- * @param t An exception that may be the cause of the warning.
- */
- public static void warn(Object message, Throwable t) {
- getLog().warn(message, t);
- }
-
- /**
- * Log an error message.
- *
- * @param message The message to log.
- */
- public static void error(Object message) {
- getLog().error(message);
- }
-
- /**
- * Log an error message.
- *
- * @param message The message to log.
- * @param t An exception that may be the cause of the error.
- */
- public static void error(Object message, Throwable t) {
- getLog().error(message, t);
- }
-
- /**
- * Log a fatal error message.
- *
- * @param message The message to log.
- */
- public static void fatal(Object message) {
- getLog().fatal(message);
- }
-
- /**
- * Log a fatal error message.
- *
- * @param message The message to log.
- * @param t An exception that may be the cause of the error.
- */
- public static void fatal(Object message, Throwable t) {
- getLog().fatal(message, t);
- }
-
-}
diff --git a/common/src/at/gv/egovernment/moa/logging/LoggingContext.java b/common/src/at/gv/egovernment/moa/logging/LoggingContext.java
deleted file mode 100644
index 42d8db06e..000000000
--- a/common/src/at/gv/egovernment/moa/logging/LoggingContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package at.gv.egovernment.moa.logging;
-
-/**
- * Encapsulates contextual information (i.e. per request information) for
- * logging purposes.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class LoggingContext {
- /** The name of the node ID system property. */
- public static final String NODE_ID_PROPERTY = "moa.node-id";
-
- /** The current transaction ID. */
- private String transactionID;
- /** The node ID. */
- private String nodeID;
-
- /**
- * Create a new LoggingContext
.
- *
- * @param transactionID The transaction ID. May be null
.
- */
- public LoggingContext(String transactionID) {
- this.transactionID = transactionID;
- this.nodeID = System.getProperty(NODE_ID_PROPERTY);
- }
-
- /**
- * Return the transaction ID.
- *
- * @return The transaction ID.
- */
- public String getTransactionID() {
- return transactionID;
- }
-
- /**
- * Return the node ID.
- *
- * @return The node ID.
- */
- public String getNodeID() {
- return nodeID;
- }
-}
diff --git a/common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java b/common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java
deleted file mode 100644
index 2bbe6caa1..000000000
--- a/common/src/at/gv/egovernment/moa/logging/LoggingContextManager.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package at.gv.egovernment.moa.logging;
-
-/**
- * Provides each thread with a single instance of LoggingContext
.
- *
- * @author Patrick Peck
- * @version $Id$
- */
-public class LoggingContextManager {
- /** The single instance of this class. */
- private static LoggingContextManager instance = null;
-
- /** The LoggingContext
for each thread. */
- private ThreadLocal context;
-
- /**
- * Get the single instance of the LoggingContextManager
class.
- *
- * @return LoggingContextManager The single instance.
- */
- public static synchronized LoggingContextManager getInstance() {
- if (instance == null) {
- instance = new LoggingContextManager();
- }
- return instance;
- }
-
- /**
- * Creates a new LoggingContextManager
.
- *
- * Protected to disallow direct instantiation.
- */
- protected LoggingContextManager() {
- context = new ThreadLocal();
- }
-
- /**
- * Set the LoggingContext
context for the current thread.
- *
- * @param ctx The LoggingContext
for the current thread.
- */
- public void setLoggingContext(LoggingContext ctx) {
- context.set(ctx);
- }
-
- /**
- * Return the LoggingContext
for the current thread.
- *
- * @return LoggingContext The LoggingContext
for the current
- * thread, or null
if none has been set.
- */
- public LoggingContext getLoggingContext() {
- return (LoggingContext) context.get();
- }
-
-}
--
cgit v1.2.3