You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/12/07 11:54:59 UTC
svn commit: r1643660 - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
broker-codegen/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/
broker-core/src/main/java/org/...
Author: rgodfrey
Date: Sun Dec 7 10:54:59 2014
New Revision: 1643660
URL: http://svn.apache.org/r1643660
Log:
QPID-6263 : [Java Broker] Remove knowledge of BrokerOptions from SystemConfig and simply use attributes instead
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java
qpid/trunk/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Modified: qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java Sun Dec 7 10:54:59 2014
@@ -20,7 +20,8 @@
*/
package org.apache.qpid.server.store.berkeleydb;
-import org.apache.qpid.server.BrokerOptions;
+import java.util.Map;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
@@ -49,10 +50,10 @@ public class BDBSystemConfigImpl extends
public BDBSystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final BrokerOptions brokerOptions,
+ final Map<String,Object> attributes,
final BrokerShutdownProvider brokerShutdownProvider)
{
- super(taskExecutor, eventLogger, logRecorder, brokerOptions, brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes, brokerShutdownProvider);
}
@Override
Modified: qpid/trunk/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java (original)
+++ qpid/trunk/qpid/java/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java Sun Dec 7 10:54:59 2014
@@ -113,7 +113,8 @@ public class SystemConfigFactoryGenerato
pw.println(";");
pw.println();
- pw.println("import org.apache.qpid.server.BrokerOptions;");
+ pw.println("import java.util.Map;");
+ pw.println();
pw.println("import org.apache.qpid.server.configuration.updater.TaskExecutor;");
pw.println("import org.apache.qpid.server.logging.EventLogger;");
pw.println("import org.apache.qpid.server.logging.LogRecorder;");
@@ -140,10 +141,10 @@ public class SystemConfigFactoryGenerato
pw.println(" public "+objectSimpleName+" newInstance(final TaskExecutor taskExecutor,");
pw.println(" final EventLogger eventLogger,");
pw.println(" final LogRecorder logRecorder,");
- pw.println(" final BrokerOptions brokerOptions,");
+ pw.println(" final Map<String,Object> attributes,");
pw.println(" final BrokerShutdownProvider brokerShutdownProvider)");
pw.println(" {");
- pw.println(" return new "+objectSimpleName+"(taskExecutor, eventLogger, logRecorder, brokerOptions, brokerShutdownProvider);");
+ pw.println(" return new "+objectSimpleName+"(taskExecutor, eventLogger, logRecorder, attributes, brokerShutdownProvider);");
pw.println(" }");
pw.println("}");
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java Sun Dec 7 10:54:59 2014
@@ -193,7 +193,7 @@ public class Broker implements BrokerShu
LogRecorder logRecorder = new LogRecorder();
_taskExecutor.start();
- _systemConfig = configFactory.newInstance(_taskExecutor, _eventLogger, logRecorder, options, this);
+ _systemConfig = configFactory.newInstance(_taskExecutor, _eventLogger, logRecorder, options.convertToSystemConfigAttributes(), this);
_systemConfig.open();
_store = _systemConfig.getConfigurationStore();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java Sun Dec 7 10:54:59 2014
@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentMa
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.util.StringUtil;
public class BrokerOptions
@@ -80,12 +81,21 @@ public class BrokerOptions
private Map<String, String> _configProperties = new HashMap<String,String>();
private String _initialSystemProperties;
- public Map<String, Object> convertToSystemAttributes()
+ public Map<String, Object> convertToSystemConfigAttributes()
{
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put("storePath", getConfigurationStoreLocation());
attributes.put(ConfiguredObject.CONTEXT, getConfigProperties());
+
+ attributes.put(SystemConfig.MANAGEMENT_MODE, _managementMode);
+ attributes.put(SystemConfig.MANAGEMENT_MODE_QUIESCE_VIRTUAL_HOSTS, _managementModeQuiesceVhosts);
+ attributes.put(SystemConfig.MANAGEMENT_MODE_RMI_PORT_OVERRIDE, _managementModeRmiPortOverride);
+ attributes.put(SystemConfig.MANAGEMENT_MODE_JMX_PORT_OVERRIDE, _managementModeJmxPortOverride);
+ attributes.put(SystemConfig.MANAGEMENT_MODE_HTTP_PORT_OVERRIDE, _managementModeHttpPortOverride);
+ attributes.put(SystemConfig.MANAGEMENT_MODE_PASSWORD, _managementModePassword);
+ attributes.put(SystemConfig.INITIAL_CONFIGURATION_LOCATION, getInitialConfigurationLocation());
+
return attributes;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java Sun Dec 7 10:54:59 2014
@@ -30,7 +30,6 @@ import java.util.UUID;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -40,6 +39,7 @@ import org.apache.qpid.server.model.Mode
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.adapter.BrokerAdapter;
import org.apache.qpid.server.store.ConfiguredObjectRecord;
@@ -62,14 +62,14 @@ public class ManagementModeStoreHandler
private final DurableConfigurationStore _store;
private Map<UUID, ConfiguredObjectRecord> _cliEntries;
private Map<UUID, Object> _quiescedEntriesOriginalState;
- private final BrokerOptions _options;
+ private final SystemConfig<?> _systemConfig;
private ConfiguredObject<?> _parent;
private HashMap<UUID, ConfiguredObjectRecord> _records;
public ManagementModeStoreHandler(DurableConfigurationStore store,
- BrokerOptions options)
+ SystemConfig<?> systemConfig)
{
- _options = options;
+ _systemConfig = systemConfig;
_store = store;
}
@@ -82,16 +82,16 @@ public class ManagementModeStoreHandler
_parent = parent;
_store.openConfigurationStore(parent, overwrite, initialRecords);
- _quiescedEntriesOriginalState = quiesceEntries(_options);
+ _quiescedEntriesOriginalState = quiesceEntries(_systemConfig);
_records = new HashMap<UUID, ConfiguredObjectRecord>();
final ConfiguredObjectRecordHandler localRecoveryHandler = new ConfiguredObjectRecordHandler()
{
private int _version;
- private boolean _quiesceRmiPort = _options.getManagementModeRmiPortOverride() > 0;
- private boolean _quiesceJmxPort = _options.getManagementModeJmxPortOverride() > 0;
- private boolean _quiesceHttpPort = _options.getManagementModeHttpPortOverride() > 0;
+ private boolean _quiesceRmiPort = _systemConfig.getManagementModeRmiPortOverride() > 0;
+ private boolean _quiesceJmxPort = _systemConfig.getManagementModeJmxPortOverride() > 0;
+ private boolean _quiesceHttpPort = _systemConfig.getManagementModeHttpPortOverride() > 0;
@Override
public void begin()
@@ -104,7 +104,7 @@ public class ManagementModeStoreHandler
String entryType = object.getType();
Map<String, Object> attributes = object.getAttributes();
boolean quiesce = false;
- if (VIRTUAL_HOST_TYPE.equals(entryType) && _options.isManagementModeQuiesceVirtualHosts())
+ if (VIRTUAL_HOST_TYPE.equals(entryType) && _systemConfig.isManagementModeQuiesceVirtualHosts())
{
quiesce = true;
}
@@ -174,7 +174,7 @@ public class ManagementModeStoreHandler
_store.visitConfiguredObjectRecords(localRecoveryHandler);
- _cliEntries = createPortsFromCommandLineOptions(_options);
+ _cliEntries = createPortsFromCommandLineOptions(_systemConfig);
for(ConfiguredObjectRecord entry : _cliEntries.values())
{
@@ -293,7 +293,7 @@ public class ManagementModeStoreHandler
}
}
- private Map<UUID, ConfiguredObjectRecord> createPortsFromCommandLineOptions(BrokerOptions options)
+ private Map<UUID, ConfiguredObjectRecord> createPortsFromCommandLineOptions(SystemConfig<?> options)
{
int managementModeRmiPortOverride = options.getManagementModeRmiPortOverride();
if (managementModeRmiPortOverride < 0)
@@ -369,7 +369,7 @@ public class ManagementModeStoreHandler
}
- private Map<UUID, Object> quiesceEntries(final BrokerOptions options)
+ private Map<UUID, Object> quiesceEntries(final SystemConfig<?> options)
{
final Map<UUID, Object> quiescedEntries = new HashMap<UUID, Object>();
final int managementModeRmiPortOverride = options.getManagementModeRmiPortOverride();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java Sun Dec 7 10:54:59 2014
@@ -31,7 +31,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.store.ManagementModeStoreHandler;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -48,24 +47,44 @@ public abstract class AbstractSystemConf
private static final UUID SYSTEM_ID = new UUID(0l, 0l);
private final EventLogger _eventLogger;
private final LogRecorder _logRecorder;
- private final BrokerOptions _brokerOptions;
private final BrokerShutdownProvider _brokerShutdownProvider;
private DurableConfigurationStore _configurationStore;
+ @ManagedAttributeField
+ private boolean _managementMode;
+
+ @ManagedAttributeField
+ private int _managementModeRmiPortOverride;
+
+ @ManagedAttributeField
+ private int _managementModeJmxPortOverride;
+
+ @ManagedAttributeField
+ private int _managementModeHttpPortOverride;
+
+ @ManagedAttributeField
+ private boolean _managementModeQuiesceVirtualHosts;
+
+ @ManagedAttributeField
+ private String _managementModePassword;
+
+ @ManagedAttributeField
+ private String _initialConfigurationLocation;
+
+
public AbstractSystemConfig(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final BrokerOptions brokerOptions,
+ final Map<String,Object> attributes,
final BrokerShutdownProvider brokerShutdownProvider)
{
super(parentsMap(),
- updateAttributes(brokerOptions.convertToSystemAttributes()),
+ updateAttributes(attributes),
taskExecutor, BrokerModel.getInstance());
_eventLogger = eventLogger;
getTaskExecutor().start();
_logRecorder = logRecorder;
- _brokerOptions = brokerOptions;
_brokerShutdownProvider = brokerShutdownProvider;
}
@@ -101,12 +120,6 @@ public abstract class AbstractSystemConf
}
@Override
- public BrokerOptions getBrokerOptions()
- {
- return _brokerOptions;
- }
-
- @Override
protected void onClose()
{
try
@@ -155,16 +168,16 @@ public abstract class AbstractSystemConf
super.onOpen();
_configurationStore = createStoreObject();
- if (_brokerOptions.isManagementMode())
+ if (isManagementMode())
{
- _configurationStore = new ManagementModeStoreHandler(_configurationStore, _brokerOptions);
+ _configurationStore = new ManagementModeStoreHandler(_configurationStore, this);
}
try
{
_configurationStore.openConfigurationStore(this,
false,
- convertToConfigurationRecords(_brokerOptions.getInitialConfigurationLocation(),
+ convertToConfigurationRecords(getInitialConfigurationLocation(),
this));
_configurationStore.upgradeStoreStructure();
}
@@ -216,6 +229,48 @@ public abstract class AbstractSystemConf
}
@Override
+ public boolean isManagementMode()
+ {
+ return _managementMode;
+ }
+
+ @Override
+ public int getManagementModeRmiPortOverride()
+ {
+ return _managementModeRmiPortOverride;
+ }
+
+ @Override
+ public int getManagementModeJmxPortOverride()
+ {
+ return _managementModeJmxPortOverride;
+ }
+
+ @Override
+ public int getManagementModeHttpPortOverride()
+ {
+ return _managementModeHttpPortOverride;
+ }
+
+ @Override
+ public boolean isManagementModeQuiesceVirtualHosts()
+ {
+ return _managementModeQuiesceVirtualHosts;
+ }
+
+ @Override
+ public String getManagementModePassword()
+ {
+ return _managementModePassword;
+ }
+
+ @Override
+ public String getInitialConfigurationLocation()
+ {
+ return _initialConfigurationLocation;
+ }
+
+ @Override
public BrokerShutdownProvider getBrokerShutdownProvider()
{
return _brokerShutdownProvider;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java Sun Dec 7 10:54:59 2014
@@ -20,7 +20,8 @@
*/
package org.apache.qpid.server.model;
-import org.apache.qpid.server.BrokerOptions;
+import java.util.Map;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
@@ -38,10 +39,10 @@ public class JsonSystemConfigImpl extend
public JsonSystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final BrokerOptions brokerOptions,
+ final Map<String,Object> attributes,
final BrokerShutdownProvider brokerShutdownProvider)
{
- super(taskExecutor, eventLogger, logRecorder, brokerOptions, brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes, brokerShutdownProvider);
}
public String getStorePath()
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java Sun Dec 7 10:54:59 2014
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.model;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.store.DurableConfigurationStore;
@@ -28,9 +27,38 @@ import org.apache.qpid.server.store.Dura
@ManagedObject (creatable = false)
public interface SystemConfig<X extends SystemConfig<X>> extends ConfiguredObject<X>
{
- EventLogger getEventLogger();
+ String MANAGEMENT_MODE = "managementMode";
+
+ String MANAGEMENT_MODE_QUIESCE_VIRTUAL_HOSTS = "managementModeQuiesceVirtualHosts";
+ String MANAGEMENT_MODE_RMI_PORT_OVERRIDE = "managementModeRmiPortOverride";
+ String MANAGEMENT_MODE_JMX_PORT_OVERRIDE = "managementModeJmxPortOverride";
+ String MANAGEMENT_MODE_HTTP_PORT_OVERRIDE = "managementModeHttpPortOverride";
+ String MANAGEMENT_MODE_PASSWORD = "managementModePassword";
+ String INITIAL_CONFIGURATION_LOCATION = "initialConfigurationLocation";
+
+ @ManagedAttribute(defaultValue = "false")
+ boolean isManagementMode();
+
+ @ManagedAttribute(defaultValue = "0")
+ int getManagementModeRmiPortOverride();
+
+ @ManagedAttribute(defaultValue = "0")
+ int getManagementModeJmxPortOverride();
+
+ @ManagedAttribute(defaultValue = "0")
+ int getManagementModeHttpPortOverride();
+
+ @ManagedAttribute(defaultValue = "false")
+ boolean isManagementModeQuiesceVirtualHosts();
+
+ @ManagedAttribute(secure = true)
+ String getManagementModePassword();
+
+ @ManagedAttribute
+ String getInitialConfigurationLocation();
- BrokerOptions getBrokerOptions();
+
+ EventLogger getEventLogger();
Broker getBroker();
@@ -39,4 +67,5 @@ public interface SystemConfig<X extends
DurableConfigurationStore getConfigurationStore();
BrokerShutdownProvider getBrokerShutdownProvider();
+
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Sun Dec 7 10:54:59 2014
@@ -71,13 +71,13 @@ public class BrokerAdapter extends Abstr
CONNECTION_HEART_BEAT_DELAY, STATISTICS_REPORTING_PERIOD };
+ private SystemConfig<?> _parent;
private EventLogger _eventLogger;
private final LogRecorder _logRecorder;
private final SecurityManager _securityManager;
private AuthenticationProvider<?> _managementModeAuthenticationProvider;
- private BrokerOptions _brokerOptions;
private Timer _reportingTimer;
private final StatisticsCounter _messagesDelivered, _dataDelivered, _messagesReceived, _dataReceived;
@@ -108,18 +108,17 @@ public class BrokerAdapter extends Abstr
SystemConfig parent)
{
super(parentsMap(parent), attributes);
-
+ _parent = parent;
_logRecorder = parent.getLogRecorder();
_eventLogger = parent.getEventLogger();
- _brokerOptions = parent.getBrokerOptions();
- _securityManager = new SecurityManager(this, _brokerOptions.isManagementMode());
- if (_brokerOptions.isManagementMode())
+ _securityManager = new SecurityManager(this, parent.isManagementMode());
+ if (parent.isManagementMode())
{
Map<String,Object> authManagerAttrs = new HashMap<String, Object>();
authManagerAttrs.put(NAME,"MANAGEMENT_MODE_AUTHENTICATION");
authManagerAttrs.put(ID, UUID.randomUUID());
SimpleAuthenticationManager authManager = new SimpleAuthenticationManager(authManagerAttrs, this);
- authManager.addUser(BrokerOptions.MANAGEMENT_MODE_USER_NAME, _brokerOptions.getManagementModePassword());
+ authManager.addUser(BrokerOptions.MANAGEMENT_MODE_USER_NAME, _parent.getManagementModePassword());
_managementModeAuthenticationProvider = authManager;
}
_messagesDelivered = new StatisticsCounter("messages-delivered");
@@ -230,7 +229,7 @@ public class BrokerAdapter extends Abstr
@StateTransition( currentState = State.UNINITIALIZED, desiredState = State.ACTIVE )
private void activate()
{
- if(_brokerOptions.isManagementMode())
+ if(_parent.isManagementMode())
{
_managementModeAuthenticationProvider.open();
}
@@ -263,7 +262,7 @@ public class BrokerAdapter extends Abstr
}
final boolean brokerShutdownOnErroredChild = getContextValue(Boolean.class, BROKER_FAIL_STARTUP_WITH_ERRORED_CHILD);
- if (!_brokerOptions.isManagementMode() && brokerShutdownOnErroredChild && hasBrokerAnyErroredChildren)
+ if (!_parent.isManagementMode() && brokerShutdownOnErroredChild && hasBrokerAnyErroredChildren)
{
throw new IllegalStateException(String.format("Broker context variable %s is set and the broker has %s children",
BROKER_FAIL_STARTUP_WITH_ERRORED_CHILD, State.ERRORED));
@@ -274,7 +273,7 @@ public class BrokerAdapter extends Abstr
if (isManagementMode())
{
_eventLogger.message(BrokerMessages.MANAGEMENT_MODE(BrokerOptions.MANAGEMENT_MODE_USER_NAME,
- _brokerOptions.getManagementModePassword()));
+ _parent.getManagementModePassword()));
}
setState(State.ACTIVE);
}
@@ -939,7 +938,7 @@ public class BrokerAdapter extends Abstr
@Override
public boolean isManagementMode()
{
- return _brokerOptions.isManagementMode();
+ return _parent.isManagementMode();
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java Sun Dec 7 10:54:59 2014
@@ -20,7 +20,8 @@
*/
package org.apache.qpid.server.plugin;
-import org.apache.qpid.server.BrokerOptions;
+import java.util.Map;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
@@ -32,6 +33,6 @@ public interface SystemConfigFactory<X e
public X newInstance(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final BrokerOptions brokerOptions,
+ final Map<String,Object> options,
final BrokerShutdownProvider brokerShutdownProvider);
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java Sun Dec 7 10:54:59 2014
@@ -34,7 +34,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -46,6 +45,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.JsonSystemConfigImpl;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
@@ -79,7 +79,7 @@ public class ManagementModeStoreHandlerT
_taskExecutor.start();
_systemConfig = new JsonSystemConfigImpl(_taskExecutor, mock(EventLogger.class),
- mock(LogRecorder.class), new BrokerOptions(),
+ mock(LogRecorder.class), new BrokerOptions().convertToSystemConfigAttributes(),
mock(BrokerShutdownProvider.class));
@@ -111,15 +111,29 @@ public class ManagementModeStoreHandlerT
}
).when(_store).visitConfiguredObjectRecords(recovererArgumentCaptor.capture());
_options = new BrokerOptions();
- _handler = new ManagementModeStoreHandler(_store, _options);
+
+ _handler = new ManagementModeStoreHandler(_store, _systemConfig);;
_handler.openConfigurationStore(_systemConfig, false);
}
+ private ManagementModeStoreHandler createManagementModeStoreHandler()
+ {
+ _systemConfig.close();
+ _systemConfig = new JsonSystemConfigImpl(_taskExecutor,
+ mock(EventLogger.class),
+ mock(LogRecorder.class),
+ _options.convertToSystemConfigAttributes(),
+ mock(BrokerShutdownProvider.class));
+ _systemConfig.open();
+ return new ManagementModeStoreHandler(_store, _systemConfig);
+ }
+
@Override
public void tearDown() throws Exception
{
_taskExecutor.stop();
+ _systemConfig.close();
super.tearDown();
}
@@ -154,7 +168,7 @@ public class ManagementModeStoreHandlerT
public void testGetRootEntryWithHttpPortOverriden()
{
_options.setManagementModeHttpPortOverride(9090);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
ConfiguredObjectRecord root = getRootEntry();
assertEquals("Unexpected root id", _rootId, root.getId());
@@ -166,7 +180,7 @@ public class ManagementModeStoreHandlerT
public void testGetRootEntryWithRmiPortOverriden()
{
_options.setManagementModeRmiPortOverride(9090);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
ConfiguredObjectRecord root = getRootEntry();
@@ -179,7 +193,7 @@ public class ManagementModeStoreHandlerT
public void testGetRootEntryWithConnectorPortOverriden()
{
_options.setManagementModeJmxPortOverride(9090);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
ConfiguredObjectRecord root = getRootEntry();
@@ -194,7 +208,7 @@ public class ManagementModeStoreHandlerT
_options.setManagementModeHttpPortOverride(1000);
_options.setManagementModeRmiPortOverride(2000);
_options.setManagementModeJmxPortOverride(3000);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
ConfiguredObjectRecord root = getRootEntry();
@@ -222,7 +236,7 @@ public class ManagementModeStoreHandlerT
public void testGetEntryByCLIConnectorPortId()
{
_options.setManagementModeJmxPortOverride(9090);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
@@ -234,7 +248,7 @@ public class ManagementModeStoreHandlerT
public void testGetEntryByCLIHttpPortId()
{
_options.setManagementModeHttpPortOverride(9090);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
@@ -249,7 +263,7 @@ public class ManagementModeStoreHandlerT
attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.HTTP));
when(_portEntry.getAttributes()).thenReturn(attributes);
_options.setManagementModeHttpPortOverride(9090);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
@@ -263,7 +277,7 @@ public class ManagementModeStoreHandlerT
attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI));
when(_portEntry.getAttributes()).thenReturn(attributes);
_options.setManagementModeRmiPortOverride(9090);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
@@ -277,7 +291,7 @@ public class ManagementModeStoreHandlerT
attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.JMX_RMI));
when(_portEntry.getAttributes()).thenReturn(attributes);
_options.setManagementModeRmiPortOverride(9090);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
@@ -328,7 +342,7 @@ public class ManagementModeStoreHandlerT
_options.setManagementModeQuiesceVirtualHosts(mmQuiesceVhosts);
}
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
ConfiguredObjectRecord hostEntry = getEntry(virtualHostId);
@@ -354,7 +368,7 @@ public class ManagementModeStoreHandlerT
_options.setManagementModeHttpPortOverride(1000);
_options.setManagementModeRmiPortOverride(2000);
_options.setManagementModeJmxPortOverride(3000);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
Map<String, Object> attributes = new HashMap<String, Object>();
@@ -371,7 +385,7 @@ public class ManagementModeStoreHandlerT
_options.setManagementModeHttpPortOverride(1000);
_options.setManagementModeRmiPortOverride(2000);
_options.setManagementModeJmxPortOverride(3000);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
ConfiguredObjectRecord root = getRootEntry();
@@ -386,7 +400,7 @@ public class ManagementModeStoreHandlerT
public void testSaveCLIHttpPort()
{
_options.setManagementModeHttpPortOverride(1000);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
UUID portId = getOptionsPortId();
@@ -410,7 +424,7 @@ public class ManagementModeStoreHandlerT
public void testRemove()
{
_options.setManagementModeHttpPortOverride(1000);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
ConfiguredObjectRecord record = new ConfiguredObjectRecord()
@@ -446,7 +460,7 @@ public class ManagementModeStoreHandlerT
public void testRemoveCLIPort()
{
_options.setManagementModeHttpPortOverride(1000);
- _handler = new ManagementModeStoreHandler(_store, _options);
+ _handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
UUID portId = getOptionsPortId();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java Sun Dec 7 10:54:59 2014
@@ -69,7 +69,7 @@ public class BrokerRecovererTest extends
_brokerShutdownProvider = mock(BrokerShutdownProvider.class);
_systemConfig = new JsonSystemConfigImpl(_taskExecutor,
mock(EventLogger.class), mock(LogRecorder.class),
- new BrokerOptions(),
+ new BrokerOptions().convertToSystemConfigAttributes(),
_brokerShutdownProvider);
when(_brokerEntry.getId()).thenReturn(_brokerId);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java Sun Dec 7 10:54:59 2014
@@ -81,7 +81,7 @@ public class BrokerStoreUpgraderAndRecov
_systemConfig = new JsonSystemConfigImpl(_taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- new BrokerOptions(),
+ new BrokerOptions().convertToSystemConfigAttributes(),
mock(BrokerShutdownProvider.class));
}
Modified: qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java Sun Dec 7 10:54:59 2014
@@ -20,7 +20,8 @@
*/
package org.apache.qpid.server.store.derby;
-import org.apache.qpid.server.BrokerOptions;
+import java.util.Map;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
@@ -48,10 +49,10 @@ public class DerbySystemConfigImpl exten
public DerbySystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final BrokerOptions brokerOptions,
+ final Map<String,Object> attributes,
final BrokerShutdownProvider brokerShutdownProvider)
{
- super(taskExecutor, eventLogger, logRecorder, brokerOptions, brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes, brokerShutdownProvider);
}
@Override
Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java Sun Dec 7 10:54:59 2014
@@ -20,7 +20,8 @@
*/
package org.apache.qpid.server.store.jdbc;
-import org.apache.qpid.server.BrokerOptions;
+import java.util.Map;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
@@ -50,10 +51,10 @@ public class JDBCSystemConfigImpl extend
public JDBCSystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final BrokerOptions brokerOptions,
+ final Map<String,Object> attributes,
final BrokerShutdownProvider brokerShutdownProvider)
{
- super(taskExecutor, eventLogger, logRecorder, brokerOptions, brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes, brokerShutdownProvider);
}
@Override
Modified: qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java Sun Dec 7 10:54:59 2014
@@ -20,7 +20,8 @@
*/
package org.apache.qpid.server.store;
-import org.apache.qpid.server.BrokerOptions;
+import java.util.Map;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
@@ -40,10 +41,10 @@ public class MemorySystemConfigImpl exte
public MemorySystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final BrokerOptions brokerOptions,
+ final Map<String,Object> attributes,
final BrokerShutdownProvider brokerShutdownProvider)
{
- super(taskExecutor, eventLogger, logRecorder, brokerOptions, brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes, brokerShutdownProvider);
}
@Override
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1643660&r1=1643659&r2=1643660&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Sun Dec 7 10:54:59 2014
@@ -108,7 +108,7 @@ public class TestBrokerConfiguration
final AbstractSystemConfig parentObject = new JsonSystemConfigImpl(taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- brokerOptions,
+ brokerOptions.convertToSystemConfigAttributes(),
mock(BrokerShutdownProvider.class));
ConfiguredObjectRecordConverter converter = new ConfiguredObjectRecordConverter(BrokerModel.getInstance());
@@ -219,7 +219,7 @@ public class TestBrokerConfiguration
final SystemConfig parentObject = configFactory.newInstance(_taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- brokerOptions,
+ brokerOptions.convertToSystemConfigAttributes(),
mock(BrokerShutdownProvider.class));
parentObject.open();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org