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.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;
}
/** The version. */
- public static final Version VERSION = new Version("RC1", 0, 3);
+ public static final Version VERSION = new Version(0, 3);
/** The logger. */
private static final Logger logger = Logging.getLogger(SonePlugin.class);
/* create a configuration. */
Configuration configuration;
+ Configuration xmlConfiguration = null;
try {
- configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
- } catch (DatabaseDisabledException dde1) {
- logger.log(Level.WARNING, "Could not load plugin store, using XML files.");
+ configuration = new Configuration(new MapConfigurationBackend(new File("sone.xml"), false));
+ xmlConfiguration = configuration;
+ } catch (ConfigurationException 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.<String, String> emptyMap()));
+ xmlConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.xml"), true));
+ } catch (ConfigurationException ce2) {
+ logger.log(Level.SEVERE, "Could not create XML file, using Plugin Store!");
+ }
+ try {
+ configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
+ } catch (DatabaseDisabledException dde1) {
+ logger.log(Level.SEVERE, "Could not load any configuration, using in-memory configuration!");
+ configuration = new Configuration(new MapConfigurationBackend());
}
}
boolean startupFailed = true;
try {
core.start();
+ if ((xmlConfiguration != null) && (configuration != xmlConfiguration)) {
+ core.setConfiguration(xmlConfiguration);
+ }
webInterface.start();
identityManager.start();
startupFailed = false;