Author: orudyy
Date: Fri Jan 4 17:44:20 2013
New Revision: 1428997
URL: http://svn.apache.org/viewvc?rev=1428997&view=rev
Log:
QPID-4390: Add accessors for management plugin attributes, introduce the
relationship between Broker and Plugins
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Plugin.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Fri Jan 4 17:44:20 2013
@@ -22,6 +22,7 @@ package org.apache.qpid.server.managemen
import java.io.File;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.UUID;
@@ -47,6 +48,7 @@ import org.apache.qpid.server.model.Exch
import org.apache.qpid.server.model.Group;
import org.apache.qpid.server.model.GroupMember;
import org.apache.qpid.server.model.GroupProvider;
+import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.Queue;
@@ -68,6 +70,18 @@ public class HttpManagement extends Abst
{
private final Logger _logger = Logger.getLogger(HttpManagement.class);
+ private static final Collection<String> AVAILABLE_ATTRIBUTES = new
HashSet<String>(Plugin.AVAILABLE_ATTRIBUTES);
+ static
+ {
+
AVAILABLE_ATTRIBUTES.add(HttpManagementFactory.HTTP_BASIC_AUTHENTICATION_ENABLED);
+
AVAILABLE_ATTRIBUTES.add(HttpManagementFactory.HTTPS_BASIC_AUTHENTICATION_ENABLED);
+
AVAILABLE_ATTRIBUTES.add(HttpManagementFactory.HTTP_SASL_AUTHENTICATION_ENABLED);
+
AVAILABLE_ATTRIBUTES.add(HttpManagementFactory.HTTPS_SASL_AUTHENTICATION_ENABLED);
+ AVAILABLE_ATTRIBUTES.add(HttpManagementFactory.TIME_OUT);
+ AVAILABLE_ATTRIBUTES.add(HttpManagementFactory.PLUGIN_TYPE);
+ }
+
+
public static final String ENTRY_POINT_PATH = "/management";
private static final String OPERATIONAL_LOGGING_NAME = "Web";
@@ -330,4 +344,40 @@ public class HttpManagement extends Abst
{
return "HttpManagement";
}
+
+ @Override
+ public Collection<String> getAttributeNames()
+ {
+ return Collections.unmodifiableCollection(AVAILABLE_ATTRIBUTES);
+ }
+
+ @Override
+ public Object getAttribute(String name)
+ {
+
if(HttpManagementFactory.HTTP_BASIC_AUTHENTICATION_ENABLED.equals(name))
+ {
+ return _configuration.isHttpBasicAuthenticationEnabled();
+ }
+ else
if(HttpManagementFactory.HTTPS_BASIC_AUTHENTICATION_ENABLED.equals(name))
+ {
+ return _configuration.isHttpsBasicAuthenticationEnabled();
+ }
+ else
if(HttpManagementFactory.HTTP_SASL_AUTHENTICATION_ENABLED.equals(name))
+ {
+ return _configuration.isHttpSaslAuthenticationEnabled();
+ }
+ else
if(HttpManagementFactory.HTTPS_SASL_AUTHENTICATION_ENABLED.equals(name))
+ {
+ return _configuration.isHttpSaslAuthenticationEnabled();
+ }
+ else if(HttpManagementFactory.TIME_OUT.equals(name))
+ {
+ return _configuration.getSessionTimeout();
+ }
+ else if(HttpManagementFactory.PLUGIN_TYPE.equals(name))
+ {
+ return HttpManagementFactory.PLUGIN_NAME;
+ }
+ return super.getAttribute(name);
+ }
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementFactory.java
Fri Jan 4 17:44:20 2013
@@ -19,14 +19,14 @@
package org.apache.qpid.server.management.plugin;
import static
org.apache.qpid.server.util.MapValueConverter.getBooleanAttribute;
-import static org.apache.qpid.server.util.MapValueConverter.getStringAttribute;
import static
org.apache.qpid.server.util.MapValueConverter.getIntegerAttribute;
+import static org.apache.qpid.server.util.MapValueConverter.getStringAttribute;
import java.util.Map;
import java.util.UUID;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.plugin.PluginFactory;
public class HttpManagementFactory implements PluginFactory
@@ -45,7 +45,7 @@ public class HttpManagementFactory imple
public static final String PLUGIN_NAME = "MANAGEMENT-HTTP";
@Override
- public ConfiguredObject createInstance(UUID id, Map<String, Object>
attributes, Broker broker)
+ public Plugin createInstance(UUID id, Map<String, Object> attributes,
Broker broker)
{
if (!PLUGIN_NAME.equals(attributes.get(PLUGIN_TYPE)))
{
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
Fri Jan 4 17:44:20 2013
@@ -23,7 +23,9 @@ package org.apache.qpid.server.jmx;
import java.io.IOException;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.UUID;
@@ -41,6 +43,7 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import
org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
+import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.State;
@@ -52,6 +55,14 @@ public class JMXManagement extends Abstr
{
private static final Logger LOGGER = Logger.getLogger(JMXManagement.class);
+ private static final Collection<String> AVAILABLE_ATTRIBUTES = new
HashSet<String>(Plugin.AVAILABLE_ATTRIBUTES);
+ static
+ {
+
AVAILABLE_ATTRIBUTES.add(JMXManagementFactory.MANAGEMENT_RIGHTS_INFER_ALL_ACCESS);
+ AVAILABLE_ATTRIBUTES.add(JMXManagementFactory.PLUGIN_TYPE);
+
AVAILABLE_ATTRIBUTES.add(JMXManagementFactory.USE_PLATFORM_MBEAN_SERVER);
+ }
+
private final Broker _broker;
private JMXManagedObjectRegistry _objectRegistry;
@@ -285,4 +296,28 @@ public class JMXManagement extends Abstr
{
return "JMXManagement";
}
+
+ @Override
+ public Collection<String> getAttributeNames()
+ {
+ return Collections.unmodifiableCollection(AVAILABLE_ATTRIBUTES);
+ }
+
+ @Override
+ public Object getAttribute(String name)
+ {
+
if(JMXManagementFactory.MANAGEMENT_RIGHTS_INFER_ALL_ACCESS.equals(name))
+ {
+ return _jmxConfiguration.isManagementRightsInferAllAccess();
+ }
+ else if(JMXManagementFactory.USE_PLATFORM_MBEAN_SERVER.equals(name))
+ {
+ return _jmxConfiguration.isPlatformMBeanServer();
+ }
+ else if(JMXManagementFactory.PLUGIN_TYPE.equals(name))
+ {
+ return JMXManagementFactory.PLUGIN_NAME;
+ }
+ return super.getAttribute(name);
+ }
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java
Fri Jan 4 17:44:20 2013
@@ -26,7 +26,7 @@ import java.util.UUID;
import org.apache.log4j.Logger;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.plugin.PluginFactory;
public class JMXManagementFactory implements PluginFactory
@@ -41,7 +41,7 @@ public class JMXManagementFactory implem
public static final String PLUGIN_NAME = "MANAGEMENT-JMX";
@Override
- public ConfiguredObject createInstance(UUID id, Map<String, Object>
attributes, Broker broker)
+ public Plugin createInstance(UUID id, Map<String, Object> attributes,
Broker broker)
{
if (PLUGIN_NAME.equals(attributes.get(PLUGIN_TYPE)))
{
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStore.java
Fri Jan 4 17:44:20 2013
@@ -66,11 +66,11 @@ public class JsonConfigurationEntryStore
{
this();
_storeFile = storeFile;
- if (storeFile.exists())
+ if (_storeFile.exists())
{
- if (storeFile.length() > 0)
+ if (_storeFile.length() > 0)
{
- URL storeURL = fileToURL(storeFile);
+ URL storeURL = fileToURL(_storeFile);
JsonNode node = load(storeURL, _objectMapper);
ConfigurationEntry brokerEntry = toEntry(node, true, _entries);
_rootId = brokerEntry.getId();
@@ -78,8 +78,9 @@ public class JsonConfigurationEntryStore
}
else
{
- createStoreFile(storeFile);
+ createStoreFile(_storeFile);
}
+
if (_rootId == null)
{
_rootId = createUUID(DEFAULT_BROKER_TYPE, DEFAULT_BROKER_NAME);
@@ -151,6 +152,11 @@ public class JsonConfigurationEntryStore
return _entries.get(id);
}
+ public void saveTo(File file)
+ {
+ saveAsTree(_rootId, _entries, _objectMapper, file);
+ }
+
private void createStoreFile(File storeFile)
{
File parent = storeFile.getParentFile();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Model.java
Fri Jan 4 17:44:20 2013
@@ -50,6 +50,7 @@ public class Model
addRelationship(Broker.class, GroupProvider.class);
addRelationship(Broker.class, TrustStore.class);
addRelationship(Broker.class, KeyStore.class);
+ addRelationship(Broker.class, Plugin.class);
addRelationship(VirtualHost.class, Exchange.class);
addRelationship(VirtualHost.class, Queue.class);
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Plugin.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Plugin.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Plugin.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Plugin.java
Fri Jan 4 17:44:20 2013
@@ -20,7 +20,33 @@
*/
package org.apache.qpid.server.model;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+
public interface Plugin extends ConfiguredObject
{
- //Hack, using it for the class name only for consistency with the other
things.
+ //Hack, using it for the class name only for consistency with the other
things.
+ String CREATED = "created";
+ String DURABLE = "durable";
+ String ID = "id";
+ String LIFETIME_POLICY = "lifetimePolicy";
+ String NAME = "name";
+ String STATE = "state";
+ String TIME_TO_LIVE = "timeToLive";
+ String UPDATED = "updated";
+
+ // Attributes
+ public static final Collection<String> AVAILABLE_ATTRIBUTES =
+ Collections.unmodifiableList(
+ Arrays.asList(
+ ID,
+ NAME,
+ STATE,
+ DURABLE,
+ LIFETIME_POLICY,
+ TIME_TO_LIVE,
+ CREATED,
+ UPDATED
+ ));
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
Fri Jan 4 17:44:20 2013
@@ -71,7 +71,8 @@ public abstract class AbstractPluginAdap
}
@Override
- public LifetimePolicy setLifetimePolicy(LifetimePolicy expected,
LifetimePolicy desired) throws IllegalStateException, AccessControlException,
IllegalArgumentException
+ public LifetimePolicy setLifetimePolicy(LifetimePolicy expected,
LifetimePolicy desired) throws IllegalStateException,
+ AccessControlException, IllegalArgumentException
{
throw new UnsupportedOperationException();
}
@@ -83,7 +84,8 @@ public abstract class AbstractPluginAdap
}
@Override
- public long setTimeToLive(long expected, long desired) throws
IllegalStateException, AccessControlException, IllegalArgumentException
+ public long setTimeToLive(long expected, long desired) throws
IllegalStateException, AccessControlException,
+ IllegalArgumentException
{
throw new UnsupportedOperationException();
}
@@ -101,9 +103,53 @@ public abstract class AbstractPluginAdap
}
@Override
- public <C extends ConfiguredObject> C createChild(Class<C> childClass,
Map<String, Object> attributes, ConfiguredObject... otherParents)
+ public <C extends ConfiguredObject> C createChild(Class<C> childClass,
Map<String, Object> attributes,
+ ConfiguredObject... otherParents)
{
throw new UnsupportedOperationException();
}
+ @Override
+ public Collection<String> getAttributeNames()
+ {
+ return AVAILABLE_ATTRIBUTES;
+ }
+
+ @Override
+ public Object getAttribute(String name)
+ {
+ if (ID.equals(name))
+ {
+ return getId();
+ }
+ else if (NAME.equals(name))
+ {
+ return getName();
+ }
+ else if (STATE.equals(name))
+ {
+ return getActualState();
+ }
+ else if (DURABLE.equals(name))
+ {
+ return isDurable();
+ }
+ else if (LIFETIME_POLICY.equals(name))
+ {
+ return getLifetimePolicy();
+ }
+ else if (TIME_TO_LIVE.equals(name))
+ {
+ return getTimeToLive();
+ }
+ else if (CREATED.equals(name))
+ {
+
+ }
+ else if (UPDATED.equals(name))
+ {
+
+ }
+ return super.getAttribute(name);
+ }
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Fri Jan 4 17:44:20 2013
@@ -50,6 +50,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.LifetimePolicy;
+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.Statistics;
@@ -319,7 +320,7 @@ public class BrokerAdapter extends Abstr
{
return (Collection<C>) getTrustStores();
}
- else if(clazz == ConfiguredObject.class)
+ else if(clazz == Plugin.class)
{
return (Collection<C>) getPlugins();
}
@@ -795,10 +796,14 @@ public class BrokerAdapter extends Abstr
{
addTrustStore((TrustStore)object);
}
- else
+ else if(object instanceof Plugin)
{
addPlugin(object);
}
+ else
+ {
+ throw new IllegalArgumentException("Attempted to recover
unexpected type of configured object: " + object.getClass().getName());
+ }
}
@Override
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/plugin/PluginFactory.java
Fri Jan 4 17:44:20 2013
@@ -22,11 +22,11 @@ import java.util.Map;
import java.util.UUID;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Plugin;
public interface PluginFactory
{
static final String PLUGIN_TYPE = "pluginType";
- ConfiguredObject createInstance(UUID id, Map<String, Object> attributes,
Broker broker);
+ Plugin createInstance(UUID id, Map<String, Object> attributes, Broker
broker);
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
Fri Jan 4 17:44:20 2013
@@ -321,7 +321,7 @@ public class BrokerRecovererTest extends
public void testCreateBrokerWithPlugins()
{
ConfigurationEntry pluginEntry = mock(ConfigurationEntry.class);
- ConfiguredObject plugin = mock(ConfiguredObject.class);
+ Plugin plugin = mock(Plugin.class);
_brokerEntryChildren.put(Plugin.class.getSimpleName(),
Arrays.asList(pluginEntry));
RecovererProvider recovererProvider = createRecoveryProvider(new
ConfigurationEntry[]{pluginEntry, _authenticationProviderEntry1},
@@ -331,7 +331,7 @@ public class BrokerRecovererTest extends
assertNotNull(broker);
assertEquals(_brokerId, broker.getId());
- assertEquals(Collections.singleton(plugin), new
HashSet<ConfiguredObject>(broker.getChildren(ConfiguredObject.class)));
+ assertEquals(Collections.singleton(plugin), new
HashSet<ConfiguredObject>(broker.getChildren(Plugin.class)));
}
public void testCreateBrokerWithKeyStores()
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java?rev=1428997&r1=1428996&r2=1428997&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/PluginRecovererTest.java
Fri Jan 4 17:44:20 2013
@@ -34,6 +34,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.plugin.PluginFactory;
import org.apache.qpid.server.plugin.QpidServiceLoader;
@@ -68,7 +69,7 @@ public class PluginRecovererTest extends
public void testCreate()
{
- ConfiguredObject pluginFromFactory = mock(ConfiguredObject.class);
+ Plugin pluginFromFactory = mock(Plugin.class);
when(pluginFromFactory.getId()).thenReturn(_id);
when(_factory.createInstance(_id, _attributes,
_broker)).thenReturn(pluginFromFactory);
@@ -81,7 +82,7 @@ public class PluginRecovererTest extends
public void testCreateThrowsExceptionForUnexpectedId()
{
- ConfiguredObject pluginFromFactory = mock(ConfiguredObject.class);
+ Plugin pluginFromFactory = mock(Plugin.class);
when(pluginFromFactory.getId()).thenReturn(UUID.randomUUID());
when(_factory.createInstance(_id, _attributes,
_broker)).thenReturn(pluginFromFactory);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
