Merge branch 'develop' of ssh://den.jabber.ru/var/lib/git/com.juick.http.www into sans_branch

1 files changed, 2 insertions, 4 deletions

diff --git a/src/main/java/com/juick/JuickApplication.java b/src/main/java/com/juick/JuickApplication.java
index e546f5a8..2696ba39 100644
--- a/src/main/java/com/juick/JuickApplication.java
+++ b/src/main/java/com/juick/JuickApplication.java
@@ -31,10 +31,8 @@ public class JuickApplication {
     private JdbcTemplate sql;
     private JdbcTemplate sqlSearch;
     private List<JuickComponent> components = new ArrayList<>();
-    private String applicationPath;
 
-    public JuickApplication(Properties conf, String applicationPath) throws IOException {
-        this.applicationPath = applicationPath;
+    public JuickApplication(Properties conf) throws IOException {
         executorService = Executors.newWorkStealingPool();
         initDataSources(conf);
         initSockets(conf);
@@ -45,7 +43,7 @@ public class JuickApplication {
     private void initRythm(Properties conf) {
         String rythmMode = conf.getProperty("rythm_mode", "prod");
         Map<String, Object> map = new HashMap<>();
-        map.put("home.template", applicationPath+"/WEB-INF/classes/templates");
+        map.put("home.template", "templates");
         map.put("rythm.engine.mode", rythmMode);
         Rythm.init(map);
     }