Merge branch 'master' into 'releases/v2-3'

Fixed POM

Minor, non-breaking updates to the v2.3 version

See merge request !10

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>maki</groupId>
 	<artifactId>simonstrator-peerfactsim</artifactId>

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

@@ -30,6 +30,8 @@ import de.tud.kom.p2psim.api.linklayer.LinkLayer;
 import de.tud.kom.p2psim.api.network.NetLayer;
 import de.tud.kom.p2psim.api.network.SimNetworkComponent;
 import de.tud.kom.p2psim.api.topology.TopologyComponent;
+import de.tudarmstadt.maki.simonstrator.api.Monitor;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.component.ComponentNotAvailableException;
 import de.tudarmstadt.maki.simonstrator.api.component.HostComponent;
 import de.tudarmstadt.maki.simonstrator.api.component.transport.TransportComponent;
@@ -108,7 +110,7 @@ public class DefaultHost implements SimHost {
 			try {
 				networkComponent = getComponent(SimNetworkComponent.class);
 			} catch (ComponentNotAvailableException e) {
-				throw new AssertionError("No NetworkComponent found!");
+				Monitor.log(DefaultHost.class, Level.ERROR, "No NetworkComponent found in the current configuration!");
 			}
 		}
 		return networkComponent;
@@ -120,7 +122,7 @@ public class DefaultHost implements SimHost {
 			try {
 				transportComponent = getComponent(TransportComponent.class);
 			} catch (ComponentNotAvailableException e) {
-				throw new AssertionError("No TransportComponent found!");
+				Monitor.log(DefaultHost.class, Level.ERROR, "No TransportComponent found in the current configuration!");
 			}
 		}
 		return transportComponent;