aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Anatoliy Sablin2017-11-06 17:18:37 +0300
committerGravatar Anatoliy Sablin2017-11-06 17:18:37 +0300
commit7aadceb924c1b22351df5e0535a03edceb5047cf (patch)
tree4f7a1f611df7b996314142270f1858f0164f9d08
parentaec013888a71856b4ec5a3415c266cd07c0ba5c4 (diff)
Fixed configurations.juick-commands
-rw-r--r--juick-commands/build.gradle2
-rw-r--r--juick-commands/src/main/java/com/juick/command/CommandsConfiguration.java3
-rw-r--r--juick-commands/src/main/java/com/juick/command/Processor.java2
-rw-r--r--juick-server-web/build.gradle2
-rw-r--r--juick-xmpp/build.gradle2
-rw-r--r--juick-xmpp/src/main/java/com/juick/components/configuration/XmppInitializer.java3
6 files changed, 8 insertions, 6 deletions
diff --git a/juick-commands/build.gradle b/juick-commands/build.gradle
index c6dfff42..ca18aa52 100644
--- a/juick-commands/build.gradle
+++ b/juick-commands/build.gradle
@@ -7,7 +7,7 @@ repositories {
}
dependencies {
- compile project(':juick-server-core')
+ compile project(':juick-server-jdbc')
compile "org.springframework:spring-context-support:${rootProject.springFrameworkVersion}"
compile "org.projectlombok:lombok:1.16.14"
diff --git a/juick-commands/src/main/java/com/juick/command/CommandsConfiguration.java b/juick-commands/src/main/java/com/juick/command/CommandsConfiguration.java
index b6b9ea0d..a8f66653 100644
--- a/juick-commands/src/main/java/com/juick/command/CommandsConfiguration.java
+++ b/juick-commands/src/main/java/com/juick/command/CommandsConfiguration.java
@@ -1,8 +1,10 @@
package com.juick.command;
+import com.juick.configuration.DataConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
import java.util.Set;
@@ -10,6 +12,7 @@ import java.util.Set;
* @author ma1uta
*/
@Configuration
+@Import(DataConfiguration.class)
@ComponentScan(basePackages = {"com.juick.command"})
public class CommandsConfiguration {
diff --git a/juick-commands/src/main/java/com/juick/command/Processor.java b/juick-commands/src/main/java/com/juick/command/Processor.java
index bf46a758..f02e7c4b 100644
--- a/juick-commands/src/main/java/com/juick/command/Processor.java
+++ b/juick-commands/src/main/java/com/juick/command/Processor.java
@@ -6,7 +6,6 @@ import lombok.Setter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import java.util.Set;
import java.util.regex.Pattern;
@@ -14,7 +13,6 @@ import java.util.regex.Pattern;
/**
* @author ma1uta
*/
-@Component
@Getter
public class Processor {
diff --git a/juick-server-web/build.gradle b/juick-server-web/build.gradle
index ce761df8..b4163a27 100644
--- a/juick-server-web/build.gradle
+++ b/juick-server-web/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'war'
sourceCompatibility = 1.8
dependencies {
- compile project(':juick-commands')
+ compile project(':juick-server-core')
compile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
compile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle
index 791db3f5..7a560ffa 100644
--- a/juick-xmpp/build.gradle
+++ b/juick-xmpp/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'war'
apply plugin: 'org.akhikhl.gretty'
dependencies {
- compile project(':juick-server-jdbc')
+ compile project(':juick-commands')
compile project(':juick-server-web')
compile ('com.github.juick:com.juick.xmpp:a3c8ef3bd1') {
exclude group: 'xmlpull'
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 38dc05d4..ba581e44 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
@@ -17,6 +17,7 @@
package com.juick.components.configuration;
+import com.juick.command.CommandsConfiguration;
import com.juick.configuration.DataConfiguration;
import com.juick.server.configuration.StorageConfiguration;
import org.apache.commons.codec.CharEncoding;
@@ -32,7 +33,7 @@ public class XmppInitializer extends AbstractAnnotationConfigDispatcherServletIn
@Override
protected Class<?>[] getRootConfigClasses() {
- return new Class<?>[]{ XmppAppConfiguration.class, DataConfiguration.class, StorageConfiguration.class};
+ return new Class<?>[]{ XmppAppConfiguration.class, DataConfiguration.class, StorageConfiguration.class, CommandsConfiguration.class};
}
@Override