X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=480529fd3c128199e63cd05d8af78e93171cca4f;hb=e9a2ac5f932a9c49685d218b5edaad8d6dd79d22;hp=810fef1164211512f7c9bda34cc6f7eda51b5f15;hpb=6a0938d8f6fdf9dbc45f03384a3cd83efeef022c;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 810fef1..480529f 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -20,17 +20,22 @@ package net.pterodactylus.sone.main;
 import java.io.File;
 import java.util.Collections;
 import java.util.logging.Level;
+import java.util.logging.LogRecord;
 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;
 import net.pterodactylus.util.config.MapConfigurationBackend;
 import net.pterodactylus.util.config.XMLConfigurationBackend;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.logging.LoggingListener;
 import net.pterodactylus.util.version.Version;
 import freenet.client.async.DatabaseDisabledException;
 import freenet.l10n.BaseL10n.LANGUAGE;
@@ -54,10 +59,29 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	static {
 		/* initialize logging. */
 		Logging.setup("sone");
+		Logging.addLoggingListener(new LoggingListener() {
+
+			@Override
+			public void logged(LogRecord logRecord) {
+				Class<?> loggerClass = Logging.getLoggerClass(logRecord.getLoggerName());
+				int recordLevel = logRecord.getLevel().intValue();
+				if (recordLevel < Level.FINE.intValue()) {
+					freenet.support.Logger.debug(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+				} else if (recordLevel < Level.INFO.intValue()) {
+					freenet.support.Logger.minor(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+				} else if (recordLevel < Level.WARNING.intValue()) {
+					freenet.support.Logger.normal(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+				} else if (recordLevel < Level.SEVERE.intValue()) {
+					freenet.support.Logger.warning(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+				} else {
+					freenet.support.Logger.error(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+				}
+			}
+		});
 	}
 
 	/** The version. */
-	private static final Version VERSION = new Version("SNAPSHOT", 0, 1);
+	public static final Version VERSION = new Version("RC4", 0, 2);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -77,6 +101,9 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	/** The plugin store. */
 	private PluginStore pluginStore;
 
+	/** The identity manager. */
+	private IdentityManager identityManager;
+
 	//
 	// ACCESSORS
 	//
@@ -122,7 +149,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		/* create a configuration. */
 		Configuration configuration;
 		try {
-			configuration = new Configuration(new PluginStoreConfigurationBackend(pluginStore = pluginRespirator.getStore()));
+			configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
 		} catch (DatabaseDisabledException dde1) {
 			logger.log(Level.WARNING, "Could not load plugin store, using XML files.");
 			try {
@@ -136,19 +163,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) {
@@ -167,21 +202,27 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	 */
 	@Override
 	public void terminate() {
-		/* stop the web interface. */
-		webInterface.stop();
+		try {
+			/* stop the web interface. */
+			webInterface.stop();
 
-		/* stop the core. */
-		core.stop();
+			/* stop the core. */
+			core.stop();
 
-		/* TODO wait for core to stop? */
-		try {
-			pluginRespirator.putStore(pluginStore);
-		} catch (DatabaseDisabledException dde1) {
-			logger.log(Level.WARNING, "Could not store plugin store, database is disabled.", dde1);
-		}
+			/* stop the identity manager. */
+			identityManager.stop();
+
+			/* TODO wait for core to stop? */
+			try {
+				pluginRespirator.putStore(pluginStore);
+			} catch (DatabaseDisabledException dde1) {
+				logger.log(Level.WARNING, "Could not store plugin store, database is disabled.", dde1);
+			}
 
-		/* shutdown logger. */
-		Logging.shutdown();
+		} finally {
+			/* shutdown logger. */
+			Logging.shutdown();
+		}
 	}
 
 	//