Removed SimLogger-dependency

src/de/tud/kom/p2psim/api/scenario/simcfg/SimCfgHostBuilder.java

@@ -21,5 +21,5 @@
 package de.tud.kom.p2psim.api.scenario.simcfg;
 
 public interface SimCfgHostBuilder {
-	
+	//
 }

src/de/tud/kom/p2psim/api/scenario/simcfg/converter/SimCfgTypeConverter.java

@@ -24,13 +24,21 @@ import java.util.HashMap;
 
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
 import de.tud.kom.p2psim.impl.scenario.simcfg2.configuration.beans.Value;
-import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.*;
-import org.apache.log4j.Logger;
-
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.BooleanConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.ByteConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.ClassArrayConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.ClassConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.DoubleConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.IntegerConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.LongConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.ShortConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.StringArrayConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.StringConverter;
+import de.tud.kom.p2psim.impl.scenario.simcfg2.utils.converter.TypeConverter;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 
 public class SimCfgTypeConverter {
-	private static final Logger log = SimLogger.getLogger(SimCfgTypeConverter.class);
 	
 	public static final String LOSS_OF_PRECISION = "and can lead to a loss of precision";
 	public static final String FAULTY_VALUES = "and can lead to faulty values";
@@ -76,8 +84,10 @@ public class SimCfgTypeConverter {
 	}
 
 	public static void warnAboutConversion(String parameterName, Object value, Class type, String canLeadTo) {
-		log.warn("Converted parameter '" + parameterName + "' of type " + value.getClass().getSimpleName() +
-				"' to type '" + type.getSimpleName() + "', this may not be wanted " + canLeadTo + ".");
+		Monitor.log(SimCfgTypeConverter.class, Level.WARN,
+				"Converted parameter '%s' of type '%s' to type '%s', this may not be wanted %s.",
+				parameterName, value.getClass().getSimpleName(),
+				type.getSimpleName(), canLeadTo);
 	}
 
 }

src/de/tud/kom/p2psim/api/storage/ContentStorage.java

@@ -39,7 +39,8 @@ import de.tudarmstadt.maki.simonstrator.api.common.UniqueID;
  * 
  * @deprecated Apps and App-related code is now part of the sim-runner project
  * 
- */
+ */
+@Deprecated
 public interface ContentStorage extends SimHostComponent {
 	/**
 	 * Fetch doc from the local storage.

src/de/tud/kom/p2psim/api/storage/Document.java

@@ -34,7 +34,8 @@ import de.tudarmstadt.maki.simonstrator.api.common.UniqueID;
  * 
  * @deprecated Apps and app-related code is now part of the runner-project.
  *             Documents should be defined by the overlay/Service type
- */
+ */
+@Deprecated
 public interface Document {
 
 	/**

src/de/tud/kom/p2psim/api/storage/DocumentFactory.java

-/*
- * Copyright (c) 2005-2011 KOM - Multimedia Communications Lab
- *
- * This file is part of PeerfactSim.KOM.
- * 
- * PeerfactSim.KOM is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version.
- * 
- * PeerfactSim.KOM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with PeerfactSim.KOM.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-
-package de.tud.kom.p2psim.api.storage;
-
-
-/**
- * Should be used to create documents according to some distribution with some
- * popularity.
- * 
- * Currently, it's under construction.
- * 
- * @author Sebastian Kaune <kaune@kom.tu-darmstadt.de>
- * @author Konstantin Pussep <pussep@kom.tu-darmstadt.de>
- * @version 1.0, 11/25/2007
- * 
- * @deprecated unused, will be removed in later versions
- */
-public interface DocumentFactory {
-	// FIXME methods to be defined -> volunteers wanted !
-}

src/de/tud/kom/p2psim/api/topology/views/wifi/phy/WifiPhy.java

@@ -23,13 +23,10 @@ package de.tud.kom.p2psim.api.topology.views.wifi.phy;
 import java.util.List;
 import java.util.Vector;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiMode.WifiCodeRate;
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiMode.WifiModulationClass;
 import de.tud.kom.p2psim.impl.linklayer.mac.wifi.AbstractRateManager;
 import de.tud.kom.p2psim.impl.linklayer.mac.wifi.DcfManager;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 
 /**
  * This class defines the possible {@link WifiMode}s. Additionally it defines
@@ -46,7 +43,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  * @version 1.0, 28.02.2013
  */
 public abstract class WifiPhy {
-	private static Logger log = SimLogger.getLogger(WifiPhy.class);
 
 	public static long _5000MHZ = 5000000000l;
 
@@ -282,8 +278,7 @@ public abstract class WifiPhy {
 			}
 
 		default:
-			log.fatal("unsupported modulation class");
-			return null;
+			throw new AssertionError("Unsupported Mod");
 		}
 	}
 
@@ -335,8 +330,7 @@ public abstract class WifiPhy {
 			}
 
 		default:
-			log.fatal("unsupported modulation class");
-			return 0;
+			throw new AssertionError("Unsupported Modulation");
 		}
 	}
 
@@ -386,8 +380,7 @@ public abstract class WifiPhy {
 			}
 
 		default:
-			log.fatal("unsupported modulation class");
-			return 0;
+			throw new AssertionError("Unsupported Modulation");
 		}
 	}
 
@@ -447,8 +440,7 @@ public abstract class WifiPhy {
 					/ (payloadMode.getDataRate() / 1.0e6)));
 
 		default:
-			log.fatal("unsupported modulation class");
-			return 0;
+			throw new AssertionError("Unsupported Modulation");
 		}
 	}
 

src/de/tud/kom/p2psim/impl/churn/AVTChurnModel.java

@@ -31,12 +31,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.churn.ChurnModel;
 import de.tud.kom.p2psim.api.common.SimHost;
 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.Time;
 import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
 
@@ -46,8 +45,6 @@ import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
  * @version 1.0, 08/14/2011
  */
 public class AVTChurnModel implements ChurnModel {
-	
-	private final static Logger log = SimLogger.getLogger(AVTChurnModel.class);
 
 	/**
 	 * AVTNode calculates the times on which this node has to be online or offline. 
@@ -195,10 +192,12 @@ public class AVTChurnModel implements ChurnModel {
 	@Override
 	public void prepare(List<SimHost> churnHosts) {
 		if (churnHosts.size() > churnNodes.size()) {
-			Exception ex = new IllegalArgumentException(
+			throw new IllegalArgumentException(
 					"Number of churn affected hosts is greater than the number of hosts prepared from the AVTModel.");
 		} else if (churnHosts.size() < churnNodes.size()) {
-			log.warn("churnHosts ("+churnHosts.size()+") < Hosts in AVT File("+churnNodes.size()+")");			
+			Monitor.log(AVTChurnModel.class, Level.WARN,
+					"churnHosts (%s) < Hosts in AVT File(%s)",
+					churnHosts.size(), churnNodes.size());
 		}
 		for (SimHost host : churnHosts) {
 			this.hosts.put(host, churnNodes.poll());

src/de/tud/kom/p2psim/impl/churn/DefaultChurnGenerator.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.churn.ChurnGenerator;
 import de.tud.kom.p2psim.api.churn.ChurnModel;
 import de.tud.kom.p2psim.api.common.SimHost;
@@ -33,11 +31,12 @@ import de.tud.kom.p2psim.api.network.SimNetInterface;
 import de.tud.kom.p2psim.api.network.SimNetworkComponent;
 import de.tud.kom.p2psim.api.scenario.Configurator;
 import de.tud.kom.p2psim.api.scenario.HostBuilder;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tud.kom.p2psim.impl.util.toolkits.CollectionHelpers;
 import de.tud.kom.p2psim.impl.util.toolkits.Predicates;
 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;
 
 /**
@@ -46,8 +45,6 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  * @author Sebastian Kaune
  */
 public class DefaultChurnGenerator implements EventHandler, ChurnGenerator {
-	private static final Logger log = SimLogger
-			.getLogger(DefaultChurnGenerator.class);
 
 	HostBuilder hostBuilder;
 
@@ -142,8 +139,8 @@ public class DefaultChurnGenerator implements EventHandler, ChurnGenerator {
 		for (SimHost host : hosts) {
 			scheduleChurnEvent(host);
 		}
-
-		log.info("Scheduled " + hosts.size() + " churn events");
+		Monitor.log(DefaultChurnGenerator.class, Level.INFO,
+				"Scheduled %s churn events", hosts.size());
 	}
 
 	private List<SimHost> filterHosts() {

src/de/tud/kom/p2psim/impl/churn/ExponentialChurnModel.java

@@ -28,19 +28,15 @@ import java.util.Map;
 
 import org.apache.commons.math.MathException;
 import org.apache.commons.math.distribution.ExponentialDistributionImpl;
-import org.apache.log4j.Logger;
 
 import de.tud.kom.p2psim.api.churn.ChurnModel;
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.api.scenario.Configurator;
 import de.tud.kom.p2psim.api.scenario.HostBuilder;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 
 public class ExponentialChurnModel implements ChurnModel {
 
-	final static Logger log = SimLogger.getLogger(ExponentialChurnModel.class);
-
 	public enum UserType {
 
 		TRANSIENT(MEAN_SESSION_LENGTH), NORMAL(10 * MEAN_SESSION_LENGTH), LONG_LASTING(
@@ -154,16 +150,7 @@ public class ExponentialChurnModel implements ChurnModel {
 				- (this.longLastingCf * this.longLastingFraction) - (this.normalCf * this.normalFraction))
 				/ this.transientFraction;
 		
-		log.info("Transient churn factor: " + transientCf);
-		
 		if (transientCf < 0d || transientCf > 1d) {
-			log
-					.error("Cannot use desired churn factor ("
-							+ churnFactor
-							+ "). "
-							+ "Transient connection factor would be "
-							+ transientCf
-							+ " then, which is out of bounds. Modify the fraction instead.");
 			throw new AssertionError(
 					"Cannot use desired churn factor. "
 							+ "Transient connection factor would be "

src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java

@@ -34,7 +34,6 @@ import org.apache.log4j.Logger;
 import de.tud.kom.p2psim.api.simengine.SimulatorObserver;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
 import de.tud.kom.p2psim.impl.util.db.dao.DAO;
-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;
@@ -93,7 +92,7 @@ public class DefaultMonitor implements MonitorComponent, EventHandler,
 	public void log(Class<?> subject, Level level, String msg, Object... data) {
 		Logger log = loggers.get(subject);
 		if (log == null) {
-			log = SimLogger.getLogger(subject);
+			log = Logger.getLogger(subject);
 			loggers.put(subject, log);
 		}
 		switch (level) {
@@ -151,8 +150,6 @@ public class DefaultMonitor implements MonitorComponent, EventHandler,
 	 * FROM HERE ON: deprecated!
 	 */
 
-	private static Logger log = SimLogger.getLogger(DefaultMonitor.class);
-
 	private BufferedWriter output = new BufferedWriter(new OutputStreamWriter(
 			System.out));
 
@@ -219,7 +216,7 @@ public class DefaultMonitor implements MonitorComponent, EventHandler,
 				output.write("*******************************************************\n");
 				// output.close();
 			} catch (IOException e) {
-				log.error("Failed to print monitoring results.", e);
+				throw new AssertionError();
 			}
 		}
 		this.isMonitoring = false;

src/de/tud/kom/p2psim/impl/energy/EnergyModelFactory.java

@@ -20,20 +20,17 @@
 
 package de.tud.kom.p2psim.impl.energy;
 
-import java.awt.RadialGradientPaint;
 import java.util.List;
 import java.util.Random;
 import java.util.Vector;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.api.energy.EnergyConfiguration;
 import de.tud.kom.p2psim.api.energy.EnergyModel;
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
-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.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.component.HostComponentFactory;
 
@@ -49,8 +46,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.HostComponentFactory;
  */
 public class EnergyModelFactory implements HostComponentFactory {
 	
-	private static Logger log = SimLogger.getLogger(EnergyModelFactory.class);
-	
 	private Random random;
 
 	/**
@@ -127,8 +122,9 @@ public class EnergyModelFactory implements HostComponentFactory {
 							+ energyConfig.getHelp());
 		}
 		// just log the information
-		log.info("EnergyModel created - some information:\n"
-				+ energyConfig.getHelp());
+		Monitor.log(EnergyModelFactory.class, Level.INFO,
+				"EnergyModel created - some information:\n %s",
+				energyConfig.getHelp());
 		energyConfigurations.add(energyConfig);
 	}
 

src/de/tud/kom/p2psim/impl/energy/SmartphoneCommunicationEnergyComponent.java

@@ -20,8 +20,6 @@
 
 package de.tud.kom.p2psim.impl.energy;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.energy.ComponentType;
 import de.tud.kom.p2psim.api.energy.EnergyCommunicationComponent;
 import de.tud.kom.p2psim.api.energy.EnergyEventListener;
@@ -29,8 +27,9 @@ import de.tud.kom.p2psim.api.energy.EnergyModel;
 import de.tud.kom.p2psim.api.energy.EnergyState;
 import de.tud.kom.p2psim.api.linklayer.mac.PhyType;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
-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.Time;
 
 /**
@@ -42,8 +41,6 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  */
 public class SmartphoneCommunicationEnergyComponent implements
 		EnergyCommunicationComponent {
-
-	private static Logger log = SimLogger.getLogger(SmartphoneCommunicationEnergyComponent.class);
 	
 	private PhyType phy;
 	
@@ -131,7 +128,10 @@ public class SmartphoneCommunicationEnergyComponent implements
 	@Override
 	public void send(long duration, Message msg, boolean isBroadcast) {
 		assert isOn();
-		log.debug(Time.getFormattedTime()
+		Monitor.log(
+				SmartphoneCommunicationEnergyComponent.class,
+				Level.DEBUG,
+				Time.getFormattedTime()
 				+ " "
 				+ ((EnergyModel) energyModel).getHost().getHostId()
 				+ " consumed "
@@ -146,13 +146,18 @@ public class SmartphoneCommunicationEnergyComponent implements
 	public void receive(long duration, Message msg, boolean isBroadcast,
 			boolean isIntendedReceiver) {
 		assert isOn();
-		log.debug(Time.getFormattedTime()
-				+ " "
-				+ ((EnergyModel) energyModel).getHost().getHostId()
-				+ " consumed "
-				+ (RECEIVE.getEnergyConsumption() * (duration / (double) Simulator.SECOND_UNIT))
-				+ " uJ in State " + RECEIVE.getName() + " after spending "
-				+ (duration / (double) Simulator.SECOND_UNIT) + " sec there.");
+		Monitor.log(
+				SmartphoneCommunicationEnergyComponent.class,
+				Level.DEBUG,
+				Time.getFormattedTime()
+						+ " "
+						+ ((EnergyModel) energyModel).getHost().getHostId()
+						+ " consumed "
+						+ (RECEIVE.getEnergyConsumption() * (duration / (double) Simulator.SECOND_UNIT))
+						+ " uJ in State " + RECEIVE.getName()
+						+ " after spending "
+						+ (duration / (double) Simulator.SECOND_UNIT)
+						+ " sec there.");
 		energyModel.switchedState(this, RECEIVE, null,
 				duration);
 	}
@@ -163,14 +168,18 @@ public class SmartphoneCommunicationEnergyComponent implements
 
 	private void doStateChange(EnergyState newState){
 		long timeSpentInState = Simulator.getCurrentTime() - lastStateChange;
-		log.debug(Time.getFormattedTime()
-				+ " "
-				+ ((EnergyModel) energyModel).getHost().getHostId()
-				+ " consumed "
-				+ (currentState.getEnergyConsumption() * (timeSpentInState/ (double) Simulator.SECOND_UNIT))
-				+ " uJ in State " + currentState.getName() + " after spending "
-				+ (timeSpentInState / (double) Simulator.SECOND_UNIT)
-				+ " sec there.");
+		Monitor.log(
+				SmartphoneCommunicationEnergyComponent.class,
+				Level.DEBUG,
+				Time.getFormattedTime()
+						+ " "
+						+ ((EnergyModel) energyModel).getHost().getHostId()
+						+ " consumed "
+						+ (currentState.getEnergyConsumption() * (timeSpentInState / (double) Simulator.SECOND_UNIT))
+						+ " uJ in State " + currentState.getName()
+						+ " after spending "
+						+ (timeSpentInState / (double) Simulator.SECOND_UNIT)
+						+ " sec there.");
 		energyModel.switchedState(this, currentState, newState,
 				timeSpentInState);
 		currentState = newState;

src/de/tud/kom/p2psim/impl/linklayer/LinkLayerFactory.java

@@ -23,16 +23,15 @@ package de.tud.kom.p2psim.impl.linklayer;
 import java.util.List;
 import java.util.Vector;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.api.linklayer.LinkLayer;
 import de.tud.kom.p2psim.api.linklayer.mac.MacAddress;
 import de.tud.kom.p2psim.api.linklayer.mac.MacConfiguration;
 import de.tud.kom.p2psim.api.linklayer.mac.MacLayer;
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
-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.HostComponentFactory;
 
 /**
@@ -43,8 +42,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.HostComponentFactory;
  */
 public class LinkLayerFactory implements HostComponentFactory {
 
-	private static Logger log = SimLogger.getLogger(LinkLayerFactory.class);
-
 	/**
 	 * A List of the currently active MAC-Layer configurations
 	 */
@@ -86,7 +83,7 @@ public class LinkLayerFactory implements HostComponentFactory {
 			// create a unique MacAddress
 			long macAddrLong = host.getHostId() * 10 + macSequence;
 			if (macAddrLong > Integer.MAX_VALUE) {
-				log.error("Range overflow for Mac-Addresses!");
+				throw new AssertionError("Range overflow for Mac-Addresses!");
 			}
 			MacAddress macAddress = new MacAddress((int) macAddrLong);
 			MacLayer macLayer = macConfig.getConfiguredMacLayer(host,
@@ -114,8 +111,9 @@ public class LinkLayerFactory implements HostComponentFactory {
 							+ macConfiguration.getHelp());
 		}
 		// just log the information
-		log.info("MAC created - some information:\n"
-				+ macConfiguration.getHelp());
+		Monitor.log(LinkLayerFactory.class, Level.INFO,
+				"MAC created - some information:\n %s",
+				macConfiguration.getHelp());
 		macConfigurations.add(macConfiguration);
 	}
 

src/de/tud/kom/p2psim/impl/linklayer/ModularLinkLayer.java

@@ -26,8 +26,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.analyzer.LinklayerAnalyzer;
 import de.tud.kom.p2psim.api.analyzer.MessageAnalyzer.Reason;
 import de.tud.kom.p2psim.api.common.SimHost;
@@ -44,10 +42,10 @@ import de.tud.kom.p2psim.api.scenario.ConfigurationException;
 import de.tud.kom.p2psim.impl.network.IPv4NetID;
 import de.tud.kom.p2psim.impl.util.LiveMonitoring;
 import de.tud.kom.p2psim.impl.util.LiveMonitoring.ProgressValue;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tud.kom.p2psim.impl.util.toolkits.NumberFormatToolkit;
 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.core.MonitorComponent.AnalyzerNotAvailableException;
 import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
 import de.tudarmstadt.maki.simonstrator.api.component.network.NetInterface;
@@ -68,8 +66,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.network.NetInterface;
  */
 public class ModularLinkLayer implements LinkLayer, LinkMessageListener {
 
-	private static Logger log = SimLogger.getLogger(ModularLinkLayer.class);
-
 	/**
 	 * All Mac-Layers of this Host
 	 */
@@ -206,7 +202,8 @@ public class ModularLinkLayer implements LinkLayer, LinkMessageListener {
 				listener.goneOffline(phyType);
 			}
 		} else {
-			log.info("Mac was already offline...");
+			Monitor.log(ModularLinkLayer.class, Level.DEBUG,
+					"Mac was already offline...");
 		}
 	}
 
@@ -224,7 +221,8 @@ public class ModularLinkLayer implements LinkLayer, LinkMessageListener {
 				listener.goneOnline(phyType);
 			}
 		} else {
-			log.info("Mac was already online...");
+			Monitor.log(ModularLinkLayer.class, Level.DEBUG,
+					"Mac was already online...");
 		}
 	}
 
@@ -232,8 +230,9 @@ public class ModularLinkLayer implements LinkLayer, LinkMessageListener {
 	public boolean isOnline(PhyType phyType) {
 		MacLayer activeMac = macLayers.get(phyType);
 		if (activeMac == null) {
-			log.warn("A MAC with the type " + phyType.toString()
-					+ " is not configured.");
+			Monitor.log(ModularLinkLayer.class, Level.WARN,
+					"A MAC with the type " + phyType.toString()
+							+ " is not configured.");
 			return false;
 		}
 		return activeMac.isOnline();

src/de/tud/kom/p2psim/impl/linklayer/mac/wifi/AbstractRateManager.java

@@ -28,8 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.common.Position;
 import de.tud.kom.p2psim.api.linklayer.mac.MacAddress;
 import de.tud.kom.p2psim.api.linklayer.mac.MacLayer;
@@ -37,7 +35,6 @@ import de.tud.kom.p2psim.api.topology.views.wifi.phy.PropagationLossModel;
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiMode;
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiPhy.Standard_802_11;
 import de.tud.kom.p2psim.impl.topology.views.wifi.phy.InterferenceHelper;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 
 /**
  * This class is an interface for other implementation of Rate Managers. The
@@ -62,8 +59,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  */
 public abstract class AbstractRateManager {
 
-	private static Logger log = SimLogger.getLogger(AbstractRateManager.class);
-
 	/**
 	 * Defines the available Rate Managers.
 	 */
@@ -563,7 +558,8 @@ public abstract class AbstractRateManager {
 				basicModes.add(mode);
 			}
 		} else {
-			log.error("try to add a mode to the basicModes, which is not stored as a common mode");
+			throw new AssertionError(
+					"try to add a mode to the basicModes, which is not stored as a common mode");
 		}
 	}
 

src/de/tud/kom/p2psim/impl/linklayer/mac/wifi/DcfManager.java

@@ -22,11 +22,8 @@ package de.tud.kom.p2psim.impl.linklayer.mac.wifi;
 
 import java.util.Random;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.linklayer.mac.MacLayer;
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiPhy.Standard_802_11;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.Time;
 
@@ -49,7 +46,6 @@ import de.tudarmstadt.maki.simonstrator.api.Time;
  * @version 1.0, 22.02.2013
  */
 public class DcfManager {
-	private static Logger log = SimLogger.getLogger(DcfManager.class);
 
 	// times are for 802.11a
 	// will be replaced in the constructor.
@@ -384,13 +380,14 @@ public class DcfManager {
 	 */
 	public long getBackoffTimeEnd() {
 		if (!runningBackoffTimer) {
-			log.fatal("The backoffTimer is not running. Please start the BackoffTimer before you call this Method.");
-			return 0;
+			throw new AssertionError(
+					"The backoffTimer is not running. Please start the BackoffTimer before you call this Method.");
 		}
 		// TODO: can be removed, if not occured; or as assertion
 		if (!ignoreWifiState && backoffTimerEnd == Time.getCurrentTime()
 				&& getWifiState() != WifiState.IDLE) {
-			log.fatal("try to get BackoffTime, but not in Idle state!");
+			throw new AssertionError(
+					"try to get BackoffTime, but not in Idle state!");
 		}
 		return backoffTimerEnd;
 	}
@@ -403,7 +400,7 @@ public class DcfManager {
 	 */
 	public void notifyTxNow(long duration) {
 		if (txEndTime > Time.getCurrentTime()) {
-			log.fatal("2 sends on the same time?");
+			throw new AssertionError("2 sends on the same time?");
 		}
 		txStartTime = Time.getCurrentTime();
 		txEndTime = Time.getCurrentTime() + duration;
@@ -420,7 +417,8 @@ public class DcfManager {
 	 */
 	public void notifyRxNow(long duration) {
 		if (rxEndTime > Time.getCurrentTime()) {
-			log.fatal("2 receives on the same time? (How to handle collisions for the second or more transfer?)");
+			throw new AssertionError(
+					"2 receives on the same time? (How to handle collisions for the second or more transfer?)");
 		}
 		rxStartTime = Time.getCurrentTime();
 		rxEndTime = Time.getCurrentTime() + duration;

src/de/tud/kom/p2psim/impl/linklayer/mac/wifi/IdealRateManager.java

@@ -24,11 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.linklayer.mac.MacAddress;
 import de.tud.kom.p2psim.api.topology.views.wifi.phy.WifiMode;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 
 /**
  * The Ideal Rate Manager calculates an SNR-Threshold for all modes and search
@@ -45,8 +42,6 @@ import de.tud.kom.p2psim.impl.util.logging.SimLogger;
  */
 public class IdealRateManager extends AbstractRateManager {
 
-	private static Logger log = SimLogger.getLogger(IdealRateManager.class);
-
 	/**
 	 * The maximum Bit Error Rate acceptable at any transmission mode
 	 */

src/de/tud/kom/p2psim/impl/linklayer/mac/wifi/Ieee80211AdHocMac.java

@@ -26,8 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.analyzer.LinklayerAnalyzer;
 import de.tud.kom.p2psim.api.analyzer.MessageAnalyzer.Reason;
 import de.tud.kom.p2psim.api.common.Position;
@@ -52,9 +50,9 @@ import de.tud.kom.p2psim.impl.linklayer.mac.wifi.DcfManager.WifiState;
 import de.tud.kom.p2psim.impl.topology.views.wifi.WifiTopologyView;
 import de.tud.kom.p2psim.impl.util.LiveMonitoring;
 import de.tud.kom.p2psim.impl.util.LiveMonitoring.ProgressValue;
-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.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.Time;
 import de.tudarmstadt.maki.simonstrator.api.component.core.MonitorComponent.AnalyzerNotAvailableException;
@@ -104,7 +102,6 @@ import de.tudarmstadt.maki.simonstrator.api.operation.AbstractOperation;
  * @version 1.0, 28.02.2013
  */
 public class Ieee80211AdHocMac extends AbstractMacLayer {
-	protected static Logger log = SimLogger.getLogger(Ieee80211AdHocMac.class);
 
 	/*
 	 * For Analyzing
@@ -320,7 +317,10 @@ public class Ieee80211AdHocMac extends AbstractMacLayer {
 					Time.getCurrentTime() - toSend.getTimeEntered());
 
 			if (msg.getSize() >= MAX_FRAME_SIZE) {
-				log.warn("Try to send a Frame, which is to big ("
+				Monitor.log(
+						Ieee80211AdHocMac.class,
+						Level.WARN,
+						"Try to send a Frame, which is to big ("
 						+ msg.getSize()
 						+ "Byte)! Please check the fragementation size in the Net-Layer. The message will be still send, with the side-effects (for example, higher Bandwidth)");
 			}
@@ -339,7 +339,8 @@ public class Ieee80211AdHocMac extends AbstractMacLayer {
 				}
 			}
 		} else {
-			log.error("sendMessage was called, but no Message exists");
+			throw new AssertionError(
+					"sendMessage was called, but no Message exists");
 		}
 	}
 
@@ -362,7 +363,8 @@ public class Ieee80211AdHocMac extends AbstractMacLayer {
 		} else {
 			// easy policy to check an failure. If two or more operation
 			// running, then is op not null!
-			log.fatal("Two or more GetSendSlotOperation are running! This should be not happen, because a station cannot send two or more Frames on the same time!");
+			throw new AssertionError(
+					"Two or more GetSendSlotOperation are running! This should be not happen, because a station cannot send two or more Frames on the same time!");
 		}
 	}
 
@@ -1107,10 +1109,13 @@ public class Ieee80211AdHocMac extends AbstractMacLayer {
 
 			getComponent().op = null;
 			if (!getComponent().isOnline()) {
-				log.warn(Time.getFormattedTime()
-						+ " node "
-						+ eventInfo.getSender()
-						+ " wanted to get a slot to send but was already offline.");
+				Monitor.log(
+						Ieee80211AdHocMac.class,
+						Level.WARN,
+						Time.getFormattedTime()
+								+ " node "
+								+ eventInfo.getSender()
+								+ " wanted to get a slot to send but was already offline.");
 				return;
 			}
 			boolean ignoreWifiState = getComponent().getDcfManager()
@@ -1141,17 +1146,22 @@ public class Ieee80211AdHocMac extends AbstractMacLayer {
 						}
 					}
 				} else {
-					log.fatal("Why is the Mac not in an Idle State? "
-							+ getComponent().getWifiState()
-							+ "   "
-							+ (getComponent().getDcfManager()
-									.getTimeToIdleState()));
+					/*
+					 * FIXME is this a valid state?
+					 */
 					getComponent().sendMessage();
+					throw new AssertionError(
+							"Why is the Mac not in an Idle State? "
+									+ getComponent().getWifiState()
+									+ "   "
+									+ (getComponent().getDcfManager()
+											.getTimeToIdleState()));
 				}
 
 			} else {
 				if (backOffTimeEnd < current) {
-					log.fatal("How can be the backOffTimeEnd smaller then the current time? ");
+					throw new AssertionError(
+							"How can the backOffTimeEnd be smaller than the current time? ");
 				} else {
 					op = new GetSendSlotOperation(getComponent(), eventInfo);
 					op.scheduleWithDelay(backOffTimeEnd

src/de/tud/kom/p2psim/impl/network/AbstractNetLayer.java

@@ -23,8 +23,6 @@ package de.tud.kom.p2psim.impl.network;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.analyzer.ConnectivityAnalyzer;
 import de.tud.kom.p2psim.api.analyzer.MessageAnalyzer.Reason;
 import de.tud.kom.p2psim.api.analyzer.NetlayerAnalyzer;
@@ -38,9 +36,8 @@ import de.tud.kom.p2psim.api.network.SimNetInterface;
 import de.tud.kom.p2psim.api.network.SimNetworkComponent;
 import de.tud.kom.p2psim.api.transport.TransProtocol;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Monitor;
-import de.tudarmstadt.maki.simonstrator.api.Time;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.component.core.MonitorComponent.AnalyzerNotAvailableException;
 import de.tudarmstadt.maki.simonstrator.api.component.network.Bandwidth;
 import de.tudarmstadt.maki.simonstrator.api.component.network.NetID;
@@ -63,8 +60,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.transport.ConnectivityList
 public abstract class AbstractNetLayer implements SimNetworkComponent,
 		SimNetInterface {
 
-	protected static Logger log = SimLogger.getLogger(AbstractNetLayer.class);
-
 	private final List<NetMessageListener> msgListeners;
 
 	private final List<ConnectivityListener> connListeners;
@@ -102,9 +97,6 @@ public abstract class AbstractNetLayer implements SimNetworkComponent,
 		this.myID = netId;
 		this.msgListeners = new LinkedList<NetMessageListener>();
 		this.connListeners = new LinkedList<ConnectivityListener>();
-		if (maxBandwidth.getDownBW() < maxBandwidth.getUpBW())
-			log.warn("maxDownBandwidth < maxUpBandwidth on host with NetID "
-					+ this.myID);
 		this.maxBandwidth = maxBandwidth;
 		this.currentBandwidth = maxBandwidth.clone();
 		this.position = position;
@@ -158,7 +150,8 @@ public abstract class AbstractNetLayer implements SimNetworkComponent,
 					netAnalyzerProxy.netMsgEvent(message, getHost(),
 						Reason.DROP);
 				}
-				log.warn(this + "Cannot deliver message "
+				Monitor.log(AbstractNetLayer.class, Level.WARN,
+						"Cannot deliver message "
 						+ message.getPayload() + " at netID=" + myID
 						+ " as no message msgListeners registered");
 			} else {
@@ -221,7 +214,6 @@ public abstract class AbstractNetLayer implements SimNetworkComponent,
 	 */
 	public void addNetMsgListener(NetMessageListener listener) {
 		if (!this.msgListeners.contains(listener)) {
-			log.debug("Register msg listener " + listener);
 			this.msgListeners.add(listener);
 		}
 	}
@@ -328,7 +320,6 @@ public abstract class AbstractNetLayer implements SimNetworkComponent,
 			} catch (AnalyzerNotAvailableException e) {
 				//
 			}
-			log.info(myID + " disconnected @ " + Time.getFormattedTime());
 		}
 	}
 
@@ -348,7 +339,6 @@ public abstract class AbstractNetLayer implements SimNetworkComponent,
 			} catch (AnalyzerNotAvailableException e) {
 				//
 			}
-			log.info(myID + " connected @ " + Time.getFormattedTime());
 		}
 	}
 

src/de/tud/kom/p2psim/impl/network/bandwidthDetermination/PickFromRandomGroupBandwidthDetermination.java

@@ -25,11 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import org.apache.log4j.Logger;
-
 import de.tud.kom.p2psim.api.network.BandwidthDetermination;
 import de.tud.kom.p2psim.api.network.BandwidthImpl;
-import de.tud.kom.p2psim.impl.util.logging.SimLogger;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 
 /**
@@ -42,9 +39,6 @@ import de.tudarmstadt.maki.simonstrator.api.Randoms;
 public abstract class PickFromRandomGroupBandwidthDetermination implements
 		BandwidthDetermination<Integer> {
 
-	private static Logger log = SimLogger
-			.getLogger(PickFromRandomGroupBandwidthDetermination.class);
-
 	Random rand = Randoms
 			.getRandom(PickFromRandomGroupBandwidthDetermination.class);
 
@@ -55,7 +49,6 @@ public abstract class PickFromRandomGroupBandwidthDetermination implements
 	List<BandwidthImpl> bandwidths = new ArrayList<BandwidthImpl>();
 
 	public PickFromRandomGroupBandwidthDetermination() {
-		log.debug("Init RandomBandwidthDetermination");
 		addBandwidthGroups();
 	}
 	
@@ -86,13 +79,9 @@ public abstract class PickFromRandomGroupBandwidthDetermination implements
 
 		for (int i = 0; i < bandwidths.size(); i++) {
 			if (distribution.get(i) > random) {
-				log.trace("Getting " + bandwidths.get(i).toString());
 				return bandwidths.get(i);
 			}
 		}
-		log
-				.trace("Getting "
-						+ bandwidths.get(bandwidths.size() - 1).toString());
 		return bandwidths.get(bandwidths.size() - 1);
 
 	}