X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fcore%2FCore.java;h=d0ba5a04401e540baa752a6254c449a2bd0cb1d5;hb=61c649c53893188489d713374eccc240e3b2ea15;hp=4ec90dac046f1f133d09d44ce6bf0503cd24e00f;hpb=c2f0d1538e3af4569723742144296caf291d4989;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 4ec90da..d0ba5a0 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,17 +39,48 @@ public class Core implements ServletContextListener {
 
 	private DataManager dataManager;
 
+	/** The data directory. */
+	private DataDirectory dataDirectory;
+
+	private final ConsumerManager consumerManager = new ConsumerManager();
+
+	public DataManager getDataManager() {
+		return dataManager;
+	}
+
+	/**
+	 * @return the consumerManager
+	 */
+	public ConsumerManager getConsumerManager() {
+		return consumerManager;
+	}
+
+	/**
+	 * Returns the data directory helper.
+	 *
+	 * @return The data directory
+	 */
+	public DataDirectory getDataDirectory() {
+		return dataDirectory;
+	}
+
+	//
+	// SERVLETCONTEXTLISTENER METHODS
+	//
+
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void contextInitialized(ServletContextEvent servletContextEvent) {
-		Context context;
+		servletContextEvent.getServletContext().setAttribute("core", this);
+		dataDirectory = new DataDirectory(servletContextEvent.getServletContext().getInitParameter("data-directory"));
 		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);
 		}
@@ -56,6 +89,7 @@ public class Core implements ServletContextListener {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void contextDestroyed(ServletContextEvent arg0) {
 		/* do nothing. */
 	}