X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fcore%2FCore.java;h=aa3f31eaf363136f94b151f211549d80af5efeb5;hb=ec14179943150b1716d642c2761e7fc9f12a524f;hp=d13592434bfeb7ecdb6b9529c0ec4af4af76dbc9;hpb=4ff0d7b22fd8993771e17779e91b5a025dd5c85c;p=demoscenemusic.git

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/core/Core.java b/src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
index d135924..aa3f31e 100644
--- a/src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
@@ -28,6 +28,8 @@ import net.pterodactylus.demoscenemusic.data.DataManager;
 import net.pterodactylus.util.database.AbstractDatabase;
 import net.pterodactylus.util.database.Database;
 
+import org.openid4java.consumer.ConsumerManager;
+
 /**
  * TODO
  *
@@ -37,21 +39,35 @@ public class Core implements ServletContextListener {
 
 	private DataManager dataManager;
 
+	private final ConsumerManager consumerManager = new ConsumerManager();
+
 	public DataManager getDataManager() {
 		return dataManager;
 	}
 
 	/**
+	 * @return the consumerManager
+	 */
+	public ConsumerManager getConsumerManager() {
+		return consumerManager;
+	}
+
+	//
+	// SERVLETCONTEXTLISTENER METHODS
+	//
+
+	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
-		Context context;
+		servletContextEvent.getServletContext().setAttribute("core", this);
 		try {
-			context = new InitialContext();
+			Context context = new InitialContext();
 			DataSource dataSource = (DataSource) context.lookup("java:/comp/env/jdbc/demosceneMusic");
 			Database database = AbstractDatabase.fromDataSource(dataSource);
 			dataManager = new DataManager(database);
-			servletContextEvent.getServletContext().setAttribute("DataManager", dataManager);
+			servletContextEvent.getServletContext().setAttribute("dataManager", dataManager);
 		} catch (NamingException ne1) {
 			servletContextEvent.getServletContext().log("Could not create database connection.", ne1);
 		}
@@ -60,6 +76,7 @@ public class Core implements ServletContextListener {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void contextDestroyed(ServletContextEvent arg0) {
 		/* do nothing. */
 	}