X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fcore%2FCore.java;h=d0ba5a04401e540baa752a6254c449a2bd0cb1d5;hb=61c649c53893188489d713374eccc240e3b2ea15;hp=bfa8dee6a9ee9fd08c979d1c901ed08af15917a2;hpb=18288af880956ecc1168ca3f9b344ba8d86b62fc;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 bfa8dee..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,14 +39,42 @@ 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) {
+		servletContextEvent.getServletContext().setAttribute("core", this);
+		dataDirectory = new DataDirectory(servletContextEvent.getServletContext().getInitParameter("data-directory"));
 		try {
 			Context context = new InitialContext();
 			DataSource dataSource = (DataSource) context.lookup("java:/comp/env/jdbc/demosceneMusic");
@@ -59,6 +89,7 @@ public class Core implements ServletContextListener {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void contextDestroyed(ServletContextEvent arg0) {
 		/* do nothing. */
 	}