Removed SimLogger-dependency

src/de/tud/kom/p2psim/impl/simengine/Simulator.java

@@ -22,20 +22,16 @@ package de.tud.kom.p2psim.impl.simengine;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
-import java.util.Set;
 
 import org.apache.commons.math.random.JDKRandomGenerator;
 import org.apache.commons.math.random.RandomGenerator;
-import org.apache.log4j.Logger;
 
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
 import de.tud.kom.p2psim.api.scenario.Configurator;
@@ -49,7 +45,6 @@ import de.tud.kom.p2psim.impl.util.NTPClient;
 import de.tud.kom.p2psim.impl.util.db.dao.DAO;
 import de.tud.kom.p2psim.impl.util.db.dao.metric.ExperimentDAO;
 import de.tud.kom.p2psim.impl.util.db.dao.metric.MeasurementDAO;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tud.kom.p2psim.impl.util.oracle.GlobalOracle;
 import de.tudarmstadt.maki.simonstrator.api.Binder;
 import de.tudarmstadt.maki.simonstrator.api.Monitor;
@@ -69,8 +64,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.core.RandomGeneratorCompon
  */
 public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
-	private final static Logger log = SimLogger.getLogger(Time.class);
-
 	/**
 	 * These constant should be ALWAYS used for virtual time calculations.
 	 */
@@ -111,10 +104,6 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	 */
 	private static Simulator singleton;
 
-	// private static EventBus eventBus = new EventBus();
-
-	private static Set<Class> suppressedEvents = new HashSet<Class>();
-
 	/**
 	 * Configurator instance is used to initialize the scenario.
 	 */
@@ -210,10 +199,11 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	 */
 	public void start(boolean throwExceptions) {
 		checkRunning();
-		log.info("Prepare Scenario ...");
+		Monitor.log(Simulator.class, Level.INFO, "Prepare Scenario ...");
 		this.scenario.prepare();
 		
-		log.info("Running Scenario with seed=" + getSeed());
+		Monitor.log(Simulator.class, Level.INFO, "Prepare Scenario ..."
+				+ getSeed());
 		
 		/* Real World Starting Time:
 		 * 		Block till we're allowed to start. 
@@ -226,17 +216,16 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 				final Date now = NTPClient.getDate();
 				final long waitFor = realWorldStartTime.getTime() - now.getTime();
 				
-				log.info("RealWorldStartDate specified, going to sleep till " + realWorldStartTime.toString());
 				Thread.sleep(waitFor);
 				
 			} catch (InterruptedException e) {
-				log.fatal("Simulator did not go to sleep. Aborting.");
+				//
 			}
 			
 		}
 		
 		startTime = System.currentTimeMillis();
-		log.info("Simulation started...");
+		Monitor.log(Simulator.class, Level.INFO, "Simulation started...");
 		this.running = true;
 		Exception reason = null;
 		try {
@@ -246,13 +235,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
 		} catch (RuntimeException e) {
 			finishedWithoutError = false;
-			if (throwExceptions) {
-                e.printStackTrace();
-				throw e;
-			} else {
-				log.error("Simulator run stopped because of error", e);
-				reason = e;
-			}
+			throw e;
 		} finally {
 			this.running = false;
 			// After a simulation start the mechanisms, which
@@ -264,15 +247,17 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	public void shutdownSimulation(Exception reason) {
 		this.running = false;
 		if (finishedWithoutError) {
-			log.info("Simulation successfully finished.");
+			Monitor.log(Simulator.class, Level.INFO,
+					"Simulation successfully finished...");
 		} else {
-			log.error("Simulation finished with the error = " + reason);
+			Monitor.log(Simulator.class, Level.ERROR,
+					"Simulation finished with errors...\n" + reason);
 		}
 		long runTime = System.currentTimeMillis() - startTime;
 		long minutes = (long) Math.floor((runTime) / 60000);
 		long secs = (runTime % 60000) / 1000;
-		log.info("Realtime Duration of experiment (m:s) " + minutes + ":"
-				+ secs);
+		Monitor.log(Simulator.class, Level.INFO,
+				"Realtime Duration of experiment (m:s) " + minutes + ":" + secs);
 
 		/*
 		 * FIXME the following writers should be closed and realized as a
@@ -323,9 +308,7 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 
         this.defaultConfigurator.register(Configurator.CORE, this);
 
-        Collection<Object> components = this.defaultConfigurator.configureAll();
-
-        log.debug("components " + components);
+		this.defaultConfigurator.configureAll();
 
         // The next steps are only required for the xml version.
         // SimCfg will execute them in the configurator
@@ -472,7 +455,12 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	 */
 	public void setDatabaseInactive(boolean inactive) {
 		MeasurementDAO.setInactive(inactive);
-		if (inactive) log.warn("Database output has been deactived. See the databaseInactive parameter of the Simulator for more information.");
+		if (inactive) {
+			Monitor.log(
+					Simulator.class,
+					Level.WARN,
+					"Database output has been deactived. See the databaseInactive parameter of the Simulator for more information.");
+		}
 	}
 
     /**
@@ -544,15 +532,17 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 			
 			final Date startTime = formatter.parse(realWorldStartTime);
 			if( now.after(startTime) ) {
-				log.fatal("Simlator was supposed to run in the past. Check config for realWorldStartTime.");
-				System.exit(0);
-				return;
+				throw new AssertionError(
+						"Simulator was supposed to run in the past. Check config for realWorldStartTime.");
 			} 
 			
 			this.realWorldStartTime = startTime;
 			
 		} catch (ParseException e) {
-			log.warn("Could not parse realWorldStartTime. Please check configuration file. Starting *NOW*");
+			Monitor.log(
+					Simulator.class,
+					Level.WARN,
+					"Could not parse realWorldStartTime. Please check configuration file. Starting *NOW*");
 		}
 		
 	}
@@ -560,22 +550,4 @@ public class Simulator implements RandomGeneratorComponent, GlobalComponent {
 	public void addObserver(SimulatorObserver observer) {
 		observers.add(observer);
 	}
-
-	// public static void registerAtEventBus(Object obj) {
-	// eventBus.register(obj);
-	// }
-	//
-	// public static void postEvent(Object event) {
-	// if (!suppressedEvents.contains(event.getClass())) {
-	// eventBus.post(event);
-	// }
-	// }
-
-    public static void suppressEvent(Class type) {
-        suppressedEvents.add(type);
-    }
-
-    public void setSuppressEvent(Class type) {
-        suppressEvent(type);
-    }
 }

src/de/tud/kom/p2psim/impl/storage/DefaultContentStorage.java

@@ -28,12 +28,9 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.api.storage.ContentStorage;
 import de.tud.kom.p2psim.api.storage.Document;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.common.UniqueID;
 
 /**
@@ -44,8 +41,6 @@ import de.tudarmstadt.maki.simonstrator.api.common.UniqueID;
  * @see ContentStorage
  */
 public class DefaultContentStorage implements ContentStorage {
-	private static final Logger log = SimLogger
-			.getLogger(DefaultContentStorage.class);
 
 	Map<UniqueID, Document> documents = new LinkedHashMap<UniqueID, Document>();
 
@@ -72,7 +67,6 @@ public class DefaultContentStorage implements ContentStorage {
 	public void storeDocument(Document doc) {
 		UniqueID key = doc.getKey();
 		documents.put(key, doc);
-		log.debug("store " + doc + " at " + this);
 	}
 
 	public Document loadDocument(UniqueID key) {

src/de/tud/kom/p2psim/impl/topology/DefaultTopology.java

@@ -24,8 +24,6 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.linklayer.mac.PhyType;
 import de.tud.kom.p2psim.api.topology.Topology;
 import de.tud.kom.p2psim.api.topology.TopologyComponent;
@@ -36,7 +34,6 @@ import de.tud.kom.p2psim.api.topology.views.TopologyView;
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
 import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector;
 import de.tud.kom.p2psim.impl.topology.views.visualization.world.SocialViewComponentVis;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 
 /**
  * Very basic Topology
@@ -45,8 +42,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  * @version 1.0, 29.02.2012
  */
 public class DefaultTopology implements Topology {
-	private final static Logger log = SimLogger
-			.getLogger(DefaultTopology.class);
 
 	private List<TopologyComponent> components;
 

src/de/tud/kom/p2psim/impl/topology/movement/AbstractWaypointMovementModel.java

@@ -27,8 +27,6 @@ import java.util.Random;
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import org.apache.log4j.Logger;
-
 import com.google.common.eventbus.Subscribe;
 
 import de.tud.kom.p2psim.api.topology.movement.MovementListener;
@@ -42,9 +40,10 @@ import de.tud.kom.p2psim.impl.topology.PositionVector;
 import de.tud.kom.p2psim.impl.topology.events.ScaleWorldEvent;
 import de.tud.kom.p2psim.impl.util.Either;
 import de.tud.kom.p2psim.impl.util.geo.maps.MapLoader;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Event;
 import de.tudarmstadt.maki.simonstrator.api.EventHandler;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.Time;
 
@@ -58,9 +57,6 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  */
 public abstract class AbstractWaypointMovementModel implements MovementModel {
 
-	private static Logger log = SimLogger
-			.getLogger(AbstractMovementModel.class);
-
 	private Set<MovementSupported> components = new LinkedHashSet<MovementSupported>();
 
 	protected PositionVector worldDimensions;
@@ -106,7 +102,10 @@ public abstract class AbstractWaypointMovementModel implements MovementModel {
 		}
 
 		if (this.waypointModel == null) {
-			log.info("No waypoint model has been configured. Thus the movement speed won't be adjusted for the scale of the waypoint model.");
+			Monitor.log(
+					AbstractWaypointMovementModel.class,
+					Level.INFO,
+					"No waypoint model has been configured. Thus the movement speed won't be adjusted for the scale of the waypoint model.");
 		}
 		//
 		// if (waypointModel.getScaleFactor() != 1.0) {
@@ -122,7 +121,10 @@ public abstract class AbstractWaypointMovementModel implements MovementModel {
 		double scaleFactor = event.getFactor();
 
 		speedLimit = unscaledSpeedLimit * scaleFactor;
-		log.info("Movement speed of the local movement strategy has been adjusted for the waypoint model scale and is now "
+		Monitor.log(
+				AbstractWaypointMovementModel.class,
+				Level.INFO,
+				"Movement speed of the local movement strategy has been adjusted for the waypoint model scale and is now "
 				+ speedLimit + "m/s");
 	}
 
@@ -150,7 +152,8 @@ public abstract class AbstractWaypointMovementModel implements MovementModel {
 			Long currentPause = pauseInProgressTimes.get(mcomp);
 			if (currentPause != null) {
 				if (Time.getCurrentTime() >= currentPause) {
-					log.debug("Pause time ended...");
+					Monitor.log(AbstractWaypointMovementModel.class,
+							Level.DEBUG, "Pause time ended...");
 					pauseInProgressTimes.remove(mcomp);
 				} else
 					continue;
@@ -161,7 +164,8 @@ public abstract class AbstractWaypointMovementModel implements MovementModel {
 			// If the movement model gave null as a destination no move is
 			// executed
 			if (dst == null) {
-				log.debug("No destination before reachedPosition check... continuing");
+				Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG,
+						"No destination before reachedPosition check... continuing");
 				continue;
 			}
 
@@ -202,11 +206,15 @@ public abstract class AbstractWaypointMovementModel implements MovementModel {
 	 */
 	private void pauseAndGetNextPosition(MovementSupported comp) {
 		Long pt = pauseTimes.get(comp) * Time.SECOND;
-		log.debug("Position reached... pause time is " + pt);
+		Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG,
+				"Position reached... pause time is " + pt);
 		if (pt != null) {
-			log.debug("Simulator time: " + Time.getCurrentTime());
-			log.debug("Pause time: " + pt);
-			log.debug("Added up: " + (Time.getCurrentTime() + pt));
+			Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG,
+					"Simulator time: " + Time.getCurrentTime());
+			Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG,
+					"Pause time: " + pt);
+			Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG,
+					"Added up: " + (Time.getCurrentTime() + pt));
 			pauseInProgressTimes.put(comp, Time.getCurrentTime() + pt);
 		}
 
@@ -240,14 +248,18 @@ public abstract class AbstractWaypointMovementModel implements MovementModel {
 	private PositionVector getDestination(MovementSupported comp) {
 		PositionVector dst = destinations.get(comp);
 
-		log.debug("Pos: " + comp.getRealPosition());
-		log.debug("Dst: " + dst);
+		Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG, "Pos: "
+				+ comp.getRealPosition());
+		Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG, "Dst: "
+				+ dst);
 
 		if (dst == null) {
-			log.debug("No destination, calling nextPosition()");
+			Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG,
+					"No destination, calling nextPosition()");
 			nextPosition(comp);
 			dst = destinations.get(comp);
-			log.debug("New destination is: " + dst);
+			Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG,
+					"New destination is: " + dst);
 		}
 
 		return dst;
@@ -294,7 +306,8 @@ public abstract class AbstractWaypointMovementModel implements MovementModel {
 	 */
 	@Override
 	public void addComponent(MovementSupported component) {
-		log.debug("AbstractMovementModel: Adding component to the movement model");
+		Monitor.log(AbstractWaypointMovementModel.class, Level.DEBUG,
+				"AbstractMovementModel: Adding component to the movement model");
 		components.add(component);
 	}
 

src/de/tud/kom/p2psim/impl/topology/movement/BonnMotionDataGenerator.java

@@ -32,17 +32,13 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.Vector;
 
-import org.apache.log4j.Logger;
-
-import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
+import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
 
 public class BonnMotionDataGenerator {
 
-	private static Logger log = SimLogger
-			.getLogger(BonnMotionDataGenerator.class);
-
 	private String dataLocation = "data" + File.separator + "mobility"
 			+ File.separator;
 
@@ -76,7 +72,8 @@ public class BonnMotionDataGenerator {
 		arguments.add(command);
 
 		if (checkForFiles(bonnMotionConfig)) {
-			log.warn(traceFile + " and " + configFile
+			Monitor.log(BonnMotionMovementModel.class, Level.WARN, traceFile
+					+ " and " + configFile
 					+ " already exist and need not to be created!");
 		} else {
 			arguments.add("-f" +  experimentName);
@@ -91,7 +88,8 @@ public class BonnMotionDataGenerator {
 			runBonnMotion();
 		}
 		
-		log.warn("Writing the location of the created files into the config of PFS.KOM");
+		Monitor.log(BonnMotionMovementModel.class, Level.WARN,
+				"Writing the location of the created files into the config of PFS.KOM");
 		Map<String, String> variables = Simulator.getConfigurator()
 				.getVariables();
 		variables.put("mobilityTraceFile" + postFix, traceFile.toString());
@@ -114,8 +112,10 @@ public class BonnMotionDataGenerator {
 	}
 
 	private void runBonnMotion() {
-		log.warn("Running the creation!!!");
-		log.warn(arguments.toString());
+		Monitor.log(BonnMotionMovementModel.class, Level.WARN,
+				"Running the creation!!!");
+		Monitor.log(BonnMotionMovementModel.class, Level.WARN,
+				arguments.toString());
 		ProcessBuilder pb = new ProcessBuilder(arguments);
 		try {
 			
@@ -149,7 +149,8 @@ public class BonnMotionDataGenerator {
 		traceFile = new File(dataLocation + experimentName + traceFileEnd);
 		configFile = new File(dataLocation + experimentName + configFileEnd);
 
-		log.warn("Instantiated " + traceFile + " and " + configFile);
+		Monitor.log(BonnMotionMovementModel.class, Level.WARN, "Instantiated "
+				+ traceFile + " and " + configFile);
 
 		return traceFile.exists() && configFile.exists();
 	}

src/de/tud/kom/p2psim/impl/topology/movement/BonnMotionMovementModel.java

@@ -32,23 +32,19 @@ import java.util.Set;
 import java.util.Vector;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.topology.movement.MovementSupported;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
 import de.tud.kom.p2psim.impl.topology.DefaultTopologyComponent;
 import de.tud.kom.p2psim.impl.topology.PositionVector;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Event;
 import de.tudarmstadt.maki.simonstrator.api.EventHandler;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
 
 public class BonnMotionMovementModel extends AbstractMovementModel implements
 		EventHandler {
 
-	private static Logger log = SimLogger
-			.getLogger(BonnMotionMovementModel.class);
-
 	private final int EVENT_ID = 1;
 
 	private Vector<String> mobilityTraceFiles;
@@ -164,7 +160,6 @@ public class BonnMotionMovementModel extends AbstractMovementModel implements
 		for (int a=0;a<mobilityTraceFiles.size();a++) {
 			PositionVector offset = offsets.get(a);
 			File mobilityTraceFileObject = new File(mobilityTraceFiles.get(a));
-			log.warn("Loading " + mobilityTraceFiles.get(a) + " to calculate the mobility of nodes.");
 			BufferedReader buf;
 			try {
 				buf = new BufferedReader(new InputStreamReader(
@@ -182,8 +177,6 @@ public class BonnMotionMovementModel extends AbstractMovementModel implements
 					line = buf.readLine();
 					tokens = line.split(" ");
 					assert tokens.length % 3 == 0;
-					log.debug("Scheduling the mobility events for host "
-							+ hostCounter);
 					previousPosition = new PositionVector(
 							Double.valueOf(tokens[1]) + offset.getX(),
 							Double.valueOf(tokens[2]) + offset.getY());
@@ -213,7 +206,12 @@ public class BonnMotionMovementModel extends AbstractMovementModel implements
 							timeSpan = nextTime - previousTime;
 							long deltaTime = movementInterval;
 
-							log.debug("Creating " + timeSpan / movementInterval
+							Monitor.log(
+									BonnMotionMovementModel.class,
+									Level.DEBUG,
+									"Creating "
+											+ timeSpan
+											/ movementInterval
 									+ " intermediate points between "
 									+ previousPosition + " and " + nextPosition
 									+ " at time "
@@ -229,7 +227,10 @@ public class BonnMotionMovementModel extends AbstractMovementModel implements
 										/ (double) timeSpan * direction.getY();
 								PositionVector interStep = new PositionVector(
 										x, y);
-								log.debug("Creating "
+								Monitor.log(
+										BonnMotionMovementModel.class,
+										Level.DEBUG,
+										"Creating "
 										+ interStep
 										+ " for time "
 										+ Simulator.getFormattedTime(deltaTime
@@ -266,7 +267,8 @@ public class BonnMotionMovementModel extends AbstractMovementModel implements
 					}
 					hostCounter++;
 				}
-				log.warn("Successfully parsed " + mobilityTraceFiles.get(a)
+				Monitor.log(BonnMotionMovementModel.class, Level.WARN,
+						"Successfully parsed " + mobilityTraceFiles.get(a)
 						+ " and created movement for " + (hostCounter - 1)
 						+ " hosts");
 				buf.close();

src/de/tud/kom/p2psim/impl/topology/movement/SLAWMovementModel.java

@@ -33,8 +33,6 @@ import java.util.WeakHashMap;
 
 import javax.swing.JComponent;
 
-import org.apache.log4j.Logger;
-
 import com.google.common.collect.Maps;
 
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
@@ -47,7 +45,6 @@ import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.Visualiza
 import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector.DisplayString;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.StrongWaypoint;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Waypoint;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
 
@@ -60,7 +57,6 @@ import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
  * @version 1.0, 09.04.2012
  */
 public class SLAWMovementModel extends AbstractWaypointMovementModel {
-	private static Logger log = SimLogger.getLogger(SLAWMovementModel.class);
 	
 	private static final int powerlaw_step = 1;
 	private static int levy_scale_factor = 1;
@@ -618,13 +614,9 @@ public class SLAWMovementModel extends AbstractWaypointMovementModel {
 		if (strongWaypoints == null)
 			throw new ConfigurationException("The configured waypoint model hasn't generated any strong waypoints that are required by the SLAWMovementModel.");
 		
-		log.info("Generating clusters over " + waypointModel.getWaypoints(StrongWaypoint.class).size() + " strong waypoints");
-		
 		clusters = generate_clusters(waypointModel);
 		if (clusters.length <= 2) {
 			throw new ConfigurationException("The SLAW movement model could only generate 1 cluster, please adjust the cluster range parameter");
-		} else {
-			log.info(clusters.length + " clusters have been generated");
 		}
 		
 		VisualizationInjector.injectComponent("Clusters", -1, new SLAWClusterOverlay(clusters, waypointModel), false);

src/de/tud/kom/p2psim/impl/topology/obstacles/AbstractObstacleModel.java

@@ -24,8 +24,6 @@ import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.vividsolutions.jts.geom.Coordinate;
@@ -45,7 +43,8 @@ import de.tud.kom.p2psim.impl.topology.PositionVector;
 import de.tud.kom.p2psim.impl.util.Tuple;
 import de.tud.kom.p2psim.impl.util.geo.maps.MapChangeListener;
 import de.tud.kom.p2psim.impl.util.geo.maps.MapLoader;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 /**
  * This abstract obstacle model helps to created new 
@@ -55,7 +54,7 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  * @version 1.0, 09.04.2012
  */
 public abstract class AbstractObstacleModel implements ObstacleModel {
-	private static Logger log = SimLogger.getLogger(AbstractObstacleModel.class);
+
 	private PositionVector worldDimensions;
 
 	private ArrayList<ObstacleModelListener> listeners = new ArrayList<ObstacleModelListener>();
@@ -101,12 +100,11 @@ public abstract class AbstractObstacleModel implements ObstacleModel {
 			}
 		});
 
-		log.info("The '" + map.getName() + "' " + map.getClass().getSimpleName() + " has dimensions of " + map.getDimensions().getX() + "x" + map.getDimensions().getY() + ".");
-		
 		PositionVector mapBorder = map.getDimensions().clone();
 		mapBorder.divide(getWorldDimensions());
 		if (mapBorder.getEntry(0) != 1 || mapBorder.getEntry(1) != 1) {
-			log.warn("You specified WORLD to be "
+			Monitor.log(AbstractObstacleModel.class, Level.WARN,
+					"You specified WORLD to be "
 					+ getWorldDimensions().toString()
 					+ " and used an Map with " + map.getDimensions()
 					+ ", resulting in wrong scaling.");

src/de/tud/kom/p2psim/impl/topology/placement/BonnMotionPositionDistribution.java

@@ -30,16 +30,11 @@ import java.util.Map;
 import java.util.Vector;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.impl.simengine.Simulator;
 import de.tud.kom.p2psim.impl.topology.PositionVector;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 
 public class BonnMotionPositionDistribution extends PositionDistribution {
 
-	private static Logger log = SimLogger
-			.getLogger(BonnMotionPositionDistribution.class);
 
 	private Vector<String> mobilityTraceFiles;
 	
@@ -102,7 +97,6 @@ public class BonnMotionPositionDistribution extends PositionDistribution {
 			File mobilityTraceFileObject = new File(mobilityTraceFiles.get(a));
 			PositionVector offset = offsets.get(a);
 			try {
-				log.warn("Loading " + mobilityTraceFiles.get(a) + " to calculate the placement.");
 
 				BufferedReader buf = new BufferedReader(new InputStreamReader(
 						new GZIPInputStream(new FileInputStream(
@@ -118,9 +112,6 @@ public class BonnMotionPositionDistribution extends PositionDistribution {
 							.parseDouble(tokens[2]) + offset.getY()));
 				}
 				buf.close();
-
-				log.warn("Successfully parsed " + mobilityTraceFiles.get(a) + " and collected "
-						+ availablePositions.size() + " positions with an offset of " + offset);
 			} catch (Exception e) {
 				e.printStackTrace();
 			}

src/de/tud/kom/p2psim/impl/topology/social/DefaultSocialView.java

@@ -31,8 +31,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
 import de.tud.kom.p2psim.api.topology.TopologyComponent;
@@ -47,7 +45,6 @@ import de.tud.kom.p2psim.impl.topology.social.graph.SimpleGraphExtender;
 import de.tud.kom.p2psim.impl.topology.social.graph.SocialEdge;
 import de.tud.kom.p2psim.impl.topology.social.graph.SocialNode;
 import de.tud.kom.p2psim.impl.topology.social.graph.jung.VoltageClusterer;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
 import edu.uci.ics.jung.graph.DirectedGraph;
 
@@ -83,8 +80,6 @@ import edu.uci.ics.jung.graph.DirectedGraph;
  * @version 1.0, 07.06.2013
  */
 public class DefaultSocialView implements SocialView {
-	private final static Logger log = SimLogger
-			.getLogger(DefaultSocialView.class);
 
 	// for default a default id!
 	private static int idCounter = 0;
@@ -271,7 +266,7 @@ public class DefaultSocialView implements SocialView {
 		try {
 			writer.write(this.graph, this.outputFile);
 		} catch (IOException e) {
-			log.error("Could not write the GraphML File!", e);
+			throw new RuntimeException(e);
 		}
 	}
 

src/de/tud/kom/p2psim/impl/topology/social/graph/GraphMLReader.java

@@ -25,12 +25,12 @@ import java.io.IOException;
 import java.util.Random;
 
 import org.apache.commons.collections15.Transformer;
-import org.apache.log4j.Logger;
 
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
 import de.tud.kom.p2psim.api.topology.social.SocialView;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
 import edu.uci.ics.jung.graph.DirectedGraph;
@@ -61,7 +61,6 @@ import edu.uci.ics.jung.io.graphml.NodeMetadata;
  * @version 1.0, 08.06.2013
  */
 public class GraphMLReader implements IGraphLoader {
-	private final static Logger log = SimLogger.getLogger(GraphMLReader.class);
 
 	private String filePath;
 
@@ -144,9 +143,10 @@ public class GraphMLReader implements IGraphLoader {
 
 		}
 		if (graph.getVertexCount() > numberOfNodes) {
-			log.info("Delete Vertexes from the Graph, because the number of vertexes is bigger then the requested graph!");
-			System.err
-					.println("Delete Vertexes from the Graph, because the number of vertexes is bigger then the requested graph!");
+			Monitor.log(
+					GraphMLReader.class,
+					Level.INFO,
+					"Delete Vertexes from the Graph, because the number of vertexes is bigger then the requested graph!");
 		} else if (graph.getVertexCount() < numberOfNodes) {
 			throw new ConfigurationException(
 					"The given graph has to few vertexes!");

src/de/tud/kom/p2psim/impl/topology/views/AbstractTopologyView.java

@@ -26,8 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.Position;
 import de.tud.kom.p2psim.api.linklayer.LinkLayer;
 import de.tud.kom.p2psim.api.linklayer.mac.MacAddress;
@@ -41,7 +39,8 @@ import de.tud.kom.p2psim.api.topology.views.DropRateDeterminator;
 import de.tud.kom.p2psim.api.topology.views.LatencyDeterminator;
 import de.tud.kom.p2psim.api.topology.views.TopologyView;
 import de.tud.kom.p2psim.impl.topology.PositionVector;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 /**
  * To ease implementation of new {@link TopologyView}s, this class provides
@@ -55,8 +54,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 public abstract class AbstractTopologyView<L extends DefaultLink> implements
 		TopologyView {
 
-	private static Logger log = SimLogger.getLogger(AbstractTopologyView.class);
-
 	private PhyType phy;
 
 	/**
@@ -138,7 +135,6 @@ public abstract class AbstractTopologyView<L extends DefaultLink> implements
 		phy = phy.toUpperCase();
 		try {
 			this.phy = PhyType.valueOf(phy);
-			log.warn("Set Phy to " + this.phy.toString());
 		} catch (IllegalArgumentException e) {
 			throw new ConfigurationException("The PHY " + phy
 					+ " is unknown. Please select one of "
@@ -249,7 +245,8 @@ public abstract class AbstractTopologyView<L extends DefaultLink> implements
 		
 		if( ll == null ) {
 			/* No linklayer specified in config. */
-			log.warn("No LinkLayer specified. Cannot add Topology,");
+			Monitor.log(AbstractTopologyView.class, Level.WARN,
+					"No LinkLayer specified. Cannot add Topology.");
 			return;
 		}
 		

src/de/tud/kom/p2psim/impl/topology/views/wifi/phy/InterferenceHelper.java

@@ -28,8 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.Position;
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.api.linklayer.mac.MacAddress;
@@ -42,10 +40,11 @@ import de.tud.kom.p2psim.impl.linklayer.mac.wifi.Ieee80211AdHocMac;
 import de.tud.kom.p2psim.impl.topology.views.wifi.WifiTopologyView;
 import de.tud.kom.p2psim.impl.topology.views.wifi.phy.errormodel.NistErrorRateModel;
 import de.tud.kom.p2psim.impl.topology.views.wifi.phy.propagation.loss.LogDistancePropagationLossModel;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Event;
 import de.tudarmstadt.maki.simonstrator.api.EventHandler;
 import de.tudarmstadt.maki.simonstrator.api.Message;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.Time;
 
 /**
@@ -84,7 +83,6 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  * @version 1.0, 01.03.2013
  */
 public class InterferenceHelper implements EventHandler {
-	private static Logger log = SimLogger.getLogger(InterferenceHelper.class);
 
 	// thermal noise at 290K in J/s = W
 	private static double BOLTZMANN = 1.3803e-23;
@@ -359,7 +357,10 @@ public class InterferenceHelper implements EventHandler {
 	public double calculatePer(Message id, Position rxPos) {
 		Interference transfer = transfers.get(id);
 		if (transfer == null) {
-			log.warn("No Transfer found, with the given Message ID. This should be not happen. Return 1 for PER.");
+			Monitor.log(
+					InterferenceHelper.class,
+					Level.WARN,
+					"No Transfer found with the given Message ID. This should not happen. Returning '1' for PER.");
 			return 1;
 		}
 		double rxPowerW = transfer.getRxPowerW(rxPos);

src/de/tud/kom/p2psim/impl/topology/views/wifi/phy/errormodel/NistErrorRateModel.java

@@ -22,11 +22,11 @@ package de.tud.kom.p2psim.impl.topology.views.wifi.phy.errormodel;
 
 import org.apache.commons.math.MathException;
 import org.apache.commons.math.special.Erf;
-import org.apache.log4j.Logger;
 
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiMode;
 import de.tud.kom.p2psim.impl.util.NotSupportedException;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 /**
  * This class is the NIST Error Rate Model from the NS3. This are only formulas
@@ -39,8 +39,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  */
 public class NistErrorRateModel extends AbstractErrorRateModel {
 
-	private static Logger log = SimLogger.getLogger(NistErrorRateModel.class);
-
 	private DsssErrorRateModel dsssErroRateModel = new DsssErrorRateModel();
 
 	@Override
@@ -135,9 +133,8 @@ public class NistErrorRateModel extends AbstractErrorRateModel {
 		try {
 			return Erf.erfc(z);
 		} catch (MathException e) {
-			log.error(
-					"Could not compute the complimentary error function! Return 0",
-					e);
+			Monitor.log(NistErrorRateModel.class, Level.ERROR,
+					"Unable to compute the complimentary error function! Returning '0'...");
 		}
 		return 0;
 	}

src/de/tud/kom/p2psim/impl/topology/views/wifi/phy/errormodel/YansErrorRateModel.java

@@ -24,11 +24,11 @@ import java.util.HashMap;
 
 import org.apache.commons.math.MathException;
 import org.apache.commons.math.special.Erf;
-import org.apache.log4j.Logger;
 
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiMode;
 import de.tud.kom.p2psim.impl.util.NotSupportedException;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 /**
  * This class is the YANS Error Rate Model from the NS3. This are only formulas
@@ -41,8 +41,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  */
 public class YansErrorRateModel extends AbstractErrorRateModel {
 
-	private static Logger log = SimLogger.getLogger(YansErrorRateModel.class);
-
 	private DsssErrorRateModel dsssErroRateModel = new DsssErrorRateModel();
 
 	private static HashMap<Integer, Long> factorialCache = new HashMap<Integer, Long>();
@@ -205,9 +203,8 @@ public class YansErrorRateModel extends AbstractErrorRateModel {
 		try {
 			return Erf.erfc(z);
 		} catch (MathException e) {
-			log.error(
-					"Could not compute the complimentary error function! Return 0",
-					e);
+			Monitor.log(YansErrorRateModel.class, Level.ERROR,
+					"Unable to compute the complimentary error function! Returning '0'...");
 		}
 		return 0;
 	}

src/de/tud/kom/p2psim/impl/topology/waypoints/AbstractWaypointModel.java

@@ -25,7 +25,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.jgrapht.alg.DijkstraShortestPath;
 
 import com.google.common.collect.Sets;
@@ -45,10 +44,11 @@ import de.tud.kom.p2psim.impl.topology.waypoints.graph.Waypoint;
 import de.tud.kom.p2psim.impl.util.Tuple;
 import de.tud.kom.p2psim.impl.util.geo.maps.MapChangeListener;
 import de.tud.kom.p2psim.impl.util.geo.maps.MapLoader;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tud.kom.p2psim.impl.util.structures.KdTree;
 import de.tud.kom.p2psim.impl.util.structures.KdTree.Entry;
 import de.tud.kom.p2psim.impl.util.structures.WaypointKdTree;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 /**
  * The abstract way point model manages a graph for the map data and holds
@@ -58,7 +58,7 @@ import de.tud.kom.p2psim.impl.util.structures.WaypointKdTree;
  * @version 1.0, 09.04.2012
  */
 public abstract class AbstractWaypointModel implements WaypointModel {
-	private static Logger log = SimLogger.getLogger(AbstractWaypointModel.class);
+
 	private PositionVector worldDimensions;
 
 	private Map map;
@@ -110,15 +110,22 @@ public abstract class AbstractWaypointModel implements WaypointModel {
 			}
 		});
 
-		log.info("The '" + map.getName() + "' " + map.getClass().getSimpleName() + " has dimensions of " + map.getDimensions().getX() + "x" + map.getDimensions().getY() + ".");
-		
+		Monitor.log(AbstractWaypointModel.class, Level.INFO,
+				"The '" + map.getName() + "' " + map.getClass().getSimpleName()
+						+ " has dimensions of " + map.getDimensions().getX()
+						+ "x" + map.getDimensions().getY() + ".");
+
 		PositionVector mapBorder = map.getDimensions().clone();
 		mapBorder.divide(getWorldDimensions());
 		if (mapBorder.getEntry(0) != 1 || mapBorder.getEntry(1) != 1) {
-			log.warn("You specified WORLD to be "
-					+ getWorldDimensions().toString()
-					+ " and used an OSM Map with " + map.getDimensions()
-					+ ", resulting in wrong scaling.");
+			Monitor.log(
+					AbstractWaypointModel.class,
+					Level.WARN,
+					"You specified WORLD to be "
+							+ getWorldDimensions().toString()
+							+ " and used an OSM Map with "
+							+ map.getDimensions()
+							+ ", resulting in wrong scaling.");
 		}
 		
 		init();

src/de/tud/kom/p2psim/impl/topology/waypoints/SLAWWaypointModel.java

@@ -24,10 +24,9 @@ import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Random;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.StrongWaypoint;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 
 /**
@@ -39,7 +38,6 @@ import de.tudarmstadt.maki.simonstrator.api.Randoms;
  * @version 1.0, 09.04.2012
  */
 public class SLAWWaypointModel extends AbstractWaypointModel {
-	protected static final Logger log = SimLogger.getLogger(SLAWWaypointModel.class);
 	
 	protected int noOfWaypoints = 1000;
     protected int cluster_ratio = 5;
@@ -89,11 +87,10 @@ public class SLAWWaypointModel extends AbstractWaypointModel {
         Xoffset.put("0,0", 0.0);
         Yoffset.put("0,0", 0.0);
         double Xwind, Ywind;
-
-        log.info("Generating waypoints");
         
         for (int level = 0; level < levels; level++) {
-        	log.info("Level " + (level + 1) + " of " + levels + " started.");
+			Monitor.log(SLAWWaypointModel.class, Level.INFO, "Level "
+					+ (level + 1) + " of " + levels + " started.");
             // Number of squares at current level
             double n_squares = Math.pow(4, level);
             Xwind = getWorldDimensions().getX() / Math.pow(2, level);
@@ -101,7 +98,8 @@ public class SLAWWaypointModel extends AbstractWaypointModel {
 
             for (int square = 0; square < n_squares; square++) {
                 if (square % 2000 == 0 && square != 0) {
-                    log.info(square + " of " + n_squares + " squares processed.");
+					Monitor.log(SLAWWaypointModel.class, Level.INFO, square
+							+ " of " + n_squares + " squares processed.");
                 }
                 // generate the offsets of x and y for children squares
                 double val;

src/de/tud/kom/p2psim/impl/topology/waypoints/strong/OSMHotspotStrategy.java

@@ -40,7 +40,6 @@ import javax.swing.JComponent;
 
 import org.apache.commons.math.random.JDKRandomGenerator;
 import org.apache.commons.math.random.RandomGenerator;
-import org.apache.log4j.Logger;
 
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Geometry;
@@ -62,10 +61,10 @@ import de.tud.kom.p2psim.impl.util.Tuple;
 import de.tud.kom.p2psim.impl.util.geo.maps.osm.OSMMap;
 import de.tud.kom.p2psim.impl.util.geo.maps.osm.OSMNode;
 import de.tud.kom.p2psim.impl.util.geo.maps.osm.OSMObstacle;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 public class OSMHotspotStrategy extends StrongWaypointStrategy {
-	private static Logger log = SimLogger.getLogger(OSMHotspotStrategy.class);
 
 	protected ArrayList<HotspotDeplacmentInfo> hotspotMoveLerpPositions = new ArrayList<HotspotDeplacmentInfo>();
 
@@ -98,8 +97,6 @@ public class OSMHotspotStrategy extends StrongWaypointStrategy {
 		rnd.setSeed(Simulator.getSeed());
 
 		validAmenities = readAmenitiesFromFile();
-
-		log.debug("Valid amenities loaded: " + validAmenities);
 	}
 
 	/**
@@ -512,7 +509,8 @@ public class OSMHotspotStrategy extends StrongWaypointStrategy {
 			}
 		}
 
-		log.info("Added " + wpCount + " strong waypoints.");
+		Monitor.log(OSMHotspotStrategy.class, Level.INFO, "Added " + wpCount
+				+ " strong waypoints.");
 	}
 
 	/**

src/de/tud/kom/p2psim/impl/util/CSVWriter.java

@@ -21,21 +21,14 @@
 package de.tud.kom.p2psim.impl.util;
 
 import java.io.BufferedWriter;
-import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
-import org.apache.log4j.Logger;
-
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
-
 // TODO: Auto-generated Javadoc
 /**
  * The Class CSVWriter.
  */
 public class CSVWriter {
-
-	final static Logger log = SimLogger.getLogger(CSVWriter.class);
 	
 	/** The delimiter. */
 	final private String delimiter;
@@ -57,8 +50,6 @@ public class CSVWriter {
 		
 		this.delimiter = delimiter;
 
-		log.info("Opened " + (new File(filename)).getAbsolutePath() + " for CSV output.");
-
 	}
 
 	/**
@@ -85,7 +76,7 @@ public class CSVWriter {
 			outStream.write(line + "\r\n");
 			outStream.flush();
 		} catch (IOException e) {
-			log.warn("CSV write failed.");
+			throw new AssertionError(e);
 		}
 
 	}

src/de/tud/kom/p2psim/impl/util/db/dao/CommitThread.java

@@ -25,18 +25,15 @@ import java.util.List;
 
 import javax.persistence.EntityManager;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.impl.util.db.metric.CustomMeasurement;
 import de.tud.kom.p2psim.impl.util.db.metric.HostMetric;
 import de.tud.kom.p2psim.impl.util.db.metric.HostMetricBound;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 /** Thread to commit the persistence queue without blocking the simulation. */
 public class CommitThread implements Runnable {
 
-	private final static Logger log = SimLogger.getLogger(CommitThread.class);
-
 	private static int numThreads = 0;
 	private static int numSessions = 0;
 
@@ -50,7 +47,9 @@ public class CommitThread implements Runnable {
 	public void run() {
 		Date start = new Date();
 		int threads = incNumThreads();
-		log.info("started (concurrent commit threads: "+threads+")");
+		Monitor.log(CommitThread.class, Level.INFO,
+				"started new commit thread (concurrent commit threads: "
+						+ threads + ")");
 
 		while (true) {
 			if (commitQueue())
@@ -65,7 +64,8 @@ public class CommitThread implements Runnable {
 		}
 
 		long duration = new Date().getTime() - start.getTime();
-		log.info("finished commiting "+persistQueue.size()+" objects in "+duration+" ms");
+		Monitor.log(CommitThread.class, Level.INFO, "finished commiting "
+				+ persistQueue.size() + " objects in " + duration + " ms");
 		decNumThreads();
 		DAO.addToCommitTime(duration);