X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=94e5030803228c4eaefd7a09d08b3f76bed3aad0;hb=01a3dd65fb1bf371a6b0febcaf203d40e430f7a9;hp=a0a22f9be7ab0ffd4660c5fbb69db1cdf9b458db;hpb=a6ab825ac08bb90c01055b76b7310b181cb19cec;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 a0a22f9..94e5030 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -1,5 +1,5 @@
/*
- * FreenetSone - SonePlugin.java - Copyright © 2010 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010â2013 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,9 +24,14 @@ import java.util.logging.Logger;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.core.FreenetInterface;
+import net.pterodactylus.sone.core.WebOfTrustUpdater;
+import net.pterodactylus.sone.database.Database;
+import net.pterodactylus.sone.database.SoneProvider;
+import net.pterodactylus.sone.database.memory.MemoryDatabase;
+import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
+import net.pterodactylus.sone.freenet.plugin.PluginConnector;
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;
@@ -35,15 +40,33 @@ import net.pterodactylus.util.config.MapConfigurationBackend;
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;
import freenet.l10n.PluginL10n;
+import freenet.node.Node;
import freenet.pluginmanager.FredPlugin;
import freenet.pluginmanager.FredPluginBaseL10n;
+import freenet.pluginmanager.FredPluginFCP;
import freenet.pluginmanager.FredPluginL10n;
import freenet.pluginmanager.FredPluginThreadless;
import freenet.pluginmanager.FredPluginVersioned;
+import freenet.pluginmanager.PluginReplySender;
import freenet.pluginmanager.PluginRespirator;
+import freenet.support.SimpleFieldSet;
+import freenet.support.api.Bucket;
+
+import com.google.common.eventbus.EventBus;
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import com.google.inject.TypeLiteral;
+import com.google.inject.matcher.Matchers;
+import com.google.inject.name.Names;
+import com.google.inject.spi.InjectionListener;
+import com.google.inject.spi.TypeEncounter;
+import com.google.inject.spi.TypeListener;
/**
* This class interfaces with Freenet. It is the class that is loaded by the
@@ -51,7 +74,7 @@ import freenet.pluginmanager.PluginRespirator;
*
* @author David âBombeâ Roden
*/
-public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
+public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned {
static {
/* initialize logging. */
@@ -63,22 +86,22 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
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());
+ freenet.support.Logger.debug(loggerClass, logRecord.getMessage(), logRecord.getThrown());
} else if (recordLevel < Level.INFO.intValue()) {
- freenet.support.Logger.minor(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ freenet.support.Logger.minor(loggerClass, logRecord.getMessage(), logRecord.getThrown());
} else if (recordLevel < Level.WARNING.intValue()) {
- freenet.support.Logger.normal(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ freenet.support.Logger.normal(loggerClass, logRecord.getMessage(), logRecord.getThrown());
} else if (recordLevel < Level.SEVERE.intValue()) {
- freenet.support.Logger.warning(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ freenet.support.Logger.warning(loggerClass, logRecord.getMessage(), logRecord.getThrown());
} else {
- freenet.support.Logger.error(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown());
+ freenet.support.Logger.error(loggerClass, logRecord.getMessage(), logRecord.getThrown());
}
}
});
}
/** The version. */
- public static final Version VERSION = new Version(0, 3, 7);
+ public static final Version VERSION = new Version(0, 8, 7);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -92,11 +115,14 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/** The web interface. */
private WebInterface webInterface;
+ /** The FCP interface. */
+ private FcpInterface fcpInterface;
+
/** The l10n helper. */
private PluginL10n l10n;
- /** The identity manager. */
- private IdentityManager identityManager;
+ /** The web of trust connector. */
+ private WebOfTrustConnector webOfTrustConnector;
//
// ACCESSORS
@@ -133,9 +159,6 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
// FREDPLUGIN METHODS
//
- /**
- * {@inheritDoc}
- */
@Override
public void runPlugin(PluginRespirator pluginRespirator) {
this.pluginRespirator = pluginRespirator;
@@ -166,26 +189,69 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
}
}
- boolean startupFailed = true;
- try {
- /* create freenet interface. */
- FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
+ final Configuration startConfiguration = oldConfiguration;
+ final EventBus eventBus = new EventBus();
- /* create web of trust connector. */
- PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
- WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
- identityManager = new IdentityManager(webOfTrustConnector);
- identityManager.setContext("Sone");
+ /* Freenet injector configuration. */
+ AbstractModule freenetModule = new AbstractModule() {
- /* create core. */
- core = new Core(oldConfiguration, freenetInterface, identityManager);
+ @Override
+ @SuppressWarnings("synthetic-access")
+ protected void configure() {
+ bind(PluginRespirator.class).toInstance(SonePlugin.this.pluginRespirator);
+ bind(Node.class).toInstance(SonePlugin.this.pluginRespirator.getNode());
+ }
+ };
+ /* Sone injector configuration. */
+ AbstractModule soneModule = new AbstractModule() {
- /* create the web interface. */
- webInterface = new WebInterface(this);
- core.addCoreListener(webInterface);
+ @Override
+ protected void configure() {
+ bind(Core.class).in(Singleton.class);
+ bind(MemoryDatabase.class).in(Singleton.class);
+ bind(EventBus.class).toInstance(eventBus);
+ bind(Configuration.class).toInstance(startConfiguration);
+ bind(FreenetInterface.class).in(Singleton.class);
+ bind(PluginConnector.class).in(Singleton.class);
+ bind(WebOfTrustConnector.class).in(Singleton.class);
+ bind(WebOfTrustUpdater.class).in(Singleton.class);
+ bind(IdentityManager.class).in(Singleton.class);
+ bind(String.class).annotatedWith(Names.named("WebOfTrustContext")).toInstance("Sone");
+ bind(SonePlugin.class).toInstance(SonePlugin.this);
+ bind(FcpInterface.class).in(Singleton.class);
+ bind(Database.class).to(MemoryDatabase.class);
+ bind(SoneProvider.class).to(Core.class).in(Singleton.class);
+ bindListener(Matchers.any(), new TypeListener() {
+
+ @Override
+ public void hear(TypeLiteral typeLiteral, TypeEncounter typeEncounter) {
+ typeEncounter.register(new InjectionListener() {
+
+ @Override
+ public void afterInjection(I injectee) {
+ eventBus.register(injectee);
+ }
+ });
+ }
+ });
+ }
- /* create the identity manager. */
- identityManager.addIdentityListener(core);
+ };
+ Injector injector = Guice.createInjector(freenetModule, soneModule);
+ core = injector.getInstance(Core.class);
+
+ /* create web of trust connector. */
+ webOfTrustConnector = injector.getInstance(WebOfTrustConnector.class);
+
+ /* create FCP interface. */
+ fcpInterface = injector.getInstance(FcpInterface.class);
+ core.setFcpInterface(fcpInterface);
+
+ /* create the web interface. */
+ webInterface = injector.getInstance(WebInterface.class);
+
+ boolean startupFailed = true;
+ try {
/* start core! */
core.start();
@@ -196,7 +262,6 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
webInterface.start();
webInterface.setFirstStart(firstStart);
webInterface.setNewConfig(newConfig);
- identityManager.start();
startupFailed = false;
} finally {
if (startupFailed) {
@@ -210,9 +275,6 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void terminate() {
try {
@@ -222,8 +284,8 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/* stop the core. */
core.stop();
- /* stop the identity manager. */
- identityManager.stop();
+ /* stop the web of trust connector. */
+ webOfTrustConnector.stop();
} catch (Throwable t1) {
logger.log(Level.SEVERE, "Error while shutting down!", t1);
} finally {
@@ -233,20 +295,23 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
}
//
+ // INTERFACE FredPluginFCP
+ //
+
+ @Override
+ public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
+ fcpInterface.handle(pluginReplySender, parameters, data, accessType);
+ }
+
+ //
// INTERFACE FredPluginL10n
//
- /**
- * {@inheritDoc}
- */
@Override
public String getString(String key) {
return l10n.getBase().getString(key);
}
- /**
- * {@inheritDoc}
- */
@Override
public void setLanguage(LANGUAGE newLanguage) {
l10n = new PluginL10n(this, newLanguage);
@@ -256,33 +321,21 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
// INTERFACE FredPluginBaseL10n
//
- /**
- * {@inheritDoc}
- */
@Override
public String getL10nFilesBasePath() {
return "i18n";
}
- /**
- * {@inheritDoc}
- */
@Override
public String getL10nFilesMask() {
return "sone.${lang}.properties";
}
- /**
- * {@inheritDoc}
- */
@Override
public String getL10nOverrideFilesMask() {
return "sone.${lang}.override.properties";
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassLoader getPluginClassLoader() {
return SonePlugin.class.getClassLoader();
@@ -292,9 +345,6 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
// INTERFACE FredPluginVersioned
//
- /**
- * {@inheritDoc}
- */
@Override
public String getVersion() {
return VERSION.toString();