aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick/api
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-05-13 09:35:03 +0300
committerGravatar Vitaly Takmazov2016-05-13 09:35:03 +0300
commitec3225703e8b1b3455ab8b38f746c8e539cde241 (patch)
tree2c729adcdc199917d31dd1b252aafe21fb16d56e /src/main/java/com/juick/api
parent0879730b19ac8d5ea2250c320a17de0ed7361bb3 (diff)
parentdaab143efa277ca42e60dcd29daeddbfa5179ace (diff)
Merge branch 'develop' into tgb
Diffstat (limited to 'src/main/java/com/juick/api')
-rw-r--r--src/main/java/com/juick/api/Main.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/juick/api/Main.java b/src/main/java/com/juick/api/Main.java
index 6adef22a..9b327e83 100644
--- a/src/main/java/com/juick/api/Main.java
+++ b/src/main/java/com/juick/api/Main.java
@@ -70,11 +70,11 @@ public class Main extends HttpServlet implements Stream.StreamListener {
public void init() throws ServletException {
super.init();
try {
- LogManager.getLogManager().readConfiguration(getServletContext().getResourceAsStream("WEB-INF/logging.properties"));
+ LogManager.getLogManager().readConfiguration(getServletContext().getResourceAsStream("/WEB-INF/logging.properties"));
Properties conf = new Properties();
- conf.load(getServletContext().getResourceAsStream("WEB-INF/juick.conf"));
+ conf.load(getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName(conf.getProperty("datasource_driver"));
+ dataSource.setDriverClassName(conf.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
dataSource.setUrl(conf.getProperty("datasource_url"));
jdbc = new JdbcTemplate(dataSource);
messages = new Messages(jdbc);