Removed SimLogger-dependency

src/de/tud/kom/p2psim/impl/network/gnp/GnpSubnet.java

@@ -27,8 +27,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.analyzer.MessageAnalyzer.Reason;
 import de.tud.kom.p2psim.api.analyzer.NetlayerAnalyzer;
 import de.tud.kom.p2psim.api.network.NetLayer;
@@ -41,10 +39,10 @@ import de.tud.kom.p2psim.impl.network.gnp.AbstractGnpNetBandwidthManager.Bandwid
 import de.tud.kom.p2psim.impl.transport.AbstractTransMessage;
 import de.tud.kom.p2psim.impl.transport.TCPMessage;
 import de.tud.kom.p2psim.impl.transport.UDPMessage;
-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;
 import de.tudarmstadt.maki.simonstrator.api.component.core.MonitorComponent.AnalyzerNotAvailableException;
@@ -58,8 +56,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
  */
 public class GnpSubnet extends AbstractSubnet implements EventHandler {
 
-	private static Logger log = SimLogger.getLogger(GnpSubnet.class);
-
 	private static final Byte REALLOCATE_BANDWIDTH_PERIODICAL_EVENT = 0;
 
 	private static final Byte REALLOCATE_BANDWIDTH_EVENTBASED_EVENT = 1;
@@ -153,10 +149,11 @@ public class GnpSubnet extends AbstractSubnet implements EventHandler {
 
 			double packetLossProb = this.netLatencyModel
 					.getUDPerrorProbability(sender, receiver, (IPv4Message) msg);
-			if (msg.getSender().equals(msg.getReceiver())) {
-				log.fatal("Sender and receiver are the same ("
-						+ msg.getSender() + ") and have a loss prob of "
-						+ packetLossProb + " for msg "
+			if (msg.getSender().equals(msg.getReceiver())) {
+				Monitor.log(GnpSubnet.class, Level.ERROR,
+						"Sender and receiver are the same ("
+						+ msg.getSender() + ") and have a loss prob of "
+						+ packetLossProb + " for msg "
 						+ msg.getPayload().getPayload());
 			}
 			if (rnd.nextDouble() < packetLossProb) {
@@ -165,8 +162,6 @@ public class GnpSubnet extends AbstractSubnet implements EventHandler {
 				// sender as the receiver does not know, that it would have
 				// almost received a message
 				int assignedMsgId = determineTransMsgNumber(msg);
-				log.debug("During Drop: Assigning MsgId " + assignedMsgId
-						+ " to dropped message");
 				((AbstractTransMessage) msg.getPayload())
 						.setCommId(assignedMsgId);
 				try {
@@ -175,8 +170,6 @@ public class GnpSubnet extends AbstractSubnet implements EventHandler {
 				} catch (AnalyzerNotAvailableException e) {
 					//
 				}
-				log.debug("Packet loss occured while transfer \"" + msg
-						+ "\" (packetLossProb: " + packetLossProb + ")");
 				return;
 			}
 		}

src/de/tud/kom/p2psim/impl/network/gnp/topology/CountryLookup.java

@@ -33,14 +33,11 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 import org.dom4j.tree.DefaultElement;
-
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 
 /**
  * This class manages the mapping of the 2-digits country code to country and
@@ -54,8 +51,6 @@ public class CountryLookup implements Serializable {
 
 	private static final long serialVersionUID = -3994762133062677848L;
 
-	private static Logger log = SimLogger.getLogger(CountryLookup.class);
-
 	private HashMap<String, String[]> countryLookup = new HashMap<String, String[]>();
 
 	private HashMap<String, String> pingErCountryRegions = new HashMap<String, String>();
@@ -159,8 +154,6 @@ public class CountryLookup implements Serializable {
 	 */
 	public void importPingErCountryRegionFile(File file) {
 		try {
-			log.debug("Importing PingER-Country-Region-File: "
-					+ file.getAbsolutePath());
 			FileReader inputFilePingER = new FileReader(file);
 			BufferedReader inputPingER = new BufferedReader(inputFilePingER);
 			HashMap<String, String> countryToRegion = new HashMap<String, String>();

src/de/tud/kom/p2psim/impl/network/gnp/topology/GnpSpace.java

@@ -28,9 +28,6 @@ import java.util.HashSet;
 import java.util.LinkedList;
 
 import org.apache.commons.math.stat.StatUtils;
-import org.apache.log4j.Logger;
-
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 
 /**
  * Implements the downhill simplx algorithm for positioning host in an
@@ -43,8 +40,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  */
 public class GnpSpace implements Comparable<GnpSpace> {
 
-	private static Logger log = SimLogger.getLogger(GnpSpace.class);
-
 	private static final long serialVersionUID = 6941552219570807190L;
 
 	private HostMap mapRef;
@@ -432,9 +427,6 @@ public class GnpSpace implements Comparable<GnpSpace> {
 						monitorResheduling);
 				coordinateIndex.put(host.getIpAddress(), coord);
 				c++;
-				if (c % 1000 == 0)
-					log.debug(c + " of " + peers.size()
-							+ " are positioned in gnp");
 			}
 			if (!calculationInProgress)
 				return;

src/de/tud/kom/p2psim/impl/network/gnp/topology/HostMap.java

@@ -39,7 +39,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
@@ -55,7 +54,8 @@ import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.Continent;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.Country;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.PingErRegion;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.Region;
-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 holds all informations needed to built an xml-Host File for the
@@ -67,8 +67,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  */
 public class HostMap {
 
-	private static Logger log = SimLogger.getLogger(HostMap.class);
-
 	private static final String GROUP_WORLD = "World";
 
 	private static final String COUNTRY_UNLOCATABLE = "#UNLOCATABLE_COUNTRY";
@@ -107,7 +105,6 @@ public class HostMap {
 	 */
 	public void importSkitterFile(File skitterFile, boolean oldFormat) {
 		try {
-			log.info("Importing skitter file: " + skitterFile.getAbsolutePath());
 
 			skitterFiles.put(skitterFile.getAbsolutePath(), new HashSet<Host>());
 			FileReader inputFile = new FileReader(skitterFile);
@@ -130,7 +127,10 @@ public class HostMap {
 					
 				} else {
 					//sometimes weird long lines occur when the file is corrupted:
-					log.error("The weird long line with length " + line.length() + "' could not be parsed in skitter file " + skitterFile);
+					Monitor.log(HostMap.class, Level.ERROR,
+							"The weird long line with length " + line.length()
+									+ "' could not be parsed in skitter file "
+									+ skitterFile);
 				}
 				line = input.readLine();
 			}
@@ -183,7 +183,10 @@ public class HostMap {
 				currentPeer.addRtt(currentMonitor, rtt);
 				skitterFiles.get(skitterFile.getAbsolutePath()).add(currentPeer);
 				return true;
-			} else log.error("The line '" + line + "' did not contain enough elements. in skitter file " + skitterFile);
+			} else
+				Monitor.log(HostMap.class, Level.ERROR, "The line '" + line
+						+ "' did not contain enough elements. in skitter file "
+						+ skitterFile);
 		}
 		return false;
 	}
@@ -230,7 +233,10 @@ public class HostMap {
 				skitterFiles.get(skitterFile.getAbsolutePath()).add(currentPeer);
 				//System.out.println("Successfully loaded value.");
 				return true;
-			} else log.error("The line '" + line + "' did not contain enough elements. in skitter file " + skitterFile);
+			} else
+				Monitor.log(HostMap.class, Level.ERROR, "The line '" + line
+						+ "' did not contain enough elements. in skitter file "
+						+ skitterFile);
 		}
 		return false;
 	}
@@ -241,7 +247,6 @@ public class HostMap {
 	 * @param file
 	 */
 	public void importPingErMinimumRtt(File file) {
-		log.debug("Importing MinimumRtt PingER-Summary-Report-File: " + file.getAbsolutePath());
 		pingErLookup.loadFromTSV(file, PingErLookup.DataType.MIN_RTT);
 	}
 
@@ -251,7 +256,6 @@ public class HostMap {
 	 * @param file
 	 */
 	public void importPingErAverageRtt(File file) {
-		log.debug("Importing AverageRtt PingER-Summary-Report-File: " + file.getAbsolutePath());
 		pingErLookup.loadFromTSV(file, PingErLookup.DataType.AVERAGE_RTT);
 	}
 
@@ -261,7 +265,6 @@ public class HostMap {
 	 * @param file
 	 */
 	public void importPingErDelayVariation(File file) {
-		log.debug("Importing DelayVariation PingER-Summary-Report-File: " + file.getAbsolutePath());
 		pingErLookup.loadFromTSV(file, PingErLookup.DataType.VARIATION_RTT);
 	}
 
@@ -271,7 +274,6 @@ public class HostMap {
 	 * @param file
 	 */
 	public void importPingErPacketLoss(File file) {
-		log.debug("Importing PacketLoss PingER-Summary-Report-File: " + file.getAbsolutePath());
 		pingErLookup.loadFromTSV(file, PingErLookup.DataType.PACKET_LOSS);
 	}
 
@@ -509,7 +511,6 @@ public class HostMap {
 	 * generate groups with the name of GeoIP country names
 	 */
 	public void builtCountryGroups() {
-		log.debug("Built Country Groups");
 		for (Host host : hostIndex.values()) {
 			String country = countryLookup.getGeoIpCountryName(host.getCountryCode());
 			if (country == null)
@@ -534,7 +535,6 @@ public class HostMap {
 	 * generate groups with the name of PingER region names
 	 */
 	public void builtPingerGroups() {
-		log.debug("Built PingEr Groups");
 		for (Host host : hostIndex.values()) {
 			String country = countryLookup.getPingErRegionName(host.getCountryCode());
 			if (country == null)
@@ -547,7 +547,6 @@ public class HostMap {
 	 * built a group with all hosts
 	 */
 	public void builtWorldGroups() {
-		log.debug("Built World Group");
 		this.addHostToGroup(GROUP_WORLD, hostIndex.values());
 	}
 
@@ -924,7 +923,6 @@ public class HostMap {
 	 * @param file
 	 */
 	public void exportToXml(File file) {
-		log.debug("Export Hosts to an XML File");
 		try {
 			OutputFormat format = OutputFormat.createPrettyPrint();
 			OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
@@ -944,10 +942,8 @@ public class HostMap {
 		Set<Host> hosts = new HashSet<Host>();
 
 		// "GroupLookup" Element
-		log.debug("Generate XML-Element \"GroupLookup\"");
 		DefaultElement groups = new DefaultElement("GroupLookup");
 		for (String group : this.groups.keySet()) {
-			log.debug("  - Export Group: " + group);
 			hosts.addAll(this.groups.get(group));
 			DefaultElement peerXml = new DefaultElement("Group");
 			peerXml.addAttribute("id", group);
@@ -977,7 +973,6 @@ public class HostMap {
 		}
 
 		// "Hosts" Element
-		log.debug("Generate XML-Element \"Hosts\"");
 		DefaultElement peers = new DefaultElement("Hosts");
 		for (Host host : hosts) {
 			DefaultElement peer = new DefaultElement("Host");
@@ -1006,11 +1001,9 @@ public class HostMap {
 		}
 
 		// "PingErLookup" Elements
-		log.debug("Generate XML-Element \"PingErLookup\"");
 		Element pingEr = pingErLookup.exportToXML();
 
 		// "CountryLookup" Element
-		log.debug("Generate XML-Element \"CountryLookup\"");
 		Element country = countryLookup.exportToXML();
 
 		DefaultDocument document = new DefaultDocument(new DefaultElement("gnp"));

src/de/tud/kom/p2psim/impl/network/gnp/topology/PingErLookup.java

@@ -32,7 +32,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.dom4j.Element;
 import org.dom4j.tree.DefaultElement;
 
@@ -43,7 +42,8 @@ import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.GlobalSummaryR
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.PingErRegion;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.RegionRegionSummaryRelation;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.SummaryRelation;
-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 Implements a container for the PingER summary reports used as a
@@ -55,8 +55,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  */
 public class PingErLookup {
 
-	private static Logger log = SimLogger.getLogger(PingErLookup.class);
-
 	private HashMap<String, String> files = new HashMap<String, String>();
 
 	public enum DataType {
@@ -227,8 +225,6 @@ public class PingErLookup {
 		if (contains(regionReceiver, regionSender))
 			return getLinkProperty(regionReceiver, regionSender);
 
-		log.debug("Using World-Average Link Propertiess for " + ccFrom + "->"
-				+ ccTo);
 		return getAverageLinkProperty();
 	}
 
@@ -446,8 +442,8 @@ public class PingErLookup {
 				JitterParameter optimized = getJitterParameterDownhillSimplex(
 						averageRtt - minRtt, delayVariation);
 				jitterDistribution = new LognormalDist(optimized.m, optimized.s);
-				log
-						.debug("Set lognormal Jitter-Distribution with Average Jitter of "
+				Monitor.log(PingErLookup.class, Level.DEBUG,
+						"Set lognormal Jitter-Distribution with Average Jitter of "
 								+ optimized.getAverageJitter()
 								+ " ("
 								+ (averageRtt - minRtt)
@@ -686,31 +682,75 @@ public class PingErLookup {
 				boolean anyRelationAdded = false;
 				if (ctFrom != null && ctTo != null) {
 					SummaryRelation rel = db.getSummaryRelFrom(ctFrom, ctTo);
-					if (rel != null) log.debug("Conflict. Found " + rel + " at country " + ctFrom + " and country " + ctTo + " where a new entry should be placed.");
+					if (rel != null)
+						Monitor.log(
+								PingErLookup.class,
+								Level.DEBUG,
+								"Conflict. Found "
+										+ rel
+										+ " at country "
+										+ ctFrom
+										+ " and country "
+										+ ctTo
+										+ " where a new entry should be placed.");
 					db.new CountryCountrySummaryRelation(ctFrom, ctTo, minRtt, avgRtt, delVar, pLoss);
 					anyRelationAdded = true;
 				}
 				if (ctFrom != null && regTo != null) {
 					SummaryRelation rel = db.getSummaryRelFrom(ctFrom, regTo);
-					if (rel != null) log.debug("Conflict. Found " + rel + " at country " + ctFrom + " and region " + regTo + " where a new entry should be placed.");
+					if (rel != null)
+						Monitor.log(
+								PingErLookup.class,
+								Level.DEBUG,
+								"Conflict. Found "
+										+ rel
+										+ " at country "
+										+ ctFrom
+										+ " and region "
+										+ regTo
+										+ " where a new entry should be placed.");
 					db.new CountryRegionSummaryRelation(ctFrom, regTo, minRtt, avgRtt, delVar, pLoss);
 					anyRelationAdded = true;
 				}
 				if (regFrom != null && ctTo != null) {
 					SummaryRelation rel = db.getSummaryRelFrom(regFrom, ctTo);
-					if (rel != null) log.debug("Conflict. Found " + rel + " at region " + regFrom + " and country " + ctTo + " where a new entry should be placed.");
+					if (rel != null)
+						Monitor.log(
+								PingErLookup.class,
+								Level.DEBUG,
+								"Conflict. Found "
+										+ rel
+										+ " at region "
+										+ regFrom
+										+ " and country "
+										+ ctTo
+										+ " where a new entry should be placed.");
 					db.new RegionCountrySummaryRelation(regFrom, ctTo, minRtt, avgRtt, delVar, pLoss);
 					anyRelationAdded = true;
 				}
 				if (regFrom != null && regTo != null) {
 					SummaryRelation rel = db.getSummaryRelFrom(regFrom, regTo);
-					if (rel != null) log.debug("Conflict. Found " + rel + " at region " + regFrom + " and region " + regTo + " where a new entry should be placed.");
+					if (rel != null)
+						Monitor.log(
+								PingErLookup.class,
+								Level.DEBUG,
+								"Conflict. Found "
+										+ rel
+										+ " at region "
+										+ regFrom
+										+ " and region "
+										+ regTo
+										+ " where a new entry should be placed.");
 					db.new RegionRegionSummaryRelation(regFrom, regTo, minRtt, avgRtt, delVar, pLoss);
 					anyRelationAdded = true;
 				}
 				//assert anyRelationAdded : getWarning(relationsCounter, from, ctFrom, regFrom, to, ctTo, regTo);
 				if (!anyRelationAdded) {
-					log.warn(getWarning(succRelationsCounter, from, ctFrom, regFrom, to, ctTo, regTo));
+					Monitor.log(
+							PingErLookup.class,
+							Level.WARN,
+							getWarning(succRelationsCounter, from, ctFrom,
+									regFrom, to, ctTo, regTo));
 					failRelationsCounter ++;	
 				} else {
 					succRelationsCounter++;
@@ -720,7 +760,10 @@ public class PingErLookup {
 		
 		createGlobalSumRel(db);
 		
-		log.info("Successfully put " + succRelationsCounter + " entries into the database. Failed relations: " + failRelationsCounter);
+		Monitor.log(PingErLookup.class, Level.INFO, "Successfully put "
+				+ succRelationsCounter
+				+ " entries into the database. Failed relations: "
+				+ failRelationsCounter);
 	}
 
 	private void createGlobalSumRel(NetMeasurementDB db) {
@@ -744,7 +787,13 @@ public class PingErLookup {
 		
 		GlobalSummaryRelation sumRel = db.new GlobalSummaryRelation(minRttAcc/sz, avgRttAcc/sz, dVarAcc/sz, pLossAcc/sz);
 		
-		log.info("Created a global summary relation with minRtt=" + sumRel.getMinRtt() + ", avgRtt=" + sumRel.getAvgRtt() + ", dVar=" + sumRel.getdVar() + ", pLoss=" + sumRel.getpLoss());
+		Monitor.log(
+				PingErLookup.class,
+				Level.INFO,
+				"Created a global summary relation with minRtt="
+						+ sumRel.getMinRtt() + ", avgRtt=" + sumRel.getAvgRtt()
+						+ ", dVar=" + sumRel.getdVar() + ", pLoss="
+						+ sumRel.getpLoss());
 		
 	}
 

src/de/tud/kom/p2psim/impl/network/modular/DBHostListManager.java

@@ -25,11 +25,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.Host;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 
 /**
@@ -41,8 +38,6 @@ import de.tudarmstadt.maki.simonstrator.api.Randoms;
  *
  */
 public class DBHostListManager {
-
-	private static Logger log = SimLogger.getLogger(DBHostListManager.class);
 	
 	private List<Host> hostList;
 	
@@ -59,12 +54,8 @@ public class DBHostListManager {
 	 * @return
 	 */
 	public static List<NetMeasurementDB.Host> getShuffledHostList(NetMeasurementDB db) {
-		long startTime = System.nanoTime();
-		log.debug("Starting shuffling the host list in the measurement database.");
 		List<NetMeasurementDB.Host> result = new ArrayList<NetMeasurementDB.Host>(db.getAllObjects(NetMeasurementDB.Host.class));
 		Collections.shuffle(result, Randoms.getRandom(DBHostListManager.class));
-		double shufflingTime = (System.nanoTime() - startTime) * 0.000001;
-		log.debug("Shuffled host list in " + shufflingTime + " ms");
 		return result;
 	}
 

src/de/tud/kom/p2psim/impl/network/modular/ModularNetLayer.java

@@ -22,8 +22,6 @@ package de.tud.kom.p2psim.impl.network.modular;
 
 import java.util.Collection;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.analyzer.MessageAnalyzer.Reason;
 import de.tud.kom.p2psim.api.common.Position;
 import de.tud.kom.p2psim.api.common.SimHost;
@@ -51,8 +49,9 @@ import de.tud.kom.p2psim.impl.network.modular.st.TrafficControlStrategy;
 import de.tud.kom.p2psim.impl.network.modular.st.TrafficControlStrategy.IReceiveContext;
 import de.tud.kom.p2psim.impl.network.modular.st.TrafficControlStrategy.ISendContext;
 import de.tud.kom.p2psim.impl.transport.AbstractTransMessage;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 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.component.network.Bandwidth;
 import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
 
@@ -99,8 +98,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
  */
 public class ModularNetLayer extends AbstractNetLayer {
 
-	static Logger log = SimLogger.getLogger(ModularNetLayer.class);
-
 	private AbstractModularSubnet subnet;
 
 	/**
@@ -327,7 +324,8 @@ public class ModularNetLayer extends AbstractNetLayer {
 						netAnalyzerProxy.netMsgEvent(message, getHost(),
 								Reason.RECEIVE);
 					}
-					log.warn(this + "Cannot deliver message "
+					Monitor.log(ModularNetLayer.class, Level.WARN,
+							"Cannot deliver message "
 							+ message.getPayload() + " at netID=" + myID
 							+ " as no message msgListeners registered");
 				} else {

src/de/tud/kom/p2psim/impl/network/modular/ModularNetLayerFactory.java

@@ -20,8 +20,6 @@
 
 package de.tud.kom.p2psim.impl.network.modular;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.impl.network.AbstractNetLayerFactory;
 import de.tud.kom.p2psim.impl.network.AbstractSubnet;
@@ -37,10 +35,11 @@ import de.tud.kom.p2psim.impl.network.modular.st.PositioningStrategy;
 import de.tud.kom.p2psim.impl.network.modular.st.TrafficControlStrategy;
 import de.tud.kom.p2psim.impl.network.modular.subnet.SimpleModularSubnet;
 import de.tud.kom.p2psim.impl.util.BackToXMLWritable;
-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.Host;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 
 /**
@@ -72,9 +71,6 @@ import de.tudarmstadt.maki.simonstrator.api.Randoms;
 public class ModularNetLayerFactory extends AbstractNetLayerFactory implements
 		BackToXMLWritable {
 
-	private static Logger log = SimLogger
-			.getLogger(ModularNetLayerFactory.class);
-
 	private StrategiesImpl strategies = new StrategiesImpl();
 
 	private AbstractModularSubnet subnet = new SimpleModularSubnet(strategies);
@@ -147,13 +143,16 @@ public class ModularNetLayerFactory extends AbstractNetLayerFactory implements
 	 */
 	void onSimulationStart() {
 		if (db != null) {
-			log.debug(db.getStats());
+			Monitor.log(ModularNetLayer.class, Level.DEBUG, db.getStats());
 			dbHostList = null;
 			db.release();
 			System.gc();
 		}
-		log.info("Fully written out, the modular net layer configuration would look like this:\n"
-				+ getWrittenBackNetLayer());
+		Monitor.log(
+				ModularNetLayer.class,
+				Level.INFO,
+				"Fully written out, the modular net layer configuration would look like this:\n"
+						+ getWrittenBackNetLayer());
 	}
 
 	/**

src/de/tud/kom/p2psim/impl/network/modular/db/NetMeasurementDB.java

@@ -34,7 +34,6 @@ import java.util.zip.ZipInputStream;
 
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.log4j.Logger;
 import org.xml.sax.SAXException;
 
 import umontreal.iro.lecuyer.probdist.LognormalDist;
@@ -45,7 +44,6 @@ import de.tud.kom.p2psim.impl.util.SymmetricRelation;
 import de.tud.kom.p2psim.impl.util.Tuple;
 import de.tud.kom.p2psim.impl.util.db.relational.DBInstantiationException;
 import de.tud.kom.p2psim.impl.util.db.relational.RelationalDB;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 
 /**
  * Database format for measurements of network characteristics for the Modular Network Layer.
@@ -53,8 +51,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  *
  */
 public class NetMeasurementDB extends RelationalDB implements BackToXMLWritable {
-
-	static Logger log = SimLogger.getLogger(NetMeasurementDB.class);
 	
 	boolean loadedFromFile = false;
 	
@@ -326,7 +322,6 @@ public class NetMeasurementDB extends RelationalDB implements BackToXMLWritable
 		public LognormalDist tGetJitterLnDist() {
 			if (jitterLnDist == null) {
 				jitterLnDist = PingErToolkit.getNewLnDistFrom(avgRtt, minRtt, dVar);
-				log.debug("Calculated requested log-normal jitter distribution for summary relation " + this);
 			}
 			return jitterLnDist;
 		}
@@ -586,7 +581,6 @@ public class NetMeasurementDB extends RelationalDB implements BackToXMLWritable
             input = new BufferedInputStream(new FileInputStream(filename));
         }
 
-		log.info("Loading measurement database from " + filename + "...");
 		this.readFromXMLFile(input);
 		this.filename = filename;
 	}

src/de/tud/kom/p2psim/impl/network/modular/st/latency/GeographicalLatency.java

@@ -21,14 +21,13 @@
 
 package de.tud.kom.p2psim.impl.network.modular.st.latency;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.network.NetMessage;
 import de.tud.kom.p2psim.impl.network.AbstractNetLayer;
 import de.tud.kom.p2psim.impl.network.modular.common.GeoToolkit;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.st.LatencyStrategy;
-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.Time;
 
 /**
@@ -39,8 +38,6 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  *
  */
 public class GeographicalLatency implements LatencyStrategy {
-
-	static Logger log = SimLogger.getLogger(GeographicalLatency.class);
 	
 	@Override
 	public long getMessagePropagationDelay(NetMessage msg,
@@ -55,7 +52,9 @@ public class GeographicalLatency implements LatencyStrategy {
 		
 		double distance = GeoToolkit.getDistance(hSender.getLatitude(), hSender.getLongitude(), hReceiver.getLatitude(), hReceiver.getLongitude());
 		
-		log.debug("Distance between " + nlSender + " and " + nlReceiver + " is " + distance + " meters.");
+		Monitor.log(GeographicalLatency.class, Level.DEBUG, "Distance between "
+				+ nlSender + " and " + nlReceiver + " is " + distance
+				+ " meters.");
 		
 		return Math.round(getStaticPart(msg, nlSender, nlReceiver, db)
 				+ (getGeoDistFactor() * distance) * Time.MILLISECOND);

src/de/tud/kom/p2psim/impl/network/modular/st/latency/NormalDistributionLatency.java

@@ -27,13 +27,13 @@ import java.util.Vector;
 
 import org.apache.commons.math.MathException;
 import org.apache.commons.math.distribution.NormalDistributionImpl;
-import org.apache.log4j.Logger;
 
 import de.tud.kom.p2psim.api.network.NetMessage;
 import de.tud.kom.p2psim.impl.network.AbstractNetLayer;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.st.LatencyStrategy;
-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.Time;
 
@@ -50,9 +50,6 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  */
 public class NormalDistributionLatency implements LatencyStrategy {
 
-	private static Logger log = SimLogger
-			.getLogger(NormalDistributionLatency.class);
-
 	private Random rnd = Randoms.getRandom(NormalDistributionLatency.class);
 
 	/**
@@ -100,10 +97,12 @@ public class NormalDistributionLatency implements LatencyStrategy {
 	private void createDelays(int size) {
 
 		if (propagationMeanDelay < standardDeviation) {
-			log.warn("Bad Configuration! It is possible, that huge delays are negative and consequently this values will be set to the mean delay value.");
+			Monitor.log(
+					NormalDistributionLatency.class,
+					Level.WARN,
+					"Bad Configuration! It is possible, that huge delays are negative and consequently this values will be set to the mean delay value.");
 		}
 
-		log.info("Create " + size + " precomputed delays");
 		delays = new Vector<Long>(size);
 		for (int i = 0; i < size; i++) {
 			long delay = 0;
@@ -111,20 +110,13 @@ public class NormalDistributionLatency implements LatencyStrategy {
 				delay = (long) normalDistribution
 						.inverseCumulativeProbability(rnd.nextDouble());
 			} catch (MathException e) {
-				log.error(
-						"MathException, check your parameteres for NormalDistributionLatency class...",
-						e);
-				throw new RuntimeException();
+				throw new RuntimeException(e);
 			}
 			if (delay <= 0) {
-				log.debug("Set delay to propagationMeanDelay ("
-						+ propagationMeanDelay + ") because it has the value "
-						+ delay);
 				delay = propagationMeanDelay;
 			}
 			delays.add(delay);
 		}
-		log.info("Finished, to create delays");
 	}
 
 	public void setPropagationMeanDelay(long delay) {

src/de/tud/kom/p2psim/impl/network/modular/st/latency/SimpleLatencyModel.java

@@ -24,8 +24,6 @@ package de.tud.kom.p2psim.impl.network.modular.st.latency;
 
 import java.util.Random;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.Position;
 import de.tud.kom.p2psim.api.network.NetLayer;
 import de.tud.kom.p2psim.api.network.NetMessage;
@@ -33,7 +31,6 @@ import de.tud.kom.p2psim.impl.network.AbstractNetLayer;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.st.LatencyStrategy;
 import de.tud.kom.p2psim.impl.network.simple.SimpleSubnet;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.Time;
 
@@ -56,9 +53,7 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  * @author Sebastian Kaune
  * 
  */
-public class SimpleLatencyModel implements LatencyStrategy {
-
-	private final static Logger log = SimLogger.getLogger(SimpleLatencyModel.class);
+public class SimpleLatencyModel implements LatencyStrategy {
 
 	private Random rnd = Randoms.getRandom(SimpleLatencyModel.class);
 
@@ -117,8 +112,6 @@ public class SimpleLatencyModel implements LatencyStrategy {
 		int f = (rnd.nextInt(10) + 1);
 		long latency = Math.round(f * staticDelay * 0.1);
 		
-		log.debug("Latency " + nlSender + " -> " + nlReceiver + ": " + latency);
-		
 		return latency;
 		
 	}

src/de/tud/kom/p2psim/impl/network/modular/st/ploss/PingERPacketLoss.java

@@ -23,14 +23,13 @@ package de.tud.kom.p2psim.impl.network.modular.st.ploss;
 
 import java.util.Random;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.network.NetMessage;
 import de.tud.kom.p2psim.impl.network.AbstractNetLayer;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB.SummaryRelation;
 import de.tud.kom.p2psim.impl.network.modular.st.PLossStrategy;
-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;
 
 /**
@@ -42,9 +41,7 @@ import de.tudarmstadt.maki.simonstrator.api.Randoms;
 public class PingERPacketLoss implements PLossStrategy {
 
 	Random rand = Randoms.getRandom(PingERPacketLoss.class);
-	
-	static Logger log = SimLogger.getLogger(PingERPacketLoss.class);
-	
+
 	@Override
 	public boolean shallDrop(NetMessage msg, AbstractNetLayer nlSender,
 			AbstractNetLayer nlReceiver, NetMeasurementDB db) {
@@ -60,7 +57,11 @@ public class PingERPacketLoss implements PLossStrategy {
 		// will be the probability that all fragments have arrived, and
 		// every fragment itself has the probability of "sumRel.getpLoss()" to be dropped
 		double prob = 1d - Math.pow(1d - sumRel.getpLoss() * 0.01, msg.getNoOfFragments());
-		log.debug("Dropping with probability " + prob + ", fragments " + msg.getNoOfFragments());
+		Monitor.log(
+				PingERPacketLoss.class,
+				Level.DEBUG,
+				"Dropping with probability " + prob + ", fragments "
+						+ msg.getNoOfFragments());
 		return rand.nextDouble() < prob;
 	}
 

src/de/tud/kom/p2psim/impl/network/modular/st/trafCtrl/InfiniteTrafficQueue.java

@@ -21,15 +21,14 @@
 
 package de.tud.kom.p2psim.impl.network.modular.st.trafCtrl;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.network.NetMessage;
 import de.tud.kom.p2psim.impl.network.modular.st.TrafficControlStrategy;
 import de.tud.kom.p2psim.impl.util.LiveMonitoring;
 import de.tud.kom.p2psim.impl.util.livemon.AvgAccumulatorTime;
-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.Time;
 import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
 
@@ -46,8 +45,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
  */
 public class InfiniteTrafficQueue implements TrafficControlStrategy {
 
-	private static Logger log = SimLogger.getLogger(InfiniteTrafficQueue.class);
-
 	static AvgAccumulatorTime qSizeStat = new AvgAccumulatorTime(
 			"Net: Traffic Control Queue Size", 50);
 
@@ -86,11 +83,11 @@ public class InfiniteTrafficQueue implements TrafficControlStrategy {
 			meta.setNextFreeSendingTime(nextFreeSendingTime);
 
 			long delayTime = (sendTime - cur);
-
-			log.debug("Delaying message " + msg
-					+ " at the sender's traffic queue for " + delayTime
-					+ ". The next message may be sent at "
-					+ nextFreeSendingTime);
+			Monitor.log(InfiniteTrafficQueue.class, Level.DEBUG,
+					"Delaying message " + msg
+							+ " at the sender's traffic queue for " + delayTime
+							+ ". The next message may be sent at "
+							+ nextFreeSendingTime);
 
 			qSizeStat.newVal(delayTime);
 		}
@@ -144,7 +141,10 @@ public class InfiniteTrafficQueue implements TrafficControlStrategy {
 
 			long delayTime = (msgTransfFinishTimeGlobal - cur);
 
-			log.debug("Delaying message "
+			Monitor.log(
+					InfiniteTrafficQueue.class,
+					Level.DEBUG,
+					"Delaying message "
 					+ message
 					+ " at the receiver's traffic queue for "
 					+ delayTime

src/de/tud/kom/p2psim/impl/network/realNetworking/RealNetworkRoutingTable.java

@@ -24,9 +24,8 @@ import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
-
-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.component.network.NetID;
 
 /**
@@ -34,8 +33,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
  */
 public class RealNetworkRoutingTable {
 
-	/** The logger. */
-	private static Logger log = SimLogger.getLogger(RealNetworkRoutingTable.class);
 	
 	private static RealNetworkRoutingTable instance;
 	
@@ -74,7 +71,9 @@ public class RealNetworkRoutingTable {
 		if( virtualID == null )
 			return;
 		
-		log.debug("Adding new host to routing table: Virtual/" + virtualID + " is reachable at Real/" + realID + ":" + realPort);		
+		Monitor.log(RealNetworkRoutingTable.class, Level.DEBUG,
+				"Adding new host to routing table: Virtual/" + virtualID
+						+ " is reachable at Real/" + realID + ":" + realPort);
 		routingHashMap.put(virtualID, new InetAddrAndPort(realID, realPort));
 	}
 	

src/de/tud/kom/p2psim/impl/network/realNetworking/RealNetworkingNetLayer.java

@@ -26,8 +26,6 @@ import java.io.OutputStream;
 import java.net.ConnectException;
 import java.net.Socket;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.analyzer.MessageAnalyzer.Reason;
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.api.network.BandwidthImpl;
@@ -39,14 +37,13 @@ import de.tud.kom.p2psim.impl.network.IPv4Message;
 import de.tud.kom.p2psim.impl.network.realNetworking.RealNetworkRoutingTable.InetAddrAndPort;
 import de.tud.kom.p2psim.impl.network.realNetworking.messages.RealNetworkingMessage;
 import de.tud.kom.p2psim.impl.transport.AbstractTransMessage;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 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.component.network.NetID;
 
 public class RealNetworkingNetLayer extends AbstractNetLayer {
 
-	/** The logger. */
-	static Logger log = SimLogger.getLogger(RealNetworkingNetLayer.class);
 	
 	private static RealNetworkingNetLayerManager netLayerManager = RealNetworkingNetLayerManager.getInstance();
 	
@@ -76,7 +73,8 @@ public class RealNetworkingNetLayer extends AbstractNetLayer {
 						
 			/* Destination known at all? */
 			if( realDestination == null ) {
-				log.warn("Destination " + receiverId + " not know to me ("
+				Monitor.log(RealNetworkingNetLayer.class, Level.DEBUG,
+						"Destination " + receiverId + " not know to me ("
 						+ this.getLocalInetAddress() + "). Dropping packet.");
 				return;
 			}
@@ -85,7 +83,11 @@ public class RealNetworkingNetLayer extends AbstractNetLayer {
 			final RealNetworkingMessage realNetworkMessage = new RealNetworkingMessage(netLayerMsg);
 			
 			final TransProtocol transLayerMsgProto = ((AbstractTransMessage) transLayerMsg).getProtocol();
-			log.debug("Trying to send packet from Virtual/" + this.getNetID() + " to Virtual/" + receiverId + " via Real/" + realDestination.getInetAddr() + " with " + transLayerMsgProto.toString());
+			Monitor.log(RealNetworkingNetLayer.class, Level.DEBUG,
+					"Trying to send packet from Virtual/" + this.getNetID()
+							+ " to Virtual/" + receiverId + " via Real/"
+							+ realDestination.getInetAddr() + " with "
+							+ transLayerMsgProto.toString());
 			
 			if (transLayerMsgProto.equals(TransProtocol.UDP)) {
 				if (hasAnalyzer) {
@@ -100,7 +102,8 @@ public class RealNetworkingNetLayer extends AbstractNetLayer {
 			}
 						
 		} else {
-			log.warn("Host " + this.getLocalInetAddress() + " is offline.");
+			Monitor.log(RealNetworkingNetLayer.class, Level.WARN, "Host "
+					+ this.getLocalInetAddress() + " is offline.");
 		}
 	}
 	
@@ -116,7 +119,8 @@ public class RealNetworkingNetLayer extends AbstractNetLayer {
 			return;
 		}
 		
-		log.debug("Host " + this.getLocalInetAddress() + " going online");
+		Monitor.log(RealNetworkingNetLayer.class, Level.DEBUG,
+				"Host " + this.getLocalInetAddress() + " going online");
 		netLayerManager.hostGoOnline(this);
 
 		super.goOnline();
@@ -131,7 +135,8 @@ public class RealNetworkingNetLayer extends AbstractNetLayer {
 	@Override
 	public void goOffline() {
 
-		log.debug("Host " + this.getLocalInetAddress() + " going offline");
+		Monitor.log(RealNetworkingNetLayer.class, Level.DEBUG,
+				"Host " + this.getLocalInetAddress() + " going offline");
 		netLayerManager.hostGoOffline(this);
 		
 		super.goOffline();
@@ -188,7 +193,13 @@ public class RealNetworkingNetLayer extends AbstractNetLayer {
 				tcpConnection.close();
 				
 			} catch( ConnectException e ) {
-				log.error("Remote host not answering, dropping packet. Was supposed to go to Virtual/" + receiverId + " on Real/" + realDestination.getInetAddr() + ": " + e.getMessage());
+				Monitor.log(
+						RealNetworkingNetLayer.class,
+						Level.ERROR,
+						"Remote host not answering, dropping packet. Was supposed to go to Virtual/"
+								+ receiverId + " on Real/"
+								+ realDestination.getInetAddr() + ": "
+								+ e.getMessage());
 			} catch (IOException e) {
 				e.printStackTrace();
 			}

src/de/tud/kom/p2psim/impl/network/realNetworking/RealNetworkingNetLayerFactory.java

@@ -22,19 +22,15 @@ package de.tud.kom.p2psim.impl.network.realNetworking;
 
 import java.util.HashMap;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.impl.network.AbstractNetLayerFactory;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Host;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
 
 public class RealNetworkingNetLayerFactory extends AbstractNetLayerFactory {
-
-	/** The logger. */
-	private static Logger log = SimLogger.getLogger(RealNetworkingNetLayerFactory.class);
 	
 	/** The routing table. */
 	private RealNetworkRoutingTable routingTable;
@@ -67,10 +63,9 @@ public class RealNetworkingNetLayerFactory extends AbstractNetLayerFactory {
 		final RealNetworkingNetLayer newHost = new RealNetworkingNetLayer(host,
 				id);
 
-		log.debug("createComponent: Creating new node: " + host + " with Virtual/" + id);
-	
 		if( routingTable.getRealInetAddrAndPortForVirtualIP(id) == null ) {
-			log.warn("Host not known to routing table. Not created.");
+			Monitor.log(RealNetworkingNetLayerFactory.class, Level.WARN,
+					"Host not known to routing table. Not created.");
 			return null;
 		}
 				

src/de/tud/kom/p2psim/impl/network/realNetworking/RealNetworkingNetLayerManager.java

@@ -30,8 +30,6 @@ import java.net.ServerSocket;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.simengine.SimulatorObserver;
 import de.tud.kom.p2psim.impl.network.IPv4Message;
 import de.tud.kom.p2psim.impl.network.IPv4NetID;
@@ -41,15 +39,14 @@ import de.tud.kom.p2psim.impl.network.realNetworking.socketListener.RealNetworki
 import de.tud.kom.p2psim.impl.network.realNetworking.socketListener.RealNetworkingUdpListener;
 import de.tud.kom.p2psim.impl.simengine.Scheduler;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
-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.component.network.NetID;
 
 public class RealNetworkingNetLayerManager implements EventHandler {
 	
-	/** The logger. */
-	protected static Logger log = SimLogger.getLogger(RealNetworkingNetLayerManager.class);
 	
 	public static final int GLOBAL_SOCKET_PORT_TCP = 13000;
 	public static final int GLOBAL_SOCKET_PORT_UDP = 13001;
@@ -119,14 +116,16 @@ public class RealNetworkingNetLayerManager implements EventHandler {
 		try {
 					
 			/* Start up TCP! */
-			log.debug("Starting TCP listener on port " + GLOBAL_SOCKET_PORT_TCP);
+			Monitor.log(RealNetworkingNetLayerManager.class, Level.DEBUG,
+					"Starting TCP listener on port " + GLOBAL_SOCKET_PORT_TCP);
 			this.tcpSocket = new ServerSocket(GLOBAL_SOCKET_PORT_TCP);
 			assert this.tcpSocket.isBound();
 			listenerThreadTCP = new RealNetworkingTcpListener(this.tcpSocket, this);
 			new Thread(listenerThreadTCP).start();
 			
 			/* Start up UDP! */
-			log.debug("Starting UDP listener on port " + GLOBAL_SOCKET_PORT_UDP);	 
+			Monitor.log(RealNetworkingNetLayerManager.class, Level.DEBUG,
+					"Starting UDP listener on port " + GLOBAL_SOCKET_PORT_UDP);
 			this.udpSocket = new DatagramSocket(GLOBAL_SOCKET_PORT_UDP);
 			listenerThreadUDP = new RealNetworkingUdpListener(this.udpSocket, this);
 			new Thread(listenerThreadUDP).start();
@@ -146,10 +145,12 @@ public class RealNetworkingNetLayerManager implements EventHandler {
 				
 			
 		} catch (BindException e) {
-			log.fatal("Socket already in use. Second simulator running in background?");
+			Monitor.log(RealNetworkingNetLayerManager.class, Level.ERROR,
+					"Socket already in use. Second simulator running in background?");
 			System.exit(-1);
 		} catch (IOException e) {
-			log.fatal("Socket already in use. Second simulator running in background?");
+			Monitor.log(RealNetworkingNetLayerManager.class, Level.ERROR,
+					"Socket already in use. Second simulator running in background?");
 			System.exit(-1);
 		}
 		
@@ -176,7 +177,10 @@ public class RealNetworkingNetLayerManager implements EventHandler {
 			if (tcpSocket != null) { this.tcpSocket.close();  }
 			if (udpSocket != null) { this.udpSocket.close();  }
 		} catch (IOException e) {
-			log.error("Could not close socket on TCP/UDP port " + GLOBAL_SOCKET_PORT_TCP + "/" + GLOBAL_SOCKET_PORT_UDP);
+			Monitor.log(RealNetworkingNetLayerManager.class, Level.ERROR,
+					"Could not close socket on TCP/UDP port "
+							+ GLOBAL_SOCKET_PORT_TCP + "/"
+							+ GLOBAL_SOCKET_PORT_UDP);
 		}
 		
 		this.tcpSocket = null;
@@ -363,7 +367,11 @@ public class RealNetworkingNetLayerManager implements EventHandler {
 					
 					final byte[] buf= baos.toByteArray();
 					if( buf.length > 64000 ) {
-						log.warn("UDP message too long(" + buf.length + " bytes), could not be sent to " + nextUp.receiverId + ". Dropping.");
+						Monitor.log(RealNetworkingNetLayerManager.class,
+								Level.WARN, "UDP message too long("
+										+ buf.length
+										+ " bytes), could not be sent to "
+										+ nextUp.receiverId + ". Dropping.");
 						return;
 					}
 

src/de/tud/kom/p2psim/impl/network/realNetworking/messages/RealNetworkingMessage.java

@@ -26,9 +26,6 @@ import java.io.ObjectOutputStream;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 
-import org.apache.log4j.Logger;
-
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Message;
 
 // TODO: Auto-generated Javadoc
@@ -37,9 +34,6 @@ import de.tudarmstadt.maki.simonstrator.api.Message;
  */
 public class RealNetworkingMessage implements Serializable {
 
-	/** The logger. */
-	final static Logger log = SimLogger.getLogger(RealNetworkingMessage.class);
-
 	/** The net msg. */
 	private Message netMsg = null;
 	
@@ -66,7 +60,6 @@ public class RealNetworkingMessage implements Serializable {
      */
     private void writeObject(ObjectOutputStream oos) throws IOException {
     	
-    	log.debug(RealNetworkingMessage.class.getName() + ".writeObject");
     	RealNetworkingSerializer.serialize(oos, netMsg);
 
     }
@@ -86,7 +79,6 @@ public class RealNetworkingMessage implements Serializable {
 	 */
     private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
     	
-    	log.debug(RealNetworkingMessage.class.getName() + ".readObject");
     	this.netMsg = RealNetworkingDeserializer.deserialize(ois);
 
     	//        transientString = (String) ois.readObject();

src/de/tud/kom/p2psim/impl/network/realNetworking/socketListener/RealNetworkingTcpListener.java

@@ -27,11 +27,10 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.impl.network.IPv4Message;
 import de.tud.kom.p2psim.impl.network.realNetworking.RealNetworkingNetLayerManager;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 /**
  * The listener interface for receiving tcp events.
@@ -46,8 +45,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  */
 public class RealNetworkingTcpListener implements Runnable {
 
-	/** The logger. */
-	private static Logger log = SimLogger.getLogger(RealNetworkingTcpListener.class);
 	
 	/** The socket to listen on. */
 	private ServerSocket socket;
@@ -80,7 +77,6 @@ public class RealNetworkingTcpListener implements Runnable {
 	public void run() {
 		
 		if( running ) {
-			log.debug("TcpListener thread running.");
 			this.alive = true;
 		}
 		
@@ -97,7 +93,13 @@ public class RealNetworkingTcpListener implements Runnable {
 				 * */
 				
 				/* *Yeay* Got a msg! */
-				log.debug("Got a connection from: " + currentSocket.getRemoteSocketAddress() + " to: " + currentSocket.getLocalAddress() + ":" + currentSocket.getLocalPort()) ;
+				Monitor.log(
+						RealNetworkingTcpListener.class,
+						Level.DEBUG,
+						"Got a connection from: "
+								+ currentSocket.getRemoteSocketAddress()
+								+ " to: " + currentSocket.getLocalAddress()
+								+ ":" + currentSocket.getLocalPort());
 								
 				Object inputObject = null;
 				try {
@@ -127,9 +129,11 @@ public class RealNetworkingTcpListener implements Runnable {
 			} catch (SocketException e) {
 				/* Nothing. Socket was closed, thread will end now. */
 			} catch (IOException e) {
-				log.warn("Socket IOException: " + e.getMessage());
+				Monitor.log(RealNetworkingTcpListener.class, Level.WARN,
+						"Socket IOException: " + e.getMessage());
 			} catch (AssertionError e) {
-				log.warn("Assertion: " + e.getMessage());
+				Monitor.log(RealNetworkingTcpListener.class, Level.WARN,
+						"Assertion: " + e.getMessage());
 			}
 			
 		}
@@ -140,7 +144,8 @@ public class RealNetworkingTcpListener implements Runnable {
 	 * Stop.
 	 */
 	public void stop() {
-		log.debug("TcpListener thread stopping.");
+		Monitor.log(RealNetworkingTcpListener.class, Level.DEBUG,
+				"TcpListener thread stopping.");
 		running = false;
 	}