X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=7f6cf25dfb6aaed59a3f94bde16a8a8eb6b2cdb3;hb=44cd79ffff770423c77508e2fc6189521544da99;hp=ecf7f5b7a47b6234d5e8b9dd8c4aeee05fe65dd5;hpb=b29cf0908e6dfd2b55220a3a7e44200f2fe5b19e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index ecf7f5b..7f6cf25 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -26,6 +26,9 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.FreenetInterface;
 import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
+import net.pterodactylus.sone.freenet.wot.IdentityManager;
+import net.pterodactylus.sone.freenet.wot.PluginConnector;
+import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
@@ -56,6 +59,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	static {
 		/* initialize logging. */
 		Logging.setup("sone");
+		Logging.setupConsoleLogging();
 		Logging.addLoggingListener(new LoggingListener() {
 
 			@Override
@@ -74,12 +78,11 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 					freenet.support.Logger.error(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
 				}
 			}
-
 		});
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version("RC2", 0, 1);
+	public static final Version VERSION = new Version("RC1", 0, 2);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -99,6 +102,9 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	/** The plugin store. */
 	private PluginStore pluginStore;
 
+	/** The identity manager. */
+	private IdentityManager identityManager;
+
 	//
 	// ACCESSORS
 	//
@@ -158,19 +164,27 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		/* create freenet interface. */
 		FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
 
+		/* create web of trust connector. */
+		PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
+		WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
+		identityManager = new IdentityManager(webOfTrustConnector);
+		identityManager.setContext("Sone");
+
 		/* create the web interface. */
 		webInterface = new WebInterface(this);
 
 		/* create core. */
-		core = new Core();
-		core.configuration(configuration);
-		core.freenetInterface(freenetInterface);
+		core = new Core(configuration, freenetInterface, identityManager);
+
+		/* create the identity manager. */
+		identityManager.addIdentityListener(core);
 
 		/* start core! */
 		boolean startupFailed = true;
 		try {
 			core.start();
 			webInterface.start();
+			identityManager.start();
 			startupFailed = false;
 		} finally {
 			if (startupFailed) {
@@ -196,6 +210,9 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 			/* stop the core. */
 			core.stop();
 
+			/* stop the identity manager. */
+			identityManager.stop();
+
 			/* TODO wait for core to stop? */
 			try {
 				pluginRespirator.putStore(pluginStore);