diff options
Diffstat (limited to 'juick-xmpp')
4 files changed, 5 insertions, 46 deletions
diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle index cd0e6ec2..e74f1e9b 100644 --- a/juick-xmpp/build.gradle +++ b/juick-xmpp/build.gradle @@ -4,13 +4,8 @@ apply plugin: 'org.akhikhl.gretty' dependencies { compile project(':juick-server-jdbc') + compile project(':juick-server-web') compile 'com.github.juick:com.juick.xmpp:483936e0bd' - compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}" - compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}" - compile 'javax.inject:javax.inject:1' - compile 'org.apache.httpcomponents:httpclient:4.5.3' - compile 'org.apache.commons:commons-dbcp2:2.1.1' - providedRuntime 'mysql:mysql-connector-java:5.1.40' } compileJava.options.encoding = 'UTF-8' diff --git a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java index 35de10f6..956b5bce 100644 --- a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java +++ b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppAppConfiguration.java @@ -10,10 +10,7 @@ import com.juick.components.s2s.CleaningUp; import com.juick.components.s2s.JuickBot; import com.juick.configuration.DataConfiguration; import org.apache.commons.lang3.BooleanUtils; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.PropertySource; +import org.springframework.context.annotation.*; import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.EnableScheduling; @@ -22,6 +19,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @Configuration +@ComponentScan(basePackages = {"com.juick.components.controllers"}) @PropertySource("classpath:juick.conf") @Import(DataConfiguration.class) @EnableScheduling diff --git a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java index ac33acc5..b7c096db 100644 --- a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java +++ b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java @@ -1,5 +1,6 @@ package com.juick.components.configuration; +import com.juick.server.configuration.BaseWebConfiguration; import org.apache.commons.codec.CharEncoding; import org.springframework.web.filter.CharacterEncodingFilter; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; @@ -18,7 +19,7 @@ public class XmppInitializer extends AbstractAnnotationConfigDispatcherServletIn @Override protected Class<?>[] getServletConfigClasses() { - return new Class<?>[]{XmppMvcConfiguration.class}; + return new Class<?>[]{ BaseWebConfiguration.class}; } @Override diff --git a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppMvcConfiguration.java b/juick-xmpp/src/main/java/com/juick/components/configuration/XmppMvcConfiguration.java deleted file mode 100644 index 977496b8..00000000 --- a/juick-xmpp/src/main/java/com/juick/components/configuration/XmppMvcConfiguration.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.juick.components.configuration; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; - -import java.util.List; - -/** - * Created by vitalyster on 28.06.2016. - */ -@Configuration -@ComponentScan(basePackages = {"com.juick.components.controllers"}) -@PropertySource("classpath:juick.conf") -public class XmppMvcConfiguration extends WebMvcConfigurationSupport { - - @Override - protected void configureMessageConverters(List<HttpMessageConverter<?>> converters) { - Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder() - .serializationInclusion(JsonInclude.Include.NON_DEFAULT) - .serializationInclusion(JsonInclude.Include.NON_NULL) - .serializationInclusion(JsonInclude.Include.NON_ABSENT) - .serializationInclusion(JsonInclude.Include.NON_EMPTY); - MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(builder.build()); - converter.getObjectMapper().registerModule(new Jdk8Module()); - converters.add(converter); - super.configureMessageConverters(converters); - } -} |