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 2016/11/02 00:19:08 UTC
svn commit: r1767592 [2/2] - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/
broker-core/src/main/java/org/apache/qpid/server/configuration/
broker-core/src/main/jav...
Modified: qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java (original)
+++ qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java Wed Nov 2 00:19:08 2016
@@ -20,11 +20,14 @@
*/
package org.apache.qpid.server;
-import java.io.File;
+import static org.junit.Assert.assertNotEquals;
+
import java.util.Map;
import org.apache.commons.cli.CommandLine;
+
import org.apache.qpid.server.configuration.BrokerProperties;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.test.utils.QpidTestCase;
/**
@@ -43,43 +46,29 @@ public class MainTest extends QpidTestCa
String qpidHome = "/qpid/home";
setTestSystemProperty(BrokerProperties.PROPERTY_QPID_HOME, qpidHome);
- String expectedStorePath = new File(qpidWork, BrokerOptions.DEFAULT_CONFIG_NAME_PREFIX + ".json").getAbsolutePath();
+ Map<String,Object> attributes = startDummyMain("");
- BrokerOptions options = startDummyMain("");
-
- assertEquals("JSON", options.getConfigurationStoreType());
- assertEquals(expectedStorePath, options.getConfigurationStoreLocation());
- assertEquals(BrokerOptions.DEFAULT_INITIAL_CONFIG_LOCATION, options.getInitialConfigurationLocation());
- assertFalse(options.isOverwriteConfigurationStore());
- assertFalse(options.isManagementMode());
- assertEquals(0, options.getManagementModeHttpPortOverride());
+ assertEquals("JSON", attributes.get(SystemConfig.TYPE));
+ assertNotEquals("true", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE)));
}
+
public void testConfigurationStoreLocation()
{
- BrokerOptions options = startDummyMain("-sp abcd/config.xml");
- assertEquals("abcd/config.xml", options.getConfigurationStoreLocation());
+ Map<String,Object> attributes = startDummyMain("-sp abcd/config.xml");
+ assertEquals("abcd/config.xml", attributes.get("storePath"));
- options = startDummyMain("-store-path abcd/config2.xml");
- assertEquals("abcd/config2.xml", options.getConfigurationStoreLocation());
+ attributes = startDummyMain("-store-path abcd/config2.xml");
+ assertEquals("abcd/config2.xml", attributes.get("storePath"));
}
public void testConfigurationStoreType()
{
- BrokerOptions options = startDummyMain("-st dby");
- assertEquals("dby", options.getConfigurationStoreType());
-
- options = startDummyMain("-store-type bdb");
- assertEquals("bdb", options.getConfigurationStoreType());
- }
-
- public void testOverwriteConfigurationStore()
- {
- BrokerOptions options = startDummyMain("-os");
- assertTrue(options.isOverwriteConfigurationStore());
+ Map<String,Object> attributes = startDummyMain("-st dby");
+ assertEquals("dby", attributes.get(SystemConfig.TYPE));
- options = startDummyMain("-overwrite-store");
- assertTrue(options.isOverwriteConfigurationStore());
+ attributes = startDummyMain("-store-type bdb");
+ assertEquals("bdb", attributes.get(SystemConfig.TYPE));
}
public void testVersion()
@@ -98,76 +87,76 @@ public class MainTest extends QpidTestCa
assertTrue("Parsed command line didnt pick up help option", main.getCommandLine().hasOption("h"));
}
- public void testInitailConfigurationLocation()
+ public void testInitialConfigurationLocation()
{
- BrokerOptions options = startDummyMain("-icp abcd/initial-config.json");
- assertEquals("abcd/initial-config.json", options.getInitialConfigurationLocation());
+ Map<String,Object> attributes = startDummyMain("-icp abcd/initial-config.json");
+ assertEquals("abcd/initial-config.json", attributes.get(SystemConfig.INITIAL_CONFIGURATION_LOCATION));
- options = startDummyMain("-initial-config-path abcd/initial-config.json");
- assertEquals("abcd/initial-config.json", options.getInitialConfigurationLocation());
+ attributes = startDummyMain("-initial-config-path abcd/initial-config.json");
+ assertEquals("abcd/initial-config.json", attributes.get(SystemConfig.INITIAL_CONFIGURATION_LOCATION));
}
public void testManagementMode()
{
- BrokerOptions options = startDummyMain("-mm");
- assertTrue(options.isManagementMode());
+ Map<String,Object> attributes = startDummyMain("-mm");
+ assertEquals("true", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE)));
- options = startDummyMain("--management-mode");
- assertTrue(options.isManagementMode());
+ attributes = startDummyMain("--management-mode");
+ assertEquals("true", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE)));
}
public void testManagementModeHttpPortOverride()
{
- BrokerOptions options = startDummyMain("-mm -mmhttp 9999");
- assertTrue(options.isManagementMode());
- assertEquals(9999, options.getManagementModeHttpPortOverride());
-
- options = startDummyMain("-mm --management-mode-http-port 9999");
- assertTrue(options.isManagementMode());
- assertEquals(9999, options.getManagementModeHttpPortOverride());
+ Map<String,Object> attributes = startDummyMain("-mm -mmhttp 9999");
+ assertEquals("true", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE)));
+ assertEquals("9999", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE_HTTP_PORT_OVERRIDE)));
+
+ attributes = startDummyMain("-mm --management-mode-http-port 9999");
+ assertEquals("true", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE)));
+ assertEquals("9999", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE_HTTP_PORT_OVERRIDE)));
- options = startDummyMain("-mmhttp 9999");
- assertEquals(0, options.getManagementModeHttpPortOverride());
+ attributes = startDummyMain("-mmhttp 9999");
+ assertNotEquals("9999", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE_HTTP_PORT_OVERRIDE)));
}
public void testManagementModePassword()
{
String password = getTestName();
- BrokerOptions options = startDummyMain("-mm -mmpass " + password);
- assertTrue(options.isManagementMode());
- assertEquals(password, options.getManagementModePassword());
-
- options = startDummyMain("-mm --management-mode-password " + password);
- assertTrue(options.isManagementMode());
- assertEquals(password, options.getManagementModePassword());
+ Map<String,Object> attributes = startDummyMain("-mm -mmpass " + password);
+ assertEquals("true", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE)));
+ assertEquals(password, attributes.get(SystemConfig.MANAGEMENT_MODE_PASSWORD));
+
+ attributes = startDummyMain("-mm --management-mode-password " + password);
+ assertEquals("true", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE)));
+ assertEquals(password, attributes.get(SystemConfig.MANAGEMENT_MODE_PASSWORD));
- options = startDummyMain("-mm -mmpass " + password);
- assertNotNull(options.getManagementModePassword());
+ attributes = startDummyMain("-mm -mmpass " + password);
+ assertEquals(password, attributes.get(SystemConfig.MANAGEMENT_MODE_PASSWORD));
}
public void testDefaultManagementModePassword()
{
- BrokerOptions options = startDummyMain("-mm");
- assertTrue(options.isManagementMode());
- assertNotNull(options.getManagementModePassword());
+ Map<String,Object> attributes = startDummyMain("-mm");
+ assertEquals("true", String.valueOf(attributes.get(SystemConfig.MANAGEMENT_MODE)));
+ assertNotNull(attributes.get(SystemConfig.MANAGEMENT_MODE_PASSWORD));
}
public void testSetConfigProperties()
{
//short name
String newPort = "12345";
- BrokerOptions options = startDummyMain("-prop name=value -prop " + org.apache.qpid.server.model.Broker.QPID_AMQP_PORT + "=" + newPort);
+ Map<String,Object> attributes = startDummyMain("-prop name=value -prop " + org.apache.qpid.server.model.Broker.QPID_AMQP_PORT + "=" + newPort);
- Map<String, String> props = options.getConfigProperties();
+ Map<String, String> props = (Map<String,String>) attributes.get(SystemConfig.CONTEXT);
assertEquals(newPort, props.get(org.apache.qpid.server.model.Broker.QPID_AMQP_PORT));
assertEquals("value", props.get("name"));
//long name
newPort = "678910";
- options = startDummyMain("--config-property name2=value2 --config-property " + org.apache.qpid.server.model.Broker.QPID_AMQP_PORT + "=" + newPort);
+ attributes = startDummyMain("--config-property name2=value2 --config-property " + org.apache.qpid.server.model.Broker.QPID_AMQP_PORT + "=" + newPort);
- props = options.getConfigProperties();
+ props = (Map<String,String>) attributes.get(SystemConfig.CONTEXT);
assertEquals(newPort, props.get(org.apache.qpid.server.model.Broker.QPID_AMQP_PORT));
assertEquals("value2", props.get("name2"));
@@ -186,14 +175,14 @@ public class MainTest extends QpidTestCa
_startupException instanceof IllegalArgumentException);
}
- private BrokerOptions startDummyMain(String commandLine)
+ private Map<String,Object> startDummyMain(String commandLine)
{
- return (new TestMain(commandLine.split("\\s"))).getOptions();
+ return (new TestMain(commandLine.split("\\s"))).getAttributes();
}
private class TestMain extends Main
{
- private BrokerOptions _options;
+ private Map<String, Object> _attributes;
public TestMain(String[] args)
{
@@ -214,9 +203,9 @@ public class MainTest extends QpidTestCa
}
@Override
- protected void startBroker(BrokerOptions options)
+ protected void startBroker(Map<String,Object> attributes)
{
- _options = options;
+ _attributes = attributes;
}
@Override
@@ -224,9 +213,9 @@ public class MainTest extends QpidTestCa
{
}
- public BrokerOptions getOptions()
+ public Map<String,Object> getAttributes()
{
- return _options;
+ return _attributes;
}
public CommandLine getCommandLine()
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java Wed Nov 2 00:19:08 2016
@@ -53,9 +53,9 @@ import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.Queue;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.ssl.SSLContextFactory;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -552,7 +552,7 @@ public class RestTestHelper
public void setManagementModeCredentials()
{
- setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, QpidBrokerTestCase.MANAGEMENT_MODE_PASSWORD);
+ setUsernameAndPassword(SystemConfig.MANAGEMENT_MODE_USER_NAME, QpidBrokerTestCase.MANAGEMENT_MODE_PASSWORD);
}
public void tearDown()
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java Wed Nov 2 00:19:08 2016
@@ -34,7 +34,6 @@ import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.util.FileUtils;
public abstract class AbstractBrokerHolder implements BrokerHolder
@@ -167,8 +166,7 @@ public abstract class AbstractBrokerHold
public void start(boolean managementMode) throws Exception
{
saveConfiguration(getConfiguration());
- BrokerOptions options = createBrokerOptions(managementMode, _amqpPort);
- start(options);
+ start(managementMode, _amqpPort);
if (_amqpPort <= 0)
{
_amqpPort = scrapePortFromLog(_logFile, _amqpTcpPortRegExp);
@@ -221,7 +219,8 @@ public abstract class AbstractBrokerHold
abstract protected String getLogPrefix();
- abstract void start(final BrokerOptions options) throws Exception;
+
+ protected abstract void start(final boolean managementMode, final int amqpPort) throws Exception;
private void saveConfiguration(TestBrokerConfiguration testConfiguration)
{
@@ -233,24 +232,6 @@ public abstract class AbstractBrokerHold
}
}
- private BrokerOptions createBrokerOptions(boolean managementMode, int amqpPort)
- {
- BrokerOptions options = new BrokerOptions();
-
- options.setConfigProperty("qpid.work_dir", getWorkDir().toString());
- options.setConfigProperty("test.port", String.valueOf(amqpPort));
- options.setConfigProperty("test.hport", String.valueOf(getHttpPort()));
- options.setConfigurationStoreType(_brokerStoreType);
- options.setConfigurationStoreLocation(_configurationPath);
- options.setManagementMode(managementMode);
- if (managementMode)
- {
- options.setManagementModePassword(QpidBrokerTestCase.MANAGEMENT_MODE_PASSWORD);
- }
- options.setStartupLoggedToSystemOut(false);
- return options;
- }
-
private int scrapePortFromLog(final File logFile, final String portRegEx) throws IOException
{
final String logPrefix = getLogPrefix();
@@ -273,4 +254,8 @@ public abstract class AbstractBrokerHold
return 0;
}
+ String getBrokerStoreType()
+ {
+ return _brokerStoreType;
+ }
}
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java Wed Nov 2 00:19:08 2016
@@ -24,7 +24,9 @@ import java.io.File;
import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import javax.security.auth.Subject;
@@ -32,25 +34,56 @@ import javax.security.auth.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.Broker;
-import org.apache.qpid.server.BrokerOptions;
+import org.apache.qpid.server.SystemLauncher;
+import org.apache.qpid.server.SystemLauncherListener;
+import org.apache.qpid.server.logging.logback.LogbackLoggingSystemLauncherListener;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.IllegalStateTransitionException;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.security.auth.TaskPrincipal;
-import org.apache.qpid.server.util.Action;
public class InternalBrokerHolder extends AbstractBrokerHolder
{
private final static Logger LOGGER = LoggerFactory.getLogger(InternalBrokerHolder.class);
private final static UncaughtExceptionHandler UNCAUGHT_EXCEPTION_HANDLER = new UncaughtExceptionHandler();
- private volatile Broker _broker;
+ private volatile SystemLauncher _systemLauncher;
public InternalBrokerHolder(int port, final String classQualifiedTestName, final File logFile)
{
super(port, classQualifiedTestName, logFile);
}
+
@Override
- public void start(final BrokerOptions options) throws Exception
+ protected void start(final boolean managementMode, final int amqpPort) throws Exception
+ {
+
+ Map<String,String> context = new HashMap<>();
+ context.put("test.hport", String.valueOf(getHttpPort()));
+ context.put("qpid.home_dir", System.getProperty("QPID_HOME"));
+ context.put("qpid.work_dir", getWorkDir().toString());
+
+ context.put("test.port", String.valueOf(amqpPort));
+
+ Map<String,Object> attributes = new HashMap<>();
+
+ attributes.put(ConfiguredObject.CONTEXT, context);
+ attributes.put(ConfiguredObject.TYPE, getBrokerStoreType());
+ attributes.put("storePath", getConfigurationPath());
+
+ attributes.put(SystemConfig.MANAGEMENT_MODE, managementMode);
+
+ if(managementMode)
+ {
+ attributes.put(SystemConfig.MANAGEMENT_MODE_PASSWORD, QpidBrokerTestCase.MANAGEMENT_MODE_PASSWORD);
+ }
+
+ start(attributes);
+
+ }
+
+ public void start(final Map<String,Object> systemConfig) throws Exception
{
if (Thread.getDefaultUncaughtExceptionHandler() == null)
{
@@ -59,42 +92,39 @@ public class InternalBrokerHolder extend
LOGGER.info("Starting internal broker (same JVM)");
- _broker = new Broker(new Action<Integer>()
- {
- @Override
- public void performAction(final Integer object)
- {
- _broker = null;
- }
- })
- {
- @Override
- public void shutdown()
- {
- try
- {
- super.shutdown();
- }
- catch (IllegalStateException e)
- {
- System.out.println("IllegalStateException occurred on broker shutdown in test "
- + getClassQualifiedTestName());
- throw e;
- }
- }
- };
+ _systemLauncher = new SystemLauncher(new LogbackLoggingSystemLauncherListener(),
+ new SystemLauncherListener.DefaultSystemLauncherListener()
+ {
+ @Override
+ public void onShutdown(final int exitCode)
+ {
+ _systemLauncher = null;
+ }
+
+ @Override
+ public void exceptionOnShutdown(final Exception e)
+ {
+ if (e instanceof IllegalStateException
+ || e instanceof IllegalStateTransitionException)
+ {
+ System.out.println(
+ "IllegalStateException occurred on broker shutdown in test "
+ + getClassQualifiedTestName());
+ }
+ }
+ });
- _broker.startup(options);
+ _systemLauncher.startup(systemConfig);
}
@Override
public void shutdown()
{
- if (_broker != null)
+ if (_systemLauncher != null)
{
LOGGER.info("Shutting down Broker instance");
Subject shutdownSubject = new Subject(true,
- new HashSet<>(Arrays.asList(_broker.getSystemPrincipal(), new TaskPrincipal("Shutdown"))),
+ new HashSet<>(Arrays.asList(_systemLauncher.getSystemPrincipal(), new TaskPrincipal("Shutdown"))),
Collections.emptySet(),
Collections.emptySet());
Subject.doAs(shutdownSubject, new PrivilegedAction<Object>()
@@ -102,9 +132,9 @@ public class InternalBrokerHolder extend
@Override
public Object run()
{
- if (_broker != null)
+ if (_systemLauncher != null)
{
- _broker.shutdown();
+ _systemLauncher.shutdown();
}
return null;
}
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java Wed Nov 2 00:19:08 2016
@@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.logging.logback.BrokerLogbackSocketLogger;
import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule;
@@ -76,28 +75,27 @@ public class SpawnedBrokerHolder extends
_pseudoThreadName = "BROKER-" + getBrokerIndex();
}
-
@Override
- public void start(BrokerOptions brokerOptions) throws Exception
+ public void start(final boolean managementMode, final int amqpPort) throws Exception
{
Map<String, String> mdc = new HashMap<>();
mdc.put(QpidBrokerTestCase.CLASS_QUALIFIED_TEST_NAME, getClassQualifiedTestName());
mdc.put("origin", getLogPrefix());
- LOGGER.debug("Spawning broker with options: {} jvmOptions: {} environmentSettings: {} permitted start-up time: {}",
- brokerOptions, _jvmOptions, _environmentSettings, BROKER_STARTUP_TIME);
+ LOGGER.debug("Spawning broker with jvmOptions: {} environmentSettings: {} permitted start-up time: {}",
+ _jvmOptions, _environmentSettings, BROKER_STARTUP_TIME);
- String[] cmd = _brokerCommandHelper.getBrokerCommand(Integer.parseInt(brokerOptions.getConfigProperties().get("test.port")),
- brokerOptions.getConfigProperties().get("qpid.work_dir"),
- brokerOptions.getConfigurationStoreLocation(),
- brokerOptions.getConfigurationStoreType());
- if (brokerOptions.isManagementMode())
+ String[] cmd = _brokerCommandHelper.getBrokerCommand(amqpPort,
+ getWorkDir().toString(),
+ getConfigurationPath(),
+ getBrokerStoreType());
+ if (managementMode)
{
String[] newCmd = new String[cmd.length + 3];
System.arraycopy(cmd, 0, newCmd, 0, cmd.length);
newCmd[cmd.length] = "-mm";
newCmd[cmd.length + 1] = "-mmpass";
- newCmd[cmd.length + 2] = brokerOptions.getManagementModePassword();
+ newCmd[cmd.length + 2] = QpidBrokerTestCase.MANAGEMENT_MODE_PASSWORD;
cmd = newCmd;
}
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Wed Nov 2 00:19:08 2016
@@ -43,12 +43,25 @@ import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.management.plugin.HttpManagement;
-import org.apache.qpid.server.model.*;
+import org.apache.qpid.server.model.AbstractSystemConfig;
+import org.apache.qpid.server.model.AccessControlProvider;
+import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.GroupProvider;
+import org.apache.qpid.server.model.JsonSystemConfigImpl;
+import org.apache.qpid.server.model.Plugin;
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.SystemConfig;
+import org.apache.qpid.server.model.UUIDGenerator;
+import org.apache.qpid.server.model.VirtualHostAlias;
+import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.model.adapter.FileBasedGroupProvider;
import org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl;
import org.apache.qpid.server.plugin.PluggableFactoryLoader;
@@ -93,15 +106,15 @@ public class TestBrokerConfiguration
public TestBrokerConfiguration(String storeType, String initialStoreLocation)
{
- BrokerOptions brokerOptions = new BrokerOptions();
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
_storeType = storeType;
- brokerOptions.setInitialConfigurationLocation(initialStoreLocation);
+ Map<String,Object> config = new HashMap<>();
+ config.put("storePath", initialStoreLocation);
final AbstractSystemConfig parentObject = new JsonSystemConfigImpl(_taskExecutor,
mock(EventLogger.class),
null,
- brokerOptions.convertToSystemConfigAttributes())
+ config)
{
{
@@ -200,13 +213,13 @@ public class TestBrokerConfiguration
public boolean save(File configFile)
{
- BrokerOptions brokerOptions = new BrokerOptions();
- brokerOptions.setConfigurationStoreLocation(configFile.getAbsolutePath());
+
+ Map<String, Object> attributes = new HashMap<>();
+ attributes.put("storePath", configFile.getAbsolutePath());
SystemConfigFactory configFactory =
(new PluggableFactoryLoader<>(SystemConfigFactory.class)).get(_storeType);
- Map<String, Object> attributes = new HashMap<>(brokerOptions.convertToSystemConfigAttributes());
attributes.put(SystemConfig.STARTUP_LOGGED_TO_SYSTEM_OUT, false);
attributes.put(ConfiguredObject.DESIRED_STATE, State.QUIESCED);
final SystemConfig parentObject = configFactory.newInstance(_taskExecutor,
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AccessControlProviderRestTest.java Wed Nov 2 00:19:08 2016
@@ -27,11 +27,11 @@ import java.util.UUID;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.security.AllowAllAccessControlProvider;
import org.apache.qpid.server.security.access.plugins.AclFileAccessControlProvider;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -190,7 +190,7 @@ public class AccessControlProviderRestTe
configuration.setSaved(false);
startDefaultBroker(true);
- getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
+ getRestTestHelper().setUsernameAndPassword(SystemConfig.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
Map<String, Object> acl = getRestTestHelper().getJsonAsSingletonList("accesscontrolprovider/" + TestBrokerConfiguration.ENTRY_NAME_ACL_FILE + "?" + RestServlet.OVERSIZE_PARAM + "=" + (file.getAbsolutePath().length()+10));
assertEquals("Unexpected id", id.toString(), acl.get(AccessControlProvider.ID));
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java Wed Nov 2 00:19:08 2016
@@ -28,7 +28,6 @@ import java.util.UUID;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.BrokerModel;
@@ -37,6 +36,7 @@ import org.apache.qpid.server.model.Exte
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.User;
import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager;
import org.apache.qpid.server.security.auth.manager.PlainPasswordDatabaseAuthenticationManager;
@@ -213,7 +213,7 @@ public class AuthenticationProviderRestT
config.setSaved(false);
startDefaultBroker(true);
- getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
+ getRestTestHelper().setUsernameAndPassword(SystemConfig.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName);
assertEquals("Unexpected id", id.toString(), provider.get(AuthenticationProvider.ID));
@@ -250,7 +250,7 @@ public class AuthenticationProviderRestT
config.setSaved(false);
startDefaultBroker(true);
- getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
+ getRestTestHelper().setUsernameAndPassword(SystemConfig.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
Map<String, Object> provider = getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" + providerName);
assertEquals("Unexpected id", id.toString(), provider.get(AuthenticationProvider.ID));
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java Wed Nov 2 00:19:08 2016
@@ -32,13 +32,13 @@ import java.util.UUID;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Group;
import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.adapter.FileBasedGroupProvider;
import org.apache.qpid.server.model.adapter.FileBasedGroupProviderImpl;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -315,7 +315,7 @@ public class GroupProviderRestTest exten
config.setSaved(false);
startDefaultBroker(true);
- getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
+ getRestTestHelper().setUsernameAndPassword(SystemConfig.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
Map<String, Object> groupProvider = getRestTestHelper().getJsonAsSingletonList("groupprovider/" + TestBrokerConfiguration.ENTRY_NAME_GROUP_FILE);
assertEquals("Unexpected id", id.toString(), groupProvider.get(GroupProvider.ID));
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java?rev=1767592&r1=1767591&r2=1767592&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java Wed Nov 2 00:19:08 2016
@@ -34,11 +34,11 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.model.AuthenticationProvider;
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.Transport;
import org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
@@ -264,7 +264,7 @@ public class PortRestTest extends QpidRe
// restart Broker in management port
stopDefaultBroker();
startDefaultBroker(true);
- getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
+ getRestTestHelper().setUsernameAndPassword(SystemConfig.MANAGEMENT_MODE_USER_NAME, MANAGEMENT_MODE_PASSWORD);
String ampqPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT;
Map<String, Object> portData = getRestTestHelper().getJsonAsSingletonList("port/" + getRestTestHelper().encodeAsUTF(ampqPortName));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org