X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=d642dd865639ff00c9cced935c766c81f68f1495;hb=5e30dc1ca805f1a2d87b6c752da68a57275cb159;hp=531bc90991166d1902feb1b70f172f1d14ef3271;hpb=2a38345ba7eb550e3ad84d3f38ed84ee0333c4fd;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 531bc90..d642dd8 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 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
@@ -18,19 +18,21 @@
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.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.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;
@@ -39,11 +41,14 @@ import freenet.l10n.BaseL10n.LANGUAGE;
import freenet.l10n.PluginL10n;
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.pluginmanager.PluginStore;
+import freenet.support.SimpleFieldSet;
+import freenet.support.api.Bucket;
/**
* This class interfaces with Freenet. It is the class that is loaded by the
@@ -51,7 +56,7 @@ import freenet.pluginmanager.PluginStore;
*
* @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. */
@@ -74,12 +79,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("RC3", 0, 1);
+ public static final Version VERSION = new Version(0, 6, 7);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -93,11 +97,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 plugin store. */
- private PluginStore pluginStore;
+ /** The identity manager. */
+ private IdentityManager identityManager;
//
// ACCESSORS
@@ -142,35 +149,66 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
this.pluginRespirator = pluginRespirator;
/* create a configuration. */
- Configuration configuration;
+ Configuration oldConfiguration;
+ Configuration newConfiguration = null;
+ boolean firstStart = !new File("sone.properties").exists();
+ boolean newConfig = false;
try {
- configuration = new Configuration(new PluginStoreConfigurationBackend(pluginStore = pluginRespirator.getStore()));
- } catch (DatabaseDisabledException dde1) {
- logger.log(Level.WARNING, "Could not load plugin store, using XML files.");
+ oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), false));
+ newConfiguration = oldConfiguration;
+ } catch (ConfigurationException ce1) {
+ newConfig = true;
+ logger.log(Level.INFO, "Could not load configuration file, trying plugin storeâ¦", ce1);
try {
- configuration = new Configuration(new XMLConfigurationBackend(new File("sone.xml"), true));
- } catch (ConfigurationException ce1) {
- logger.log(Level.SEVERE, "Could not load or create the âsone.xmlâ configuration file!");
- configuration = new Configuration(new MapConfigurationBackend(Collections. emptyMap()));
+ newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true));
+ logger.log(Level.INFO, "Created new configuration file.");
+ } catch (ConfigurationException ce2) {
+ logger.log(Level.SEVERE, "Could not create configuration file, using Plugin Store!", ce2);
+ }
+ try {
+ oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
+ logger.log(Level.INFO, "Plugin store loaded.");
+ } catch (DatabaseDisabledException dde1) {
+ logger.log(Level.SEVERE, "Could not load any configuration, using empty configuration!");
+ oldConfiguration = new Configuration(new MapConfigurationBackend());
}
}
- /* create freenet interface. */
- FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
+ boolean startupFailed = true;
+ try {
+ /* create freenet interface. */
+ FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
- /* create the web interface. */
- webInterface = new WebInterface(this);
+ /* create web of trust connector. */
+ PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
+ WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
+ identityManager = new IdentityManager(webOfTrustConnector);
+ identityManager.setContext("Sone");
- /* create core. */
- core = new Core();
- core.configuration(configuration);
- core.freenetInterface(freenetInterface);
+ /* create core. */
+ core = new Core(oldConfiguration, freenetInterface, identityManager);
- /* start core! */
- boolean startupFailed = true;
- try {
+ /* create the web interface. */
+ webInterface = new WebInterface(this);
+ core.addCoreListener(webInterface);
+
+ /* create FCP interface. */
+ fcpInterface = new FcpInterface(core);
+ core.setFcpInterface(fcpInterface);
+
+ /* create the identity manager. */
+ identityManager.addIdentityListener(core);
+
+ /* start core! */
core.start();
+ if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+ logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+ core.setConfiguration(newConfiguration);
+ }
webInterface.start();
+ webInterface.setFirstStart(firstStart);
+ webInterface.setNewConfig(newConfig);
+ identityManager.start();
startupFailed = false;
} finally {
if (startupFailed) {
@@ -196,13 +234,10 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
/* 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();
+ } catch (Throwable t1) {
+ logger.log(Level.SEVERE, "Error while shutting down!", t1);
} finally {
/* shutdown logger. */
Logging.shutdown();
@@ -210,6 +245,18 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
}
//
+ // INTERFACE FredPluginFCP
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
+ fcpInterface.handle(pluginReplySender, parameters, data, accessType);
+ }
+
+ //
// INTERFACE FredPluginL10n
//