projects
/
demoscenemusic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create data directory helper on load.
[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
aa3f31e
..
d0ba5a0
100644
(file)
--- a/
src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
+++ b/
src/main/java/net/pterodactylus/demoscenemusic/core/Core.java
@@
-39,6
+39,9
@@
public class Core implements ServletContextListener {
private DataManager dataManager;
private DataManager dataManager;
+ /** The data directory. */
+ private DataDirectory dataDirectory;
+
private final ConsumerManager consumerManager = new ConsumerManager();
public DataManager getDataManager() {
private final ConsumerManager consumerManager = new ConsumerManager();
public DataManager getDataManager() {
@@
-52,6
+55,15
@@
public class Core implements ServletContextListener {
return consumerManager;
}
return consumerManager;
}
+ /**
+ * Returns the data directory helper.
+ *
+ * @return The data directory
+ */
+ public DataDirectory getDataDirectory() {
+ return dataDirectory;
+ }
+
//
// SERVLETCONTEXTLISTENER METHODS
//
//
// SERVLETCONTEXTLISTENER METHODS
//
@@
-62,6
+74,7
@@
public class Core implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent servletContextEvent) {
servletContextEvent.getServletContext().setAttribute("core", this);
@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");
try {
Context context = new InitialContext();
DataSource dataSource = (DataSource) context.lookup("java:/comp/env/jdbc/demosceneMusic");