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

Fixed constructor of ConfigurationParser to do mergind of provided properties

Browse Source
This commit is contained in:
andrea
2015-03-14 17:31:11 +01:00
parent 34c668714a
commit 0aad3cbbf3
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.txt
+1
View File
@@ -7,6 +7,7 @@ Version 0.7:
Refactored the publish logic for QoS 1 2 to try to be more readable Refactored the publish logic for QoS 1 2 to try to be more readable
Added packetIdentifier storage and generation Added packetIdentifier storage and generation
Fixed issue #16, bad packetId for will messages with qos > 0 Fixed issue #16, bad packetId for will messages with qos > 0
Added store path variable "persistent_store" to configuration file (picked from Steven Warwick fork)
Version 0.6: Version 0.6:
Fix issue #42, bad password file path composition Fix issue #42, bad password file path composition
broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java
+7 -6
View File
@@ -46,13 +46,14 @@ class ConfigurationParser {
ConfigurationParser() { ConfigurationParser() {
createDefaults(); createDefaults();
} }
/**
* Crate a ConfigurationParser merging the default properties with the provided ones.
* */
ConfigurationParser(Properties properties) { ConfigurationParser(Properties properties) {
createDefaults(); this();
for (Entry<Object, Object> entrySet : m_properties.entrySet()) { for (Entry<Object, Object> entrySet : properties.entrySet()) {
if (properties.containsKey(entrySet.getKey())) { m_properties.put(entrySet.getKey(), entrySet.getValue());
entrySet.setValue(properties.get(entrySet.getKey()));
}
} }
} }
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java
+11 -3
View File
@@ -32,6 +32,8 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.TrustManagerFactory;
import org.eclipse.moquette.commons.*;
import org.eclipse.moquette.commons.Constants;
import org.eclipse.paho.client.mqttv3.IMqttClient; import org.eclipse.paho.client.mqttv3.IMqttClient;
import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttClientPersistence; import org.eclipse.paho.client.mqttv3.MqttClientPersistence;
@@ -71,14 +73,20 @@ public class ServerIntegrationSSLTest {
String file = getClass().getResource("/").getPath(); String file = getClass().getResource("/").getPath();
System.setProperty("moquette.path", file); System.setProperty("moquette.path", file);
m_server = new Server(); m_server = new Server();
m_server.startServer(new Properties());
Properties sslProps = new Properties();
sslProps.put(org.eclipse.moquette.commons.Constants.SSL_PORT_PROPERTY_NAME, "8883");
sslProps.put(org.eclipse.moquette.commons.Constants.JKS_PATH_PROPERTY_NAME, "serverkeystore.jks");
sslProps.put(org.eclipse.moquette.commons.Constants.KEY_STORE_PASSWORD_PROPERTY_NAME, "passw0rdsrv");
sslProps.put(Constants.KEY_MANAGER_PASSWORD_PROPERTY_NAME, "passw0rdsrv");
m_server.startServer(sslProps);
} }
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME); File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME);
assertFalse(String.format("The DB storagefile %s already exists",org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME), dbFile.exists()); assertFalse(String.format("The DB storage file %s already exists",org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME), dbFile.exists());
startServer(); startServer();
m_client = new MqttClient("ssl://localhost:8883", "TestClient", s_dataStore); m_client = new MqttClient("ssl://localhost:8883", "TestClient", s_dataStore);