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
ChangeLog.txt
+1
View File
@@ -5,6 +5,7 @@ Version 0.8:
Fixed issue #69
Fixed bug #68, UNSUBSCRIBE has to fail on bad topicFilter names
Fixed bug #81, on stop of moquette broker it doesn't shutdown due to no shutdown of ringbuffer used on the back of ProtocolProcessor
Moved config to be not only filesystem based, but also classpath and memory (fix issue #73)
Version 0.7:
Fix issue #38, added aligned to MQTT 3.1.1
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;
broker/src/test/java/org/eclipse/moquette/server/ConfigurationClassLoaderTest.java
+2 -5
View File
@@ -15,19 +15,16 @@
*/
package org.eclipse.moquette.server;
import org.fusesource.mqtt.client.*;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
import static org.eclipse.moquette.commons.Constants.AUTHENTICATOR_CLASS_NAME;
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java
+2
View File
@@ -15,6 +15,8 @@
*/
package org.eclipse.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.fusesource.mqtt.client.*;
import org.junit.After;
import org.junit.Before;
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java
+2 -3
View File
@@ -15,9 +15,10 @@
*/
package org.eclipse.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;
import org.fusesource.mqtt.client.QoS;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -30,8 +31,6 @@ import java.io.IOException;
import java.util.Properties;
import static org.eclipse.moquette.commons.Constants.*;
import static org.eclipse.moquette.commons.Constants.KEY_MANAGER_PASSWORD_PROPERTY_NAME;
import static org.eclipse.moquette.commons.Constants.KEY_STORE_PASSWORD_PROPERTY_NAME;
import static org.junit.Assert.*;
public class ServerIntegrationPahoTest {
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java
+2
View File
@@ -16,6 +16,8 @@
package org.eclipse.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.eclipse.paho.client.mqttv3.IMqttClient;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttClientPersistence;
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java
+2
View File
@@ -18,6 +18,8 @@ package org.eclipse.moquette.server;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.moquette.commons.Constants;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java
+2
View File
@@ -19,6 +19,8 @@ import org.eclipse.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
import org.eclipse.moquette.proto.messages.ConnAckMessage;
import org.eclipse.moquette.proto.messages.ConnectMessage;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.eclipse.moquette.testclient.Client;
import org.fusesource.mqtt.client.*;
import org.junit.After;
broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java
+2
View File
@@ -15,6 +15,8 @@
*/
package org.eclipse.moquette.server;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.config.MemoryConfig;
import org.fusesource.mqtt.client.*;
import org.junit.After;
import org.junit.Before;
broker/src/test/java/org/eclipse/moquette/server/ConfigurationParserTest.java → broker/src/test/java/org/eclipse/moquette/server/config/ConfigurationParserTest.java
+2 -1
View File
@@ -13,8 +13,9 @@
*
* 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.eclipse.moquette.server.config.ConfigurationParser;
import org.junit.Before;
import org.junit.Test;
embedding_moquette/src/main/java/org/eclipse/moquette/testembedded/EmbeddedLauncher.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.eclipse.moquette.testembedded;
import org.eclipse.moquette.server.ClasspathConfig;
import org.eclipse.moquette.server.IConfig;
import org.eclipse.moquette.server.config.ClasspathConfig;
import org.eclipse.moquette.server.config.IConfig;
import org.eclipse.moquette.server.Server;
import java.io.IOException;