Store openid4java consumer manager in core.

[demoscenemusic.git] / src / main / java / net / pterodactylus / demoscenemusic / core / Core.java

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 (file)
--- 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. */
        }