From 388716986b483e99e5140ca1557cd38632b5115b Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 7 May 2016 22:06:24 +0300
Subject: fix resource paths

---
 src/main/java/com/juick/CrosspostComponent.java     | 4 ++--
 src/main/java/com/juick/PushComponent.java          | 4 ++--
 src/main/java/com/juick/http/www/Main.java          | 2 +-
 src/main/java/com/juick/xmpp/s2s/XMPPComponent.java | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/main/java/com/juick/CrosspostComponent.java b/src/main/java/com/juick/CrosspostComponent.java
index 22de81b6..c277ee68 100644
--- a/src/main/java/com/juick/CrosspostComponent.java
+++ b/src/main/java/com/juick/CrosspostComponent.java
@@ -73,10 +73,10 @@ public class CrosspostComponent implements ServletContextListener,  Stream.Strea
         executorService.submit((Runnable) () -> {
             try {
                 Properties conf = new Properties();
-                conf.load(sce.getServletContext().getResourceAsStream("WEB-INF/juick.conf"));
+                conf.load(sce.getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
 
                 LogManager.getLogManager().readConfiguration(
-                        sce.getServletContext().getResourceAsStream("WEB-INF/logging.properties"));
+                        sce.getServletContext().getResourceAsStream("/WEB-INF/logging.properties"));
                 twitter_consumer_key = conf.getProperty("twitter_consumer_key", "");
                 twitter_consumer_secret = conf.getProperty("twitter_consumer_secret", "");
 
diff --git a/src/main/java/com/juick/PushComponent.java b/src/main/java/com/juick/PushComponent.java
index 0c3d70d7..688f1cdd 100644
--- a/src/main/java/com/juick/PushComponent.java
+++ b/src/main/java/com/juick/PushComponent.java
@@ -84,9 +84,9 @@ public class PushComponent implements ServletContextListener, Stream.StreamListe
         executorService.submit((Runnable) () -> {
             Properties conf = new Properties();
             try {
-                conf.load(sce.getServletContext().getResourceAsStream("WEB-INF/juick.conf"));
+                conf.load(sce.getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
                 LogManager.getLogManager().readConfiguration(
-                        sce.getServletContext().getResourceAsStream("WEB-INF/logging.properties"));
+                        sce.getServletContext().getResourceAsStream("/WEB-INF/logging.properties"));
                 wns_application_sip = conf.getProperty("wns_application_sip", "");
                 wns_client_secret = conf.getProperty("wns_client_secret", "");
                 GCMSender = new Sender(conf.getProperty("gcm_key"));
diff --git a/src/main/java/com/juick/http/www/Main.java b/src/main/java/com/juick/http/www/Main.java
index cabd50af..7896c207 100644
--- a/src/main/java/com/juick/http/www/Main.java
+++ b/src/main/java/com/juick/http/www/Main.java
@@ -70,7 +70,7 @@ public class Main extends HttpServlet implements Stream.StreamListener {
         super.init();
         try {
             Properties conf = new Properties();
-            conf.load(getServletContext().getResourceAsStream("WEB-INF/juick.conf"));
+            conf.load(getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
 
             Class.forName("com.mysql.jdbc.Driver");
             sql = DriverManager.getConnection("jdbc:mysql://localhost/juick?autoReconnect=true&user=" + conf.getProperty("mysql_username", "") + "&password=" + conf.getProperty("mysql_password", ""));
diff --git a/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java b/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java
index 3a1c1ddb..03a12c26 100644
--- a/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java
+++ b/src/main/java/com/juick/xmpp/s2s/XMPPComponent.java
@@ -157,7 +157,7 @@ public class XMPPComponent implements ServletContextListener {
         executorService.submit(() -> {
             Properties conf = new Properties();
             try {
-                conf.load(sce.getServletContext().getResourceAsStream("WEB-INF/juick.conf"));
+                conf.load(sce.getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
                 HOSTNAME = conf.getProperty("hostname");
                 String componentName = conf.getProperty("componentname");
                 STATSFILE = conf.getProperty("statsfile");
-- 
cgit v1.2.3