From a661a94d8007a9c1b16604cdaf820d2e82033432 Mon Sep 17 00:00:00 2001 From: swarwick Date: Wed, 11 Mar 2015 11:15:16 -0400 Subject: [PATCH] Missed hard coded name replacement --- .../java/org/eclipse/moquette/spi/impl/SimpleMessaging.java | 4 ++-- .../src/main/java/org/eclipse/moquette/commons/Constants.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java index 859acb22..7a131d78 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java +++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java @@ -173,7 +173,7 @@ public class SimpleMessaging implements IMessaging, EventHandler { benchmarkEnabled = Boolean.parseBoolean(System.getProperty("moquette.processor.benchmark", "false")); //TODO use a property to select the storage path - MapDBPersistentStore mapStorage = new MapDBPersistentStore(props.getProperty("persistent_store", "")); + MapDBPersistentStore mapStorage = new MapDBPersistentStore(props.getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME, "")); m_storageService = mapStorage; m_sessionsStore = mapStorage; @@ -183,7 +183,7 @@ public class SimpleMessaging implements IMessaging, EventHandler { //subscriptions.init(storedSubscriptions); subscriptions.init(m_sessionsStore); - String passwdPath = props.getProperty("password_file", ""); + String passwdPath = props.getProperty(org.eclipse.moquette.commons.Constants.PASSWORD_FILE_PROPERTY_NAME, ""); String configPath = System.getProperty("moquette.path", null); IAuthenticator authenticator; if (passwdPath.isEmpty()) { diff --git a/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java b/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java index 32babe21..fbb49d96 100644 --- a/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java +++ b/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java @@ -27,7 +27,7 @@ public class Constants { public static final int DEFAULT_CONNECT_TIMEOUT = 10; public static final String DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME = "moquette_store.mapdb"; public static final String DEFAULT_PERSISTENT_PATH = System.getProperty("user.home") + File.separator + DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME; - public static final String PERSISTENT_STORE_PROPERTY_NAME = "persistence_store"; + public static final String PERSISTENT_STORE_PROPERTY_NAME = "persistent_store"; public static final String PASSWORD_FILE_PROPERTY_NAME = "password_file"; public static final String PORT_PROPERTY_NAME = "port"; public static final String HOST_PROPERTY_NAME = "host";