X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fcore%2FCore.java;h=d0ba5a04401e540baa752a6254c449a2bd0cb1d5;hb=577d2d5723539b8dc25d09a9a51963985f1c449f;hp=af737545ce4e87a0401284c94105cb1ab83fee91;hpb=f910bfec8c988bc9baf7e5e3a05b19237e899cec;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 af73754..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,10 +39,31 @@ 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 // @@ -51,6 +74,7 @@ public class Core implements ServletContextListener { @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");