aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-06-28 11:09:57 +0300
committerGravatar Vitaly Takmazov2016-06-28 11:09:57 +0300
commita3b1c3f5ea8248ab9060bc773aa819ca4b090bee (patch)
tree7216dcee52f985f1e789414050804f7f1b0dd66e
parent331645f0fd7fbe7d9679d39dcce453cc3b2cab6e (diff)
configure webmvc
-rw-r--r--build.gradle2
-rw-r--r--src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java5
-rw-r--r--src/main/java/com/juick/ws/configuration/WebsocketInitializer.java33
3 files changed, 39 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle
index 92b44bec..7f0bbe52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,10 @@ dependencies {
compile server
compile xmpp
compile json
+ providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
def springFrameworkVersion = '4.3.0.RELEASE'
compile "org.springframework:spring-jdbc:${springFrameworkVersion}"
+ compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
compile "org.springframework:spring-websocket:${springFrameworkVersion}"
compile 'javax.inject:javax.inject:1'
compile 'org.apache.httpcomponents:httpclient:4.5.1'
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index a56e56f5..a298d0a0 100644
--- a/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -9,6 +9,8 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.web.socket.config.annotation.EnableWebSocket;
import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
@@ -20,10 +22,11 @@ import javax.inject.Inject;
* Created by vitalyster on 28.06.2016.
*/
@Configuration
+@EnableWebMvc
@EnableWebSocket
@ComponentScan(basePackages = {"com.juick"})
@PropertySource("classpath:juick.conf")
-public class WebsocketConfiguration implements WebSocketConfigurer {
+public class WebsocketConfiguration extends WebMvcConfigurerAdapter implements WebSocketConfigurer {
@Inject
Environment env;
diff --git a/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java b/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
new file mode 100644
index 00000000..89017f8b
--- /dev/null
+++ b/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
@@ -0,0 +1,33 @@
+package com.juick.ws.configuration;
+import org.springframework.web.filter.CharacterEncodingFilter;
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
+
+import javax.servlet.Filter;
+
+/**
+ * Created by vt on 09/02/16.
+ */
+public class WebsocketInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
+ @Override
+ protected Class<?>[] getRootConfigClasses() {
+ return new Class[] {WebsocketConfiguration.class};
+ }
+
+ @Override
+ protected Class<?>[] getServletConfigClasses() {
+ return null;
+ }
+
+ @Override
+ protected String[] getServletMappings() {
+ return new String[] {
+ "/"
+ };
+ }
+ @Override
+ protected Filter[] getServletFilters() {
+ CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
+ characterEncodingFilter.setEncoding("UTF-8");
+ return new Filter[] { characterEncodingFilter};
+ }
+}