anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved config part in its separate package

Browse Source
This commit is contained in:
andrea
2015-08-22 15:40:55 +02:00
parent 560559fad2
commit d8875dd8b9
19 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/eclipse/moquette/server/Server.java
+3
View File
@@ -15,6 +15,9 @@
*/
package org.eclipse.moquette.server;
import org.eclipse.moquette.server.config.FilesystemConfig;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.eclipse.moquette.server.netty.NettyAcceptor;
import org.eclipse.moquette.spi.impl.SimpleMessaging;
import org.slf4j.Logger;
broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.eclipse.moquette.server;
import java.io.IOException;
import java.util.Properties;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.spi.IMessaging;
/**
broker/src/main/java/org/eclipse/moquette/server/ClasspathConfig.java → broker/src/main/java/org/eclipse/moquette/server/config/ClasspathConfig.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package org.eclipse.moquette.server.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java → broker/src/main/java/org/eclipse/moquette/server/config/ConfigurationParser.java
+1 -2
View File
@@ -13,14 +13,13 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package org.eclipse.moquette.server.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.*;
import java.text.ParseException;
import java.util.Map.Entry;
import java.util.Properties;
import static org.eclipse.moquette.commons.Constants.*;
broker/src/main/java/org/eclipse/moquette/server/FilesystemConfig.java → broker/src/main/java/org/eclipse/moquette/server/config/FilesystemConfig.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package org.eclipse.moquette.server.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
broker/src/main/java/org/eclipse/moquette/server/IConfig.java → broker/src/main/java/org/eclipse/moquette/server/config/IConfig.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package org.eclipse.moquette.server.config;
/**
* Base interface for all configuration implementations (filesystem, memory or classpath)
broker/src/main/java/org/eclipse/moquette/server/MemoryConfig.java → broker/src/main/java/org/eclipse/moquette/server/config/MemoryConfig.java
+1 -1
View File
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.eclipse.moquette.server;
package org.eclipse.moquette.server.config;
import java.util.Map;
import java.util.Properties;
broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java
+1 -1
View File
@@ -48,7 +48,7 @@ import javax.net.ssl.SSLEngine;
import io.netty.util.concurrent.Future;
import org.eclipse.moquette.commons.Constants;
import org.eclipse.moquette.server.IConfig;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.spi.IMessaging;
import org.eclipse.moquette.parser.netty.MQTTDecoder;
import org.eclipse.moquette.parser.netty.MQTTEncoder;
broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java
+1 -3
View File
@@ -18,11 +18,10 @@ package org.eclipse.moquette.spi.impl;
import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.dsl.Disruptor;
import io.netty.util.internal.StringUtil;
import org.HdrHistogram.Histogram;
import org.eclipse.moquette.interception.InterceptHandler;
import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.server.IConfig;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.spi.impl.security.*;
import org.eclipse.moquette.server.ServerChannel;
import org.eclipse.moquette.spi.IMessagesStore;
@@ -43,7 +42,6 @@ import java.lang.reflect.Method;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;