aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main/java/com/juick
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-04-02 16:58:53 +0300
committerGravatar Vitaly Takmazov2018-04-02 16:58:53 +0300
commitbe2cefb4868445ce0776c9b9e029cf3adfeaf804 (patch)
tree81a49763e5ec310296a4bee681e59ff83ed793a2 /juick-www/src/main/java/com/juick
parent5b5ca32a22e2e8e95c9bca86ce23d19c4a69f83d (diff)
www: start xmpp from bootRun
Diffstat (limited to 'juick-www/src/main/java/com/juick')
-rw-r--r--juick-www/src/main/java/com/juick/Application.java7
-rw-r--r--juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java2
2 files changed, 7 insertions, 2 deletions
diff --git a/juick-www/src/main/java/com/juick/Application.java b/juick-www/src/main/java/com/juick/Application.java
index cb132ae9..586c3e59 100644
--- a/juick-www/src/main/java/com/juick/Application.java
+++ b/juick-www/src/main/java/com/juick/Application.java
@@ -1,5 +1,9 @@
package com.juick;
+import com.juick.server.CommandsManager;
+import com.juick.server.XMPPConnection;
+import com.juick.server.XMPPServer;
+import com.juick.server.xmpp.router.XMPPRouter;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -19,6 +23,7 @@ public class Application extends SpringBootServletInitializer {
}
public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
+ SpringApplication.run(new Class[]{ Application.class, XMPPRouter.class, XMPPServer.class,
+ XMPPConnection.class, CommandsManager.class }, args);
}
}
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
index 909b6cd3..46fa7619 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
+++ b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
@@ -135,6 +135,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
public void configure(WebSecurity web) throws Exception {
web.debug(false);
- web.ignoring().antMatchers("/style.css*", "/scripts.js*");
+ web.ignoring().antMatchers("/style.css*", "/scripts.js*", "/h2-console");
}
}