diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-04-20 17:00:46 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-04-20 17:00:46 +0000 |
| commit | 130ff22d820d9c20a1bc7545031954ae59dad0ef (patch) | |
| tree | bfe88e4d58c61d9f5c0a4e56dc9c5a51f39579d6 /qpid/java/systests/src/main | |
| parent | 3d34526bc2fe159b265d5a7c58ffd687ba00c499 (diff) | |
| download | qpid-python-130ff22d820d9c20a1bc7545031954ae59dad0ef.tar.gz | |
QPID-5713 : [Java Broker] Remove non-test references to model singleton, and instead treat as an instance variable
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588794 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src/main')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java index 3feb2eaab9..c93a4c6556 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java @@ -36,10 +36,10 @@ import org.apache.qpid.server.logging.LogRecorder; 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.ConfiguredObjectFactoryImpl; import org.apache.qpid.server.model.GroupProvider; -import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.PreferencesProvider; import org.apache.qpid.server.model.SystemContextImpl; @@ -76,12 +76,15 @@ public class TestBrokerConfiguration public TestBrokerConfiguration(String storeType, String intialStoreLocation, final TaskExecutor taskExecutor) { - _store = new MemoryConfigurationEntryStore(new SystemContextImpl(taskExecutor, new ConfiguredObjectFactoryImpl( - Model.getInstance()), - mock(EventLogger.class), mock(LogRecorder.class), - mock(BrokerOptions.class)), - intialStoreLocation, - null, Collections.<String,String>emptyMap()); + _store = new MemoryConfigurationEntryStore( + new SystemContextImpl(taskExecutor, + new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()), + mock(EventLogger.class), + mock(LogRecorder.class), + mock(BrokerOptions.class)), + intialStoreLocation, + null, + Collections.<String,String>emptyMap()); } public boolean setBrokerAttribute(String name, Object value) |