Set version to 0.3.2-RC2.

[Sone.git] / src / main / java / net / pterodactylus / sone / main / SonePlugin.java

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index e156967..027c6f8 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -18,7 +18,6 @@
 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;
@@ -26,13 +25,13 @@ 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;
@@ -76,12 +75,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("RC2", 0, 3, 2);
 
        /** The logger. */
        private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -101,6 +99,9 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
        /** The plugin store. */
        private PluginStore pluginStore;
 
+       /** The identity manager. */
+       private IdentityManager identityManager;
+
        //
        // ACCESSORS
        //
@@ -144,16 +145,25 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
                this.pluginRespirator = pluginRespirator;
 
                /* create a configuration. */
-               Configuration configuration;
+               Configuration oldConfiguration;
+               Configuration newConfiguration = null;
                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) {
+                       logger.log(Level.INFO, "Could not load configuration file, trying plugin store…");
                        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.<String, String> 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!");
+                       }
+                       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());
                        }
                }
 
@@ -163,21 +173,29 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
                /* 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(oldConfiguration, freenetInterface, identityManager);
 
                /* create the web interface. */
                webInterface = new WebInterface(this);
+               core.addCoreListener(webInterface);
 
-               /* create core. */
-               core = new Core();
-               core.configuration(configuration);
-               core.freenetInterface(freenetInterface);
-               core.setWebOfTrustConnector(webOfTrustConnector);
+               /* create the identity manager. */
+               identityManager.addIdentityListener(core);
 
                /* start core! */
                boolean startupFailed = true;
                try {
                        core.start();
+                       if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+                               logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+                               core.setConfiguration(newConfiguration);
+                       }
                        webInterface.start();
+                       identityManager.start();
                        startupFailed = false;
                } finally {
                        if (startupFailed) {
@@ -203,6 +221,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);