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/04/26 01:14:15 UTC
svn commit: r1590188 - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/binding/
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/...
Author: rgodfrey
Date: Fri Apr 25 23:14:14 2014
New Revision: 1590188
URL: http://svn.apache.org/r1590188
Log:
QPID-5615 : Address review comments from Alex Rudyy
Removed:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManagerFactory.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.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/model/adapter/ConnectionAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java Fri Apr 25 23:14:14 2014
@@ -63,7 +63,7 @@ public class BindingImpl
public BindingImpl(Map<String, Object> attributes, AMQQueue queue, ExchangeImpl exchange)
{
- super(parentsMap(queue,exchange),enhanceWithDurable(attributes,queue,exchange),queue.getVirtualHost().getTaskExecutor());
+ super(parentsMap(queue,exchange),enhanceWithDurable(attributes,queue,exchange));
_bindingKey = getName();
_queue = queue;
_exchange = exchange;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Fri Apr 25 23:14:14 2014
@@ -108,7 +108,7 @@ public abstract class AbstractExchange<T
public AbstractExchange(Map<String, Object> attributes, VirtualHostImpl vhost)
{
- super(parentsMap(vhost), attributes, vhost.getTaskExecutor());
+ super(parentsMap(vhost), attributes);
_virtualHost = vhost;
// check ACL
try
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Fri Apr 25 23:14:14 2014
@@ -714,12 +714,6 @@ public abstract class AbstractConfigured
}
@Override
- public <T> T getAttribute(final ConfiguredObjectAttribute<? super X, T> attr)
- {
- return (T) getAttribute(attr.getName());
- }
-
- @Override
public final Map<String, Object> getActualAttributes()
{
synchronized (_attributes)
@@ -1070,52 +1064,6 @@ public abstract class AbstractConfigured
// allowed by default
}
- /**
- * Returns a map of effective attribute values that would result
- * if applying the supplied changes. Does not apply the changes.
- */
- protected Map<String, Object> generateEffectiveAttributes(Map<String,Object> changedValues)
- {
- //Build a new set of effective attributes that would be
- //the result of applying the attribute changes, so we
- //can validate the configuration that would result
-
- Map<String, Object> existingActualValues = getActualAttributes();
-
- //create a new merged map, starting with the defaults
- Map<String, Object> merged = new HashMap<String, Object>();
-
- for(String name : getAttributeNames())
- {
- if(changedValues.containsKey(name))
- {
- Object changedValue = changedValues.get(name);
- if(changedValue != null)
- {
- //use the new non-null value for the merged values
- merged.put(name, changedValue);
- }
- else
- {
- //we just use the default (if there was one) since the changed
- //value is null and effectively clears any existing actual value
- }
- }
- else if(existingActualValues.get(name) != null)
- {
- //Use existing non-null actual value for the merge
- merged.put(name, existingActualValues.get(name));
- }
- else
- {
- //There was neither a change or an existing non-null actual
- //value, so just use the default value (if there was one).
- }
- }
-
- return merged;
- }
-
@Override
public final String getLastUpdatedBy()
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java Fri Apr 25 23:14:14 2014
@@ -191,8 +191,6 @@ public interface ConfiguredObject<X exte
*/
Object getAttribute(String name);
- <T> T getAttribute(ConfiguredObjectAttribute<? super X, T> attr);
-
/**
* Return the map containing only explicitly set attributes
*
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectAttributeOrStatistic.java Fri Apr 25 23:14:14 2014
@@ -23,6 +23,8 @@ package org.apache.qpid.server.model;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
+
abstract class ConfiguredObjectAttributeOrStatistic<C extends ConfiguredObject, T>
{
@@ -137,13 +139,29 @@ abstract class ConfiguredObjectAttribute
}
catch (IllegalAccessException e)
{
- Object o = configuredObject.getAttribute(getName());
- return getConverter().convert(o, configuredObject);
+ // This should never happen as it would imply a getter which is not public
+ throw new ServerScopedRuntimeException("Unable to get value for '"+getName()
+ +"' from configured object of category "
+ + configuredObject.getCategoryClass().getSimpleName(), e);
}
catch (InvocationTargetException e)
{
- Object o = configuredObject.getAttribute(getName());
- return getConverter().convert(o, configuredObject);
+ Throwable targetException = e.getTargetException();
+ if(targetException instanceof RuntimeException)
+ {
+ throw (RuntimeException)targetException;
+ }
+ else if(targetException instanceof Error)
+ {
+ throw (Error)targetException;
+ }
+ else
+ {
+ // This should never happen as it would imply a getter which is declaring a checked exception
+ throw new ServerScopedRuntimeException("Unable to get value for '"+getName()
+ +"' from configured object of category "
+ + configuredObject.getCategoryClass().getSimpleName(), e);
+ }
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java Fri Apr 25 23:14:14 2014
@@ -39,8 +39,7 @@ public abstract class AbstractPluginAdap
protected AbstractPluginAdapter(Map<String, Object> attributes, Broker broker)
{
- super(parentsMap(broker),
- attributes, broker.getTaskExecutor());
+ super(parentsMap(broker), attributes);
_broker = broker;
}
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=1590188&r1=1590187&r2=1590188&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 Fri Apr 25 23:14:14 2014
@@ -58,7 +58,7 @@ import org.apache.qpid.server.stats.Stat
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.util.SystemUtils;
-public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> implements Broker<BrokerAdapter>, ConfigurationChangeListener, StatisticsGatherer, StatisticsGatherer.Source
+public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> implements Broker<BrokerAdapter>, ConfigurationChangeListener, StatisticsGatherer
{
private static final Logger LOGGER = Logger.getLogger(BrokerAdapter.class);
@@ -104,9 +104,7 @@ public class BrokerAdapter extends Abstr
public BrokerAdapter(Map<String, Object> attributes,
SystemContext parent)
{
- super(parentsMap(parent),
- attributes,
- parent.getTaskExecutor());
+ super(parentsMap(parent), attributes);
_logRecorder = parent.getLogRecorder();
_eventLogger = parent.getEventLogger();
@@ -995,12 +993,6 @@ public class BrokerAdapter extends Abstr
_eventLogger = eventLogger;
}
- @Override
- public StatisticsGatherer getStatisticsGatherer()
- {
- return this;
- }
-
public void registerMessageDelivered(long messageSize)
{
_messagesDelivered.registerEvent(1L);
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java Fri Apr 25 23:14:14 2014
@@ -22,11 +22,21 @@ package org.apache.qpid.server.model.ada
import java.security.AccessControlException;
import java.security.Principal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.model.*;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Connection;
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Session;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.protocol.SessionModelListener;
@@ -39,9 +49,9 @@ public final class ConnectionAdapter ext
private final Map<AMQSessionModel, SessionAdapter> _sessionAdapters =
new HashMap<AMQSessionModel, SessionAdapter>();
- public ConnectionAdapter(final AMQConnectionModel conn, TaskExecutor taskExecutor)
+ public ConnectionAdapter(final AMQConnectionModel conn)
{
- super(parentsMap(conn.getVirtualHost()),createAttributes(conn), taskExecutor);
+ super(parentsMap(conn.getVirtualHost()),createAttributes(conn));
_connection = conn;
open();
conn.addSessionListener(this);
@@ -246,7 +256,7 @@ public final class ConnectionAdapter ext
{
if(!_sessionAdapters.containsKey(session))
{
- SessionAdapter adapter = new SessionAdapter(this, session, getTaskExecutor());
+ SessionAdapter adapter = new SessionAdapter(this, session);
_sessionAdapters.put(session, adapter);
childAdded(adapter);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java Fri Apr 25 23:14:14 2014
@@ -36,7 +36,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -71,8 +70,7 @@ public class FileBasedGroupProviderImpl
public FileBasedGroupProviderImpl(Map<String, Object> attributes,
Broker broker)
{
- super(parentsMap(broker),
- attributes, broker.getTaskExecutor());
+ super(parentsMap(broker), attributes);
_broker = broker;
@@ -140,7 +138,7 @@ public class FileBasedGroupProviderImpl
UUID id = UUID.randomUUID();
attrMap.put(Group.ID, id);
attrMap.put(Group.NAME, group.getName());
- GroupAdapter groupAdapter = new GroupAdapter(attrMap, getTaskExecutor());
+ GroupAdapter groupAdapter = new GroupAdapter(attrMap);
principals.add(groupAdapter);
}
@@ -229,7 +227,7 @@ public class FileBasedGroupProviderImpl
UUID id = UUID.randomUUID();
attrMap.put(Group.ID, id);
attrMap.put(Group.NAME, groupName);
- GroupAdapter groupAdapter = new GroupAdapter(attrMap, getTaskExecutor());
+ GroupAdapter groupAdapter = new GroupAdapter(attrMap);
groupAdapter.create();
return (C) groupAdapter;
@@ -409,9 +407,9 @@ public class FileBasedGroupProviderImpl
private class GroupAdapter extends AbstractConfiguredObject<GroupAdapter> implements Group<GroupAdapter>
{
- public GroupAdapter(Map<String,Object> attributes, TaskExecutor taskExecutor)
+ public GroupAdapter(Map<String, Object> attributes)
{
- super(parentsMap(FileBasedGroupProviderImpl.this), attributes, taskExecutor);
+ super(parentsMap(FileBasedGroupProviderImpl.this), attributes);
}
@@ -444,7 +442,7 @@ public class FileBasedGroupProviderImpl
Map<String,Object> attrMap = new HashMap<String, Object>();
attrMap.put(GroupMember.ID,id);
attrMap.put(GroupMember.NAME, principal.getName());
- GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap, getTaskExecutor());
+ GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap);
groupMemberAdapter.open();
members.add(groupMemberAdapter);
}
@@ -495,7 +493,7 @@ public class FileBasedGroupProviderImpl
Map<String,Object> attrMap = new HashMap<String, Object>();
attrMap.put(GroupMember.ID,id);
attrMap.put(GroupMember.NAME, memberName);
- GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap, getTaskExecutor());
+ GroupMemberAdapter groupMemberAdapter = new GroupMemberAdapter(attrMap);
groupMemberAdapter.create();
return (C) groupMemberAdapter;
@@ -539,10 +537,10 @@ public class FileBasedGroupProviderImpl
GroupMember<GroupMemberAdapter>
{
- public GroupMemberAdapter(Map<String,Object> attrMap, TaskExecutor taskExecutor)
+ public GroupMemberAdapter(Map<String, Object> attrMap)
{
// TODO - need to relate to the User object
- super(parentsMap(GroupAdapter.this),attrMap, taskExecutor);
+ super(parentsMap(GroupAdapter.this),attrMap);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactory.java Fri Apr 25 23:14:14 2014
@@ -21,9 +21,7 @@
package org.apache.qpid.server.model.adapter;
-import java.util.HashMap;
import java.util.Map;
-import java.util.UUID;
import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
import org.apache.qpid.server.model.AuthenticationProvider;
@@ -41,9 +39,6 @@ public class FileSystemPreferencesProvid
public FileSystemPreferencesProviderImpl createInstance(final Map<String, Object> attributes,
final ConfiguredObject<?>... parents)
{
- Map<String,Object> attributesWithoutId = new HashMap<String, Object>(attributes);
- Object idObj = attributesWithoutId.remove(ConfiguredObject.ID);
- UUID id = idObj == null ? UUID.randomUUID() : idObj instanceof UUID ? (UUID) idObj : UUID.fromString(idObj.toString());
return new FileSystemPreferencesProviderImpl(attributes, getParent(AuthenticationProvider.class,parents));
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java Fri Apr 25 23:14:14 2014
@@ -75,9 +75,7 @@ public class FileSystemPreferencesProvid
public FileSystemPreferencesProviderImpl(Map<String, Object> attributes,
AuthenticationProvider<? extends AuthenticationProvider> authenticationProvider)
{
- super(parentsMap(authenticationProvider),
- attributes,
- authenticationProvider.getParent(Broker.class).getTaskExecutor());
+ super(parentsMap(authenticationProvider), attributes);
State state = MapValueConverter.getEnumAttribute(State.class, STATE, attributes, State.INITIALISING);
_state = new AtomicReference<State>(state);
_authenticationProvider = authenticationProvider;
@@ -261,6 +259,7 @@ public class FileSystemPreferencesProvid
_state.compareAndSet(State.ERRORED, State.ACTIVE);
}
+ /* Note this method is used: it is referenced by the annotation on _path to be called after _path is set */
private void openNewStore()
{
if(_open)
@@ -326,7 +325,7 @@ public class FileSystemPreferencesProvid
}
- public void createStoreIfNotExist()
+ private void createStoreIfNotExist()
{
_store.createIfNotExist();
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java Fri Apr 25 23:14:14 2014
@@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Consumer;
@@ -47,10 +46,9 @@ final class SessionAdapter extends Abstr
public SessionAdapter(final ConnectionAdapter connectionAdapter,
- final AMQSessionModel session,
- TaskExecutor taskExecutor)
+ final AMQSessionModel session)
{
- super(parentsMap(connectionAdapter), createAttributes(session), taskExecutor);
+ super(parentsMap(connectionAdapter), createAttributes(session));
_session = session;
_session.addConsumerListener(new ConsumerListener()
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java Fri Apr 25 23:14:14 2014
@@ -42,9 +42,7 @@ public class VirtualHostAliasAdapter ext
public VirtualHostAliasAdapter(VirtualHost virtualHost, Port port)
{
- super(parentsMap(virtualHost,port),
- createAttributes(virtualHost, port),
- virtualHost.getTaskExecutor());
+ super(parentsMap(virtualHost,port), createAttributes(virtualHost, port));
_vhost = virtualHost;
_port = port;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java Fri Apr 25 23:14:14 2014
@@ -76,9 +76,7 @@ abstract public class AbstractPort<X ext
public AbstractPort(Map<String, Object> attributes,
Broker<?> broker)
{
- super(parentsMap(broker),
- attributes,
- broker.getTaskExecutor());
+ super(parentsMap(broker), attributes);
_broker = broker;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Fri Apr 25 23:14:14 2014
@@ -225,8 +225,7 @@ public abstract class AbstractQueue<X ex
protected AbstractQueue(Map<String, Object> attributes, VirtualHostImpl virtualHost)
{
- super(parentsMap(virtualHost),
- attributes, virtualHost.getTaskExecutor());
+ super(parentsMap(virtualHost), attributes);
_virtualHost = virtualHost;
_asyncDelivery = ReferenceCountingExecutorService.getInstance().acquireExecutorService();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java Fri Apr 25 23:14:14 2014
@@ -116,8 +116,7 @@ class QueueConsumerImpl
EnumSet<Option> optionSet)
{
super(parentsMap(queue, target.getSessionModel().getModelObject()),
- createAttributeMap(consumerName, filters, optionSet),
- queue.getVirtualHost().getTaskExecutor());
+ createAttributeMap(consumerName, filters, optionSet));
_messageClass = messageClass;
_sessionReference = target.getSessionModel().getConnectionReference();
_consumerNumber = CONSUMER_NUMBER_GENERATOR.getAndIncrement();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java Fri Apr 25 23:14:14 2014
@@ -84,9 +84,7 @@ public class FileKeyStoreImpl extends Ab
public FileKeyStoreImpl(Map<String, Object> attributes, Broker<?> broker)
{
- super(parentsMap(broker),
- attributes,
- broker.getTaskExecutor());
+ super(parentsMap(broker), attributes);
_broker = broker;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java Fri Apr 25 23:14:14 2014
@@ -68,9 +68,7 @@ public class FileTrustStoreImpl extends
public FileTrustStoreImpl(Map<String, Object> attributes, Broker<?> broker)
{
- super(parentsMap(broker),
- attributes,
- broker.getTaskExecutor());
+ super(parentsMap(broker), attributes);
_broker = broker;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java Fri Apr 25 23:14:14 2014
@@ -59,8 +59,7 @@ public abstract class AbstractAuthentica
protected AbstractAuthenticationManager(final Map<String, Object> attributes, final Broker broker)
{
- super(parentsMap(broker),
- attributes, broker.getTaskExecutor());
+ super(parentsMap(broker), attributes);
_broker = broker;
}
@@ -136,11 +135,6 @@ public abstract class AbstractAuthentica
throw new IllegalConfigurationException("Cannot associate " + user + " with authentication provider " + this);
}
- public void instantiatePreferencesProvider(final PreferencesProvider preferencesProvider)
- {
- _preferencesProvider = preferencesProvider;
- }
-
@Override
public State getState()
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordFileAuthenticationManagerFactory.java Fri Apr 25 23:14:14 2014
@@ -20,22 +20,26 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
import org.apache.qpid.server.store.ConfiguredObjectRecord;
import org.apache.qpid.server.store.ResolvedObject;
import org.apache.qpid.server.store.UnresolvedConfiguredObject;
import org.apache.qpid.server.util.ResourceBundleLoader;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Base64MD5PasswordFileAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<Base64MD5PasswordDatabaseAuthenticationManager>
+public class Base64MD5PasswordFileAuthenticationManagerFactory
+ extends AbstractConfiguredObjectTypeFactory<Base64MD5PasswordDatabaseAuthenticationManager>
+ implements AuthenticationManagerFactory<Base64MD5PasswordDatabaseAuthenticationManager>
{
public static final String PROVIDER_TYPE = "Base64MD5PasswordFile";
public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.PasswordFileAuthenticationProviderAttributeDescriptions";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerFactory.java Fri Apr 25 23:14:14 2014
@@ -24,12 +24,15 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
import org.apache.qpid.server.util.ResourceBundleLoader;
-public class ExternalAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<ExternalAuthenticationManagerImpl>
+public class ExternalAuthenticationManagerFactory extends AbstractConfiguredObjectTypeFactory<ExternalAuthenticationManagerImpl>
+ implements AuthenticationManagerFactory<ExternalAuthenticationManagerImpl>
{
public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.ExternalAuthenticationProviderAttributeDescriptions";
public static final String PROVIDER_TYPE = "External";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManagerFactory.java Fri Apr 25 23:14:14 2014
@@ -19,15 +19,19 @@
*/
package org.apache.qpid.server.security.auth.manager;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
-public class KerberosAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<KerberosAuthenticationManager>
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
+import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
+
+public class KerberosAuthenticationManagerFactory
+ extends AbstractConfiguredObjectTypeFactory<KerberosAuthenticationManager>
+ implements AuthenticationManagerFactory<KerberosAuthenticationManager>
{
public static final String PROVIDER_TYPE = "Kerberos";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordFileAuthenticationManagerFactory.java Fri Apr 25 23:14:14 2014
@@ -20,22 +20,26 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
import org.apache.qpid.server.store.ConfiguredObjectRecord;
import org.apache.qpid.server.store.ResolvedObject;
import org.apache.qpid.server.store.UnresolvedConfiguredObject;
import org.apache.qpid.server.util.ResourceBundleLoader;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class PlainPasswordFileAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<PlainPasswordDatabaseAuthenticationManager>
+public class PlainPasswordFileAuthenticationManagerFactory
+ extends AbstractConfiguredObjectTypeFactory<PlainPasswordDatabaseAuthenticationManager>
+ implements AuthenticationManagerFactory<PlainPasswordDatabaseAuthenticationManager>
{
public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.PasswordFileAuthenticationProviderAttributeDescriptions";
public static final String ATTRIBUTE_PATH = "path";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java Fri Apr 25 23:14:14 2014
@@ -385,8 +385,7 @@ public abstract class PrincipalDatabaseA
public PrincipalAdapter(Principal user)
{
- super(parentsMap(PrincipalDatabaseAuthenticationManager.this),createPrincipalAttributes(PrincipalDatabaseAuthenticationManager.this, user),
- PrincipalDatabaseAuthenticationManager.this.getTaskExecutor());
+ super(parentsMap(PrincipalDatabaseAuthenticationManager.this),createPrincipalAttributes(PrincipalDatabaseAuthenticationManager.this, user));
_user = user;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java Fri Apr 25 23:14:14 2014
@@ -367,8 +367,7 @@ public class ScramSHA1AuthenticationMana
protected ScramAuthUser(final Map<String, Object> attributes, ScramSHA1AuthenticationManager parent)
{
- super(parentsMap(parent),
- attributes, parent.getTaskExecutor());
+ super(parentsMap(parent), attributes);
_authenticationManager = parent;
if(!ASCII.newEncoder().canEncode(getName()))
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerFactory.java Fri Apr 25 23:14:14 2014
@@ -24,11 +24,15 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
-public class ScramSHA1AuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<ScramSHA1AuthenticationManager>
+public class ScramSHA1AuthenticationManagerFactory
+ extends AbstractConfiguredObjectTypeFactory<ScramSHA1AuthenticationManager>
+ implements AuthenticationManagerFactory<ScramSHA1AuthenticationManager>
{
public static final String PROVIDER_TYPE = "SCRAM-SHA-1";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactory.java Fri Apr 25 23:14:14 2014
@@ -24,12 +24,16 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.AuthenticationManagerFactory;
import org.apache.qpid.server.util.ResourceBundleLoader;
-public class SimpleLDAPAuthenticationManagerFactory extends AbstractAuthenticationManagerFactory<SimpleLDAPAuthenticationManagerImpl>
+public class SimpleLDAPAuthenticationManagerFactory
+ extends AbstractConfiguredObjectTypeFactory<SimpleLDAPAuthenticationManagerImpl>
+ implements AuthenticationManagerFactory<SimpleLDAPAuthenticationManagerImpl>
{
public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationProviderAttributeDescriptions";
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java Fri Apr 25 23:14:14 2014
@@ -104,8 +104,4 @@ public interface StatisticsGatherer
*/
void resetStatistics();
- interface Source
- {
- StatisticsGatherer getStatisticsGatherer();
- }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Fri Apr 25 23:14:14 2014
@@ -159,8 +159,7 @@ public abstract class AbstractVirtualHos
public AbstractVirtualHost(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
{
- super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(VirtualHostNode.class, virtualHostNode),
- enhanceWithId(attributes), ((Broker<?>)virtualHostNode.getParent(Broker.class)).getTaskExecutor());
+ super(parentsMap(virtualHostNode), attributes);
_broker = virtualHostNode.getParent(Broker.class);
_virtualHostNode = virtualHostNode;
@@ -177,16 +176,6 @@ public abstract class AbstractVirtualHos
}
- private static Map<String, Object> enhanceWithId(Map<String, Object> attributes)
- {
- if(attributes.get(ID) == null)
- {
- attributes = new HashMap<String, Object>(attributes);
- attributes.put(ID, UUID.randomUUID());
- }
- return attributes;
- }
-
public void validate()
{
super.validate();
@@ -978,7 +967,7 @@ public abstract class AbstractVirtualHos
{
if(!_connectionAdapters.containsKey(connection))
{
- adapter = new ConnectionAdapter(connection, getTaskExecutor());
+ adapter = new ConnectionAdapter(connection);
_connectionAdapters.put(connection, adapter);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java Fri Apr 25 23:14:14 2014
@@ -24,7 +24,6 @@ import java.io.File;
import java.security.AccessControlException;
import java.security.PrivilegedAction;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -33,6 +32,7 @@ import java.util.concurrent.atomic.Atomi
import javax.security.auth.Subject;
import org.apache.log4j.Logger;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
@@ -73,8 +73,7 @@ public abstract class AbstractStandardVi
@SuppressWarnings("rawtypes")
public AbstractStandardVirtualHostNode(Broker<?> parent, Map<String, Object> attributes, TaskExecutor taskExecutor)
{
- super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(Broker.class, parent),
- attributes, taskExecutor);
+ super(parentsMap(parent), attributes, taskExecutor);
_broker = parent;
SystemContext systemContext = _broker.getParent(SystemContext.class);
_eventLogger = systemContext.getEventLogger();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostCreationTest.java Fri Apr 25 23:14:14 2014
@@ -50,7 +50,7 @@ import org.apache.qpid.server.virtualhos
public class VirtualHostCreationTest extends TestCase
{
- private VirtualHostNode<?> _virtualHostNode;
+ private VirtualHostNode _virtualHostNode;
@Override
public void setUp() throws Exception
@@ -78,6 +78,7 @@ public class VirtualHostCreationTest ext
when(_virtualHostNode.getObjectFactory()).thenReturn(objectFactory);
when(_virtualHostNode.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel());
+ when(_virtualHostNode.getCategoryClass()).thenReturn(VirtualHostNode.class);
}
public void testCreateVirtualHostFromStoreConfigAttributes()
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Fri Apr 25 23:14:14 2014
@@ -59,6 +59,9 @@ public class VirtualHostTest extends Qpi
ConfiguredObjectFactory objectFactory = _broker.getObjectFactory();
when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel());
when(_virtualHostNode.getObjectFactory()).thenReturn(objectFactory);
+ when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor);
+
+ when(((VirtualHostNode)_virtualHostNode).getCategoryClass()).thenReturn(VirtualHostNode.class);
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java Fri Apr 25 23:14:14 2014
@@ -65,7 +65,7 @@ public class FileSystemPreferencesProvid
_broker = BrokerTestHelper.createBrokerMock();
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
- when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
+ when(_authenticationProvider.getTaskExecutor()).thenReturn(_taskExecutor);
when(_authenticationProvider.getParent(Broker.class)).thenReturn(_broker);
ConfiguredObjectFactory objectFactory = _broker.getObjectFactory();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Fri Apr 25 23:14:14 2014
@@ -116,14 +116,16 @@ public class BrokerTestHelper
Broker<?> broker = createBrokerMock();
ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
- when(broker.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
- VirtualHostNode<?> virtualHostNode = mock(VirtualHostNode.class);
+ VirtualHostNode virtualHostNode = mock(VirtualHostNode.class);
+ when(virtualHostNode.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
+
DurableConfigurationStore dcs = mock(DurableConfigurationStore.class);
when(virtualHostNode.getConfigurationStore()).thenReturn(dcs);
when(virtualHostNode.getParent(Broker.class)).thenReturn(broker);
when(virtualHostNode.getModel()).thenReturn(objectFactory.getModel());
when(virtualHostNode.getObjectFactory()).thenReturn(objectFactory);
+ when(virtualHostNode.getCategoryClass()).thenReturn(VirtualHostNode.class);
AbstractVirtualHost host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class, attributes, virtualHostNode );
host.setDesiredState(host.getState(), State.ACTIVE);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Fri Apr 25 23:14:14 2014
@@ -35,7 +35,6 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObjectAttribute;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.Connection;
import org.apache.qpid.server.model.IllegalStateTransitionException;
@@ -448,12 +447,6 @@ public class MockVirtualHost implements
}
-
- public long getCreateTime()
- {
- return 0;
- }
-
public UUID getId()
{
return null;
@@ -483,12 +476,6 @@ public class MockVirtualHost implements
}
@Override
- public <T> T getAttribute(final ConfiguredObjectAttribute<? super MockVirtualHost, T> attr)
- {
- return null;
- }
-
- @Override
public Map<String, Object> getActualAttributes()
{
return null;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java Fri Apr 25 23:14:14 2014
@@ -90,7 +90,8 @@ public class VirtualHostQueueCreationTes
when(_virtualHostNode.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
when(_virtualHostNode.getObjectFactory()).thenReturn(objectFactory);
when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel());
-
+ when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor);
+ when(((VirtualHostNode)_virtualHostNode).getCategoryClass()).thenReturn(VirtualHostNode.class);
_virtualHost = createHost();
}
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java?rev=1590188&r1=1590187&r2=1590188&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java Fri Apr 25 23:14:14 2014
@@ -58,8 +58,7 @@ public class ACLFileAccessControlProvide
public ACLFileAccessControlProviderImpl(Map<String, Object> attributes, Broker broker)
{
- super(parentsMap(broker),
- attributes, broker.getTaskExecutor());
+ super(parentsMap(broker), attributes);
_broker = broker;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org