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/11 23:45:29 UTC
svn commit: r1586783 [1/2] - 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/jav...
Author: rgodfrey
Date: Fri Apr 11 21:45:28 2014
New Revision: 1586783
URL: http://svn.apache.org/r1586783
Log:
QPID-5680 : [Java Broker] remove configuration defualt maps
Removed:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AmqpProtocolVersion.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/Port.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.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/FileBasedGroupProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.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/model/port/AmqpPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/PortWithAuthProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.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/security/FileKeyStore.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.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/AnonymousAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordDatabaseAuthenticationManager.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/ExternalAuthenticationManager.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/KerberosAuthenticationManager.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/PlainPasswordDatabaseAuthenticationManager.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/SimpleAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.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/transport/TCPandSSLTransport.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransportProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TransportProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaDataType_0_10.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataType_0_8.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_8.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolEngineCreator_0_9_1.java
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaDataType_1_0.java
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngineCreator_1_0_0_SASL.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
qpid/trunk/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
qpid/trunk/qpid/java/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketTransportProvider.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -83,7 +83,7 @@ public class BindingImpl
public BindingImpl(UUID id, Map<String, Object> attributes, AMQQueue queue, ExchangeImpl exchange)
{
- super(parentsMap(queue,exchange),Collections.EMPTY_MAP,combineIdWithAttributes(id,attributes),queue.getVirtualHost().getTaskExecutor());
+ super(parentsMap(queue,exchange),combineIdWithAttributes(id,attributes),queue.getVirtualHost().getTaskExecutor());
_id = id;
_bindingKey = (String)attributes.get(org.apache.qpid.server.model.Binding.NAME);
_queue = queue;
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -52,6 +52,7 @@ import org.apache.qpid.server.model.Publ
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.UUIDGenerator;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.BaseQueue;
@@ -108,8 +109,8 @@ public abstract class AbstractExchange<T
public AbstractExchange(VirtualHostImpl vhost, Map<String, Object> attributes) throws UnknownExchangeException
{
- super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(org.apache.qpid.server.model.VirtualHost.class, (org.apache.qpid.server.model.VirtualHost)vhost),
- Collections.<String,Object>emptyMap(), attributes, vhost.getTaskExecutor());
+ super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(VirtualHost.class, vhost),
+ attributes, vhost.getTaskExecutor());
_virtualHost = vhost;
_durable = MapValueConverter.getBooleanAttribute(org.apache.qpid.server.model.Exchange.DURABLE, attributes);
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -114,7 +114,6 @@ public abstract class AbstractConfigured
@ManagedAttributeField
private final UUID _id;
- private final Map<String, Object> _defaultAttributes = new HashMap<String, Object>();
private final TaskExecutor _taskExecutor;
@ManagedAttributeField
@@ -160,19 +159,17 @@ public abstract class AbstractConfigured
TaskExecutor taskExecutor)
{
this(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>emptyMap(),
- Collections.<String,Object>emptyMap(), attributes, taskExecutor, true);
+ attributes, taskExecutor, true);
}
protected AbstractConfiguredObject(final Map<Class<? extends ConfiguredObject>, ConfiguredObject<?>> parents,
- Map<String, Object> defaults,
Map<String, Object> attributes,
TaskExecutor taskExecutor)
{
- this(parents, defaults, attributes, taskExecutor, true);
+ this(parents, attributes, taskExecutor, true);
}
protected AbstractConfiguredObject(final Map<Class<? extends ConfiguredObject>, ConfiguredObject<?>> parents,
- Map<String, Object> defaults,
Map<String, Object> attributes,
TaskExecutor taskExecutor,
boolean filterAttributes)
@@ -254,10 +251,6 @@ public abstract class AbstractConfigured
}
- if (defaults != null)
- {
- _defaultAttributes.putAll(defaults);
- }
if(!_attributes.containsKey(CREATED_BY))
{
final AuthenticatedPrincipal currentUser = SecurityManager.getCurrentUser();
@@ -273,7 +266,6 @@ public abstract class AbstractConfigured
for(Attribute<?,?> attr : _attributeTypes.values())
{
if(attr.getAnnotation().mandatory() && !(_attributes.containsKey(attr.getName())
- || _defaultAttributes.containsKey(attr.getName())
|| !"".equals(attr.getAnnotation().defaultValue())))
{
throw new IllegalArgumentException("Mandatory attribute " + attr.getName() + " not supplied for instance of " + getClass().getName());
@@ -421,10 +413,6 @@ public abstract class AbstractConfigured
{
automatedSetValue(attrName, _attributes.get(attrName));
}
- else if (_defaultAttributes.containsKey(attrName))
- {
- automatedSetValue(attrName, _defaultAttributes.get(attrName));
- }
else if (!"".equals(attrAnnotation.defaultValue()))
{
automatedSetValue(attrName, attrAnnotation.defaultValue());
@@ -582,11 +570,6 @@ public abstract class AbstractConfigured
}
}
- private final Object getDefaultAttribute(String name)
- {
- return _defaultAttributes.get(name);
- }
-
@Override
public Object getAttribute(String name)
{
@@ -607,33 +590,10 @@ public abstract class AbstractConfigured
else
{
Object value = getActualAttribute(name);
- if (value == null)
- {
- value = getDefaultAttribute(name);
- }
- return value;
- }
- }
-
- protected <T extends ConfiguredObject<?>> Object getAttribute(String name, T parent, String parentAttributeName)
- {
- Object value = getActualAttribute(name);
- if (value != null )
- {
return value;
}
- if (parent != null)
- {
- value = parent.getAttribute(parentAttributeName);
- if (value != null)
- {
- return value;
- }
- }
- return getDefaultAttribute(name);
}
-
@Override
public String getDescription()
{
@@ -709,14 +669,7 @@ public abstract class AbstractConfigured
Attribute<?,?> attr = _attributeTypes.get(name);
if(attr != null && attr.getAnnotation().automate())
{
- if(desired == null && _defaultAttributes.containsKey(name))
- {
- automatedSetValue(name, _defaultAttributes.get(name));
- }
- else
- {
- automatedSetValue(name, desired);
- }
+ automatedSetValue(name, desired);
}
return true;
}
@@ -954,11 +907,6 @@ public abstract class AbstractConfigured
// allowed by default
}
- protected Map<String, Object> getDefaultAttributes()
- {
- return _defaultAttributes;
- }
-
/**
* Returns a map of effective attribute values that would result
* if applying the supplied changes. Does not apply the changes.
@@ -969,11 +917,10 @@ public abstract class AbstractConfigured
//the result of applying the attribute changes, so we
//can validate the configuration that would result
- Map<String, Object> defaultValues = getDefaultAttributes();
Map<String, Object> existingActualValues = getActualAttributes();
//create a new merged map, starting with the defaults
- Map<String, Object> merged = new HashMap<String, Object>(defaultValues);
+ Map<String, Object> merged = new HashMap<String, Object>();
for(String name : getAttributeNames())
{
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Port.java Fri Apr 11 21:45:28 2014
@@ -44,7 +44,7 @@ public interface Port<X extends Port<X>>
// Attributes
- @ManagedAttribute(automate = true)
+ @ManagedAttribute(automate = true, defaultValue = "*")
String getBindingAddress();
@ManagedAttribute(mandatory = true, automate = true)
@@ -53,7 +53,7 @@ public interface Port<X extends Port<X>>
@ManagedAttribute( automate = true )
Set<Protocol> getProtocols();
- @ManagedAttribute( automate = true )
+ @ManagedAttribute( automate = true, defaultValue = "TCP" )
Set<Transport> getTransports();
@ManagedAttribute( automate = true )
@@ -84,6 +84,7 @@ public interface Port<X extends Port<X>>
AccessControlException,
IllegalArgumentException;
+ Collection<Protocol> getAvailableProtocols();
//children
Collection<VirtualHostAlias> getVirtualHostBindings();
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java Fri Apr 11 21:45:28 2014
@@ -23,8 +23,6 @@ package org.apache.qpid.server.model;
import java.util.Collection;
import java.util.EnumSet;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
-
public enum Protocol
{
AMQP_0_8(ProtocolType.AMQP),
@@ -53,25 +51,6 @@ public enum Protocol
return _protocolType == ProtocolType.AMQP;
}
- public AmqpProtocolVersion toAmqpProtocolVersion()
- {
- switch(this)
- {
- case AMQP_0_8:
- return AmqpProtocolVersion.v0_8;
- case AMQP_0_9:
- return AmqpProtocolVersion.v0_9;
- case AMQP_0_9_1:
- return AmqpProtocolVersion.v0_9_1;
- case AMQP_0_10:
- return AmqpProtocolVersion.v0_10;
- case AMQP_1_0:
- return AmqpProtocolVersion.v1_0_0;
- default:
- throw new IllegalArgumentException(this + " is not an known AMQP protocol");
- }
- }
-
public static Protocol valueOfObject(Object protocolObject)
{
Protocol protocol;
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -20,6 +20,12 @@
*/
package org.apache.qpid.server.model.adapter;
+import java.security.AccessControlException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -28,19 +34,14 @@ import org.apache.qpid.server.model.Plug
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.security.access.Operation;
-import java.security.AccessControlException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.UUID;
-
public abstract class AbstractPluginAdapter<X extends Plugin<X>> extends AbstractConfiguredObject<X> implements Plugin<X>
{
private Broker _broker;
- protected AbstractPluginAdapter(UUID id, Map<String, Object> defaults, Map<String, Object> attributes, Broker broker)
+ protected AbstractPluginAdapter(UUID id, Map<String, Object> attributes, Broker broker)
{
- super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(Broker.class, broker), defaults, combineIdWithAttributes(id, attributes), broker.getTaskExecutor());
+ super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(Broker.class, broker),
+ combineIdWithAttributes(id, attributes), broker.getTaskExecutor());
_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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -137,7 +137,7 @@ public class BrokerAdapter extends Abstr
SystemContext parent)
{
super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(SystemContext.class, parent),
- Collections.<String,Object>emptyMap(), combineIdWithAttributes(id,MapValueConverter.convert(attributes, ATTRIBUTE_TYPES)), parent.getTaskExecutor());
+ combineIdWithAttributes(id,MapValueConverter.convert(attributes, ATTRIBUTE_TYPES)), parent.getTaskExecutor());
_objectFactory = parent.getObjectFactory();
_virtualHostRegistry = new VirtualHostRegistry(parent.getEventLogger());
@@ -152,7 +152,7 @@ public class BrokerAdapter extends Abstr
Map<String,Object> authManagerAttrs = new HashMap<String, Object>();
authManagerAttrs.put(NAME,"MANAGEMENT_MODE_AUTHENTICATION");
authManagerAttrs.put(ID, UUID.randomUUID());
- SimpleAuthenticationManager authManager = new SimpleAuthenticationManager(this, Collections.<String,Object>emptyMap(), authManagerAttrs);
+ SimpleAuthenticationManager authManager = new SimpleAuthenticationManager(this, authManagerAttrs);
authManager.addUser(BrokerOptions.MANAGEMENT_MODE_USER_NAME, _brokerOptions.getManagementModePassword());
_managementModeAuthenticationProvider = authManager;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProvider.java Fri Apr 11 21:45:28 2014
@@ -54,7 +54,7 @@ public class FileBasedGroupProvider
Map<String, Object> attributes)
{
super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(Broker.class, broker),
- Collections.<String,Object>emptyMap(), combineIdWithAttributes(id, attributes), broker.getTaskExecutor());
+ combineIdWithAttributes(id, attributes), broker.getTaskExecutor());
_broker = broker;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java Fri Apr 11 21:45:28 2014
@@ -86,7 +86,6 @@ public class FileSystemPreferencesProvid
AuthenticationProvider<? extends AuthenticationProvider> authenticationProvider)
{
super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(AuthenticationProvider.class, authenticationProvider),
- Collections.<String,Object>emptyMap(),
combineIdWithAttributes(id,MapValueConverter.convert(attributes, ATTRIBUTE_TYPES)),
authenticationProvider.getParent(Broker.class).getTaskExecutor());
State state = MapValueConverter.getEnumAttribute(State.class, STATE, attributes, State.INITIALISING);
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -86,11 +86,9 @@ abstract public class AbstractPort<X ext
public AbstractPort(UUID id,
Broker<?> broker,
Map<String, Object> attributes,
- Map<String, Object> defaults,
TaskExecutor taskExecutor)
{
super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(Broker.class, broker),
- updateDefaults(defaults, attributes),
combineIdWithAttributes(id,attributes),
taskExecutor);
_broker = broker;
@@ -112,17 +110,6 @@ abstract public class AbstractPort<X ext
}
}
- private static Map<String, Object> updateDefaults(final Map<String, Object> defaults,
- final Map<String, Object> attributes)
- {
- Map<String, Object> updatedDefaults = new HashMap<String, Object>(defaults);
- if(!defaults.containsKey(TRANSPORTS))
- {
- updatedDefaults.put(Port.TRANSPORTS, Collections.singleton(DEFAULT_TRANSPORT));
- }
- return updatedDefaults;
- }
-
@Override
public String getBindingAddress()
{
@@ -199,6 +186,19 @@ abstract public class AbstractPort<X ext
}
@Override
+ public Set<Protocol> getAvailableProtocols()
+ {
+ Set<Protocol> protocols = getProtocols();
+ if(protocols == null || protocols.isEmpty())
+ {
+ protocols = getDefaultProtocols();
+ }
+ return protocols;
+ }
+
+ protected abstract Set<Protocol> getDefaultProtocols();
+
+ @Override
public String setName(String currentName, String desiredName) throws IllegalStateException, AccessControlException
{
throw new IllegalStateException();
@@ -530,11 +530,11 @@ abstract public class AbstractPort<X ext
for (Port<?> existingPort : existingPorts)
{
- Collection<Protocol> portProtocols = existingPort.getProtocols();
+ Collection<Protocol> portProtocols = existingPort.getAvailableProtocols();
if (portProtocols != null)
{
final ArrayList<Protocol> intersection = new ArrayList(portProtocols);
- intersection.retainAll(getProtocols());
+ intersection.retainAll(getAvailableProtocols());
if(!intersection.isEmpty())
{
throw new IllegalConfigurationException("Port for protocols " + intersection + " already exists. Only one management port per protocol can be created.");
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java Fri Apr 11 21:45:28 2014
@@ -20,15 +20,23 @@
package org.apache.qpid.server.model.port;
import java.security.GeneralSecurityException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
-
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.messages.BrokerMessages;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.KeyStore;
@@ -38,10 +46,8 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.plugin.QpidServiceLoader;
import org.apache.qpid.server.plugin.TransportProviderFactory;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.transport.AcceptingTransport;
import org.apache.qpid.server.transport.TransportProvider;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -54,7 +60,7 @@ public class AmqpPort extends PortWithAu
public static final String DEFAULT_AMQP_RECEIVE_BUFFER_SIZE = "262144";
public static final String DEFAULT_AMQP_TCP_NO_DELAY = "true";
- public static final String DEFAULT_AMQP_BINDING = "*";
+ public static final String DEFAULT_BINDING_ADDRESS = "*";
@ManagedAttributeField
private boolean _tcpNoDelay;
@@ -73,23 +79,10 @@ public class AmqpPort extends PortWithAu
Map<String, Object> attributes,
TaskExecutor taskExecutor)
{
- super(id, broker, attributes, defaults(attributes), taskExecutor);
+ super(id, broker, attributes, Collections.<String,Object>emptyMap(), taskExecutor);
_broker = broker;
}
- private static Map<String, Object> defaults(Map<String,Object> attributes)
- {
- Map<String,Object> defaults = new HashMap<String, Object>();
-
- defaults.put(BINDING_ADDRESS, DEFAULT_AMQP_BINDING);
- defaults.put(NAME, attributes.containsKey(BINDING_ADDRESS) ? attributes.get(BINDING_ADDRESS) : DEFAULT_AMQP_BINDING + ":" + attributes.get(PORT));
- defaults.put(PROTOCOLS, getDefaultProtocols());
-
-
- return defaults;
- }
-
-
@ManagedAttribute( automate = true , defaultValue = DEFAULT_AMQP_TCP_NO_DELAY )
public boolean isTcpNoDelay()
{
@@ -108,7 +101,7 @@ public class AmqpPort extends PortWithAu
return _receiveBufferSize;
}
- private static Set<Protocol> getDefaultProtocols()
+ protected Set<Protocol> getDefaultProtocols()
{
Set<Protocol> defaultProtocols = EnumSet.of(Protocol.AMQP_0_8, Protocol.AMQP_0_9, Protocol.AMQP_0_9_1,
Protocol.AMQP_0_10, Protocol.AMQP_1_0);
@@ -140,7 +133,6 @@ public class AmqpPort extends PortWithAu
protected void onActivate()
{
Collection<Transport> transports = getTransports();
- Set<AmqpProtocolVersion> supported = convertFromModelProtocolsToAmqp(getProtocols());
TransportProvider transportProvider = null;
final HashSet<Transport> transportSet = new HashSet<Transport>(transports);
@@ -163,12 +155,12 @@ public class AmqpPort extends PortWithAu
sslContext = createSslContext();
}
- AmqpProtocolVersion defaultSupportedProtocolReply = getDefaultAmqpSupportedReply();
+ Protocol defaultSupportedProtocolReply = getDefaultAmqpSupportedReply();
_transport = transportProvider.createTransport(transportSet,
sslContext,
this,
- supported,
+ getAvailableProtocols(),
defaultSupportedProtocolReply);
_transport.start();
@@ -191,16 +183,6 @@ public class AmqpPort extends PortWithAu
}
}
- private Set<AmqpProtocolVersion> convertFromModelProtocolsToAmqp(Collection<Protocol> modelProtocols)
- {
- Set<AmqpProtocolVersion> amqpProtocols = new HashSet<AmqpProtocolVersion>();
- for (Protocol protocol : modelProtocols)
- {
- amqpProtocols.add(protocol.toAmqpProtocolVersion());
- }
- return amqpProtocols;
- }
-
private SSLContext createSslContext()
{
KeyStore keyStore = getKeyStore();
@@ -267,12 +249,12 @@ public class AmqpPort extends PortWithAu
}
}
- private AmqpProtocolVersion getDefaultAmqpSupportedReply()
+ private Protocol getDefaultAmqpSupportedReply()
{
String defaultAmqpSupportedReply = System.getProperty(BrokerProperties.PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY);
- if (defaultAmqpSupportedReply != null)
+ if (defaultAmqpSupportedReply != null && defaultAmqpSupportedReply.length() != 0)
{
- return AmqpProtocolVersion.valueOf(defaultAmqpSupportedReply);
+ return Protocol.valueOf("AMQP_" + defaultAmqpSupportedReply.substring(1));
}
return null;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java Fri Apr 11 21:45:28 2014
@@ -20,14 +20,16 @@
*/
package org.apache.qpid.server.model.port;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ManagedObject;
-
import java.util.Collections;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ManagedObject;
+import org.apache.qpid.server.model.Protocol;
+
@ManagedObject( category = false, type = "HTTP")
public class HttpPort extends PortWithAuthProvider<HttpPort>
{
@@ -38,4 +40,10 @@ public class HttpPort extends PortWithAu
{
super(id, broker, attributes, Collections.<String,Object>emptyMap(), taskExecutor);
}
+
+ @Override
+ protected Set<Protocol> getDefaultProtocols()
+ {
+ return Collections.singleton(Protocol.HTTP);
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java Fri Apr 11 21:45:28 2014
@@ -22,11 +22,13 @@ package org.apache.qpid.server.model.por
import java.util.Collections;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
+import org.apache.qpid.server.model.Protocol;
@ManagedObject( category = false, type = "JMX")
public class JmxPort extends PortWithAuthProvider<JmxPort>
@@ -45,4 +47,10 @@ public class JmxPort extends PortWithAut
super.validate();
validateOnlyOneInstance();
}
+
+ @Override
+ protected Set<Protocol> getDefaultProtocols()
+ {
+ return Collections.singleton(Protocol.JMX_RMI);
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/PortWithAuthProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/PortWithAuthProvider.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/PortWithAuthProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/PortWithAuthProvider.java Fri Apr 11 21:45:28 2014
@@ -51,7 +51,7 @@ abstract public class PortWithAuthProvid
final Map<String, Object> defaults,
final TaskExecutor taskExecutor)
{
- super(id, broker, attributes, defaults, taskExecutor);
+ super(id, broker, attributes, taskExecutor);
}
@ManagedAttribute( automate = true, defaultValue = DEFAULT_AMQP_NEED_CLIENT_AUTH )
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java Fri Apr 11 21:45:28 2014
@@ -22,12 +22,14 @@ package org.apache.qpid.server.model.por
import java.util.Collections;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
+import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.Transport;
@ManagedObject( category = false, type = "RMI")
@@ -38,7 +40,7 @@ public class RmiPort extends AbstractPor
final Map<String, Object> attributes,
final TaskExecutor taskExecutor)
{
- super(id, broker, attributes, Collections.<String,Object>emptyMap(), taskExecutor);
+ super(id, broker, attributes, taskExecutor);
}
@Override
@@ -54,4 +56,10 @@ public class RmiPort extends AbstractPor
}
}
+
+ @Override
+ protected Set<Protocol> getDefaultProtocols()
+ {
+ return Collections.singleton(Protocol.RMI);
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/ProtocolEngineCreator.java Fri Apr 11 21:45:28 2014
@@ -22,13 +22,13 @@ package org.apache.qpid.server.plugin;/*
import org.apache.qpid.protocol.ServerProtocolEngine;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.transport.network.NetworkConnection;
public interface ProtocolEngineCreator extends Pluggable
{
- AmqpProtocolVersion getVersion();
+ Protocol getVersion();
byte[] getHeaderIdentifier();
ServerProtocolEngine newProtocolEngine(Broker broker,
NetworkConnection network,
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java Fri Apr 11 21:45:28 2014
@@ -37,6 +37,7 @@ import org.apache.qpid.protocol.ServerPr
import org.apache.qpid.server.logging.messages.ConnectionMessages;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.plugin.ProtocolEngineCreator;
import org.apache.qpid.transport.Sender;
@@ -57,19 +58,19 @@ public class MultiVersionProtocolEngine
private final Transport _transport;
private final ProtocolEngineCreator[] _creators;
- private Set<AmqpProtocolVersion> _supported;
+ private Set<Protocol> _supported;
private String _fqdn;
private final Broker _broker;
private NetworkConnection _network;
private Sender<ByteBuffer> _sender;
- private final AmqpProtocolVersion _defaultSupportedReply;
+ private final Protocol _defaultSupportedReply;
private volatile ServerProtocolEngine _delegate = new SelfDelegateProtocolEngine();
public MultiVersionProtocolEngine(final Broker broker,
SSLContext sslContext, boolean wantClientAuth, boolean needClientAuth,
- final Set<AmqpProtocolVersion> supported,
- final AmqpProtocolVersion defaultSupportedReply,
+ final Set<Protocol> supported,
+ final Protocol defaultSupportedReply,
Port port, Transport transport, final long id, ProtocolEngineCreator[] creators)
{
if(defaultSupportedReply != null && !supported.contains(defaultSupportedReply))
@@ -307,7 +308,7 @@ public class MultiVersionProtocolEngine
ServerProtocolEngine newDelegate = null;
byte[] supportedReplyBytes = null;
byte[] defaultSupportedReplyBytes = null;
- AmqpProtocolVersion supportedReplyVersion = null;
+ Protocol supportedReplyVersion = null;
//Check the supported versions for a header match, and if there is one save the
//delegate. Also save most recent supported version and associated reply header bytes
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java Fri Apr 11 21:45:28 2014
@@ -22,14 +22,16 @@ package org.apache.qpid.server.protocol;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+
import javax.net.ssl.SSLContext;
+
import org.apache.qpid.protocol.ProtocolEngineFactory;
import org.apache.qpid.protocol.ServerProtocolEngine;
import org.apache.qpid.server.model.Broker;
-
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.plugin.ProtocolEngineCreator;
import org.apache.qpid.server.plugin.QpidServiceLoader;
@@ -39,8 +41,8 @@ public class MultiVersionProtocolEngineF
private static final AtomicLong ID_GENERATOR = new AtomicLong(0);
private final Broker _broker;
- private final Set<AmqpProtocolVersion> _supported;
- private final AmqpProtocolVersion _defaultSupportedReply;
+ private final Set<Protocol> _supported;
+ private final Protocol _defaultSupportedReply;
private final SSLContext _sslContext;
private final boolean _wantClientAuth;
private final boolean _needClientAuth;
@@ -52,8 +54,8 @@ public class MultiVersionProtocolEngineF
SSLContext sslContext,
boolean wantClientAuth,
boolean needClientAuth,
- final Set<AmqpProtocolVersion> supportedVersions,
- final AmqpProtocolVersion defaultSupportedReply,
+ final Set<Protocol> supportedVersions,
+ final Protocol defaultSupportedReply,
Port port,
Transport transport)
{
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -75,6 +75,7 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.QueueNotificationListener;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.security.SecurityManager;
@@ -242,8 +243,8 @@ public abstract class AbstractQueue
Map<String, Object> attributes,
QueueEntryListFactory entryListFactory)
{
- super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(org.apache.qpid.server.model.VirtualHost.class, (org.apache.qpid.server.model.VirtualHost)virtualHost),
- Collections.<String,Object>emptyMap(), attributes, virtualHost.getTaskExecutor());
+ super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(VirtualHost.class, virtualHost),
+ attributes, virtualHost.getTaskExecutor());
_entries = entryListFactory.createQueueEntryList(this);
_virtualHost = virtualHost;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStore.java Fri Apr 11 21:45:28 2014
@@ -118,7 +118,7 @@ public class FileKeyStore extends Abstra
public FileKeyStore(UUID id, Broker<?> broker, Map<String, Object> attributes)
{
super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(Broker.class, broker),
- Collections.<String,Object>emptyMap(), combineIdWithAttributes(id, attributes),
+ combineIdWithAttributes(id, attributes),
broker.getTaskExecutor());
_broker = broker;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStore.java Fri Apr 11 21:45:28 2014
@@ -105,7 +105,7 @@ public class FileTrustStore extends Abst
public FileTrustStore(UUID id, Broker<?> broker, Map<String, Object> attributes)
{
super(Collections.<Class<? extends ConfiguredObject>,ConfiguredObject<?>>singletonMap(Broker.class, broker),
- Collections.<String,Object>emptyMap(), combineIdWithAttributes(id, attributes),
+ combineIdWithAttributes(id, attributes),
broker.getTaskExecutor());
_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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -61,11 +61,10 @@ public abstract class AbstractAuthentica
private AtomicReference<State> _state = new AtomicReference<State>(State.INITIALISING);
protected AbstractAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
final Map<String, Object> attributes)
{
super(Collections.<Class<? extends ConfiguredObject>, ConfiguredObject<?>>singletonMap(Broker.class, broker),
- defaults, attributes, broker.getTaskExecutor());
+ attributes, broker.getTaskExecutor());
_broker = broker;
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManager.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManager.java Fri Apr 11 21:45:28 2014
@@ -51,10 +51,9 @@ public class AnonymousAuthenticationMana
private static final AuthenticationResult ANONYMOUS_AUTHENTICATION = new AuthenticationResult(ANONYMOUS_PRINCIPAL);
protected AnonymousAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
final Map<String, Object> attributes)
{
- super(broker, defaults, attributes);
+ super(broker, attributes);
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerFactory.java Fri Apr 11 21:45:28 2014
@@ -54,7 +54,7 @@ public class AnonymousAuthenticationMana
public AnonymousAuthenticationManager createInstance(final Map<String, Object> attributes,
final ConfiguredObject<?>... parents)
{
- return new AnonymousAuthenticationManager(getParent(Broker.class,parents), Collections.<String,Object>emptyMap(),attributes);
+ return new AnonymousAuthenticationManager(getParent(Broker.class,parents), attributes);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordDatabaseAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordDatabaseAuthenticationManager.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordDatabaseAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/Base64MD5PasswordDatabaseAuthenticationManager.java Fri Apr 11 21:45:28 2014
@@ -20,18 +20,13 @@
*/
package org.apache.qpid.server.security.auth.manager;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import java.util.Map;
+
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.security.auth.database.Base64MD5PasswordFilePrincipalDatabase;
-import org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase;
import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-
@ManagedObject( category = false, type = "Base64MD5PasswordFile" )
public class Base64MD5PasswordDatabaseAuthenticationManager
extends PrincipalDatabaseAuthenticationManager<Base64MD5PasswordDatabaseAuthenticationManager>
@@ -39,11 +34,9 @@ public class Base64MD5PasswordDatabaseAu
protected Base64MD5PasswordDatabaseAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
- final Map<String, Object> attributes,
- final boolean recovering)
+ final Map<String, Object> attributes)
{
- super(broker, defaults, attributes,recovering);
+ super(broker, attributes);
}
@Override
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -66,7 +66,7 @@ public class Base64MD5PasswordFileAuthen
public Base64MD5PasswordDatabaseAuthenticationManager createInstance(final Map<String, Object> attributes,
final ConfiguredObject<?>... parents)
{
- return new Base64MD5PasswordDatabaseAuthenticationManager(getParent(Broker.class, parents), Collections.<String,Object>emptyMap(),attributes,false);
+ return new Base64MD5PasswordDatabaseAuthenticationManager(getParent(Broker.class, parents), attributes);
}
@Override
@@ -78,9 +78,8 @@ public class Base64MD5PasswordFileAuthen
attributes.put(ConfiguredObject.ID, record.getId());
final Base64MD5PasswordDatabaseAuthenticationManager authenticationManager =
new Base64MD5PasswordDatabaseAuthenticationManager(getParent(Broker.class, parents),
- Collections.<String, Object>emptyMap(),
- attributes,
- true);
+ attributes
+ );
return ResolvedObject.newInstance(authenticationManager);
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java Fri Apr 11 21:45:28 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedAttributeField;
@@ -42,10 +41,9 @@ public class ExternalAuthenticationManag
private boolean _useFullDN;
protected ExternalAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
final Map<String, Object> attributes)
{
- super(broker, defaults, attributes);
+ super(broker, attributes);
}
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -60,7 +60,7 @@ public class ExternalAuthenticationManag
public ExternalAuthenticationManager createInstance(final Map<String, Object> attributes,
final ConfiguredObject<?>... parents)
{
- return new ExternalAuthenticationManager(getParent(Broker.class, parents), Collections.<String,Object>emptyMap(),attributes);
+ return new ExternalAuthenticationManager(getParent(Broker.class, parents), attributes);
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java Fri Apr 11 21:45:28 2014
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.security.Principal;
import java.util.HashMap;
import java.util.Map;
+
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -30,7 +31,6 @@ import javax.security.sasl.Sasl;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.security.auth.AuthenticationResult;
@@ -43,10 +43,9 @@ public class KerberosAuthenticationManag
private final CallbackHandler _callbackHandler = new GssApiCallbackHandler();
protected KerberosAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
final Map<String, Object> attributes)
{
- super(broker, defaults, attributes);
+ super(broker, attributes);
}
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -52,7 +52,7 @@ public class KerberosAuthenticationManag
public KerberosAuthenticationManager createInstance(final Map<String, Object> attributes,
final ConfiguredObject<?>... parents)
{
- return new KerberosAuthenticationManager(getParent(Broker.class, parents), Collections.<String,Object>emptyMap(), attributes);
+ return new KerberosAuthenticationManager(getParent(Broker.class, parents), attributes);
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManager.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PlainPasswordDatabaseAuthenticationManager.java Fri Apr 11 21:45:28 2014
@@ -20,21 +20,20 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import java.util.Map;
+
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase;
import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import java.util.Map;
-
@ManagedObject( category = false, type = "PlainPasswordFile" )
public class PlainPasswordDatabaseAuthenticationManager extends PrincipalDatabaseAuthenticationManager<PlainPasswordDatabaseAuthenticationManager>
{
protected PlainPasswordDatabaseAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
- final Map<String, Object> attributes, final boolean recovering)
+ final Map<String, Object> attributes)
{
- super(broker, defaults, attributes,recovering);
+ super(broker, attributes);
}
@Override
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -68,7 +68,7 @@ public class PlainPasswordFileAuthentica
public PlainPasswordDatabaseAuthenticationManager createInstance(final Map<String, Object> attributes,
final ConfiguredObject<?>... parents)
{
- return new PlainPasswordDatabaseAuthenticationManager(getParent(Broker.class, parents), Collections.<String,Object>emptyMap(),attributes,false);
+ return new PlainPasswordDatabaseAuthenticationManager(getParent(Broker.class, parents), attributes);
}
@Override
@@ -80,9 +80,8 @@ public class PlainPasswordFileAuthentica
attributes.put(ConfiguredObject.ID, record.getId());
PlainPasswordDatabaseAuthenticationManager authManager = new PlainPasswordDatabaseAuthenticationManager(
getParent(Broker.class, parents),
- Collections.<String, Object>emptyMap(),
- attributes,
- true);
+ attributes
+ );
return ResolvedObject.newInstance(authManager);
}
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -59,11 +59,9 @@ public abstract class PrincipalDatabaseA
private String _path;
protected PrincipalDatabaseAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
- final Map<String, Object> attributes,
- boolean recovering)
+ final Map<String, Object> attributes)
{
- super(broker, defaults, attributes);
+ super(broker, attributes);
}
@Override
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -20,25 +20,6 @@
*/
package org.apache.qpid.server.security.auth.manager;
-import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
-import org.apache.qpid.server.configuration.RecovererProvider;
-import org.apache.qpid.server.configuration.updater.ChangeAttributesTask;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.model.*;
-import org.apache.qpid.server.model.AbstractConfiguredObject;
-import org.apache.qpid.server.security.SecurityManager;
-import org.apache.qpid.server.security.access.Operation;
-import org.apache.qpid.server.security.auth.AuthenticationResult;
-import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.server.security.auth.sasl.scram.ScramSHA1SaslServer;
-import org.apache.qpid.server.store.ConfiguredObjectRecord;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import javax.security.auth.login.AccountNotFoundException;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-import javax.xml.bind.DatatypeConverter;
import java.io.IOException;
import java.nio.charset.Charset;
import java.security.AccessControlException;
@@ -55,6 +36,33 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.security.auth.login.AccountNotFoundException;
+import javax.security.sasl.SaslException;
+import javax.security.sasl.SaslServer;
+import javax.xml.bind.DatatypeConverter;
+
+import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
+import org.apache.qpid.server.configuration.RecovererProvider;
+import org.apache.qpid.server.configuration.updater.ChangeAttributesTask;
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.model.AbstractConfiguredObject;
+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.LifetimePolicy;
+import org.apache.qpid.server.model.ManagedObject;
+import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
+import org.apache.qpid.server.model.PreferencesProvider;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.User;
+import org.apache.qpid.server.security.SecurityManager;
+import org.apache.qpid.server.security.access.Operation;
+import org.apache.qpid.server.security.auth.AuthenticationResult;
+import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.server.security.auth.sasl.scram.ScramSHA1SaslServer;
+
@ManagedObject( category = false, type = "SCRAM-SHA1" )
public class ScramSHA1AuthenticationManager
extends AbstractAuthenticationManager<ScramSHA1AuthenticationManager>
@@ -70,10 +78,9 @@ public class ScramSHA1AuthenticationMana
protected ScramSHA1AuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
final Map<String, Object> attributes)
{
- super(broker, defaults, attributes);
+ super(broker, attributes);
}
@Override
@@ -435,7 +442,6 @@ public class ScramSHA1AuthenticationMana
protected ScramAuthUser(final Map<String, Object> attributes, ScramSHA1AuthenticationManager parent)
{
super(parentsMap(parent),
- Collections.<String,Object>emptyMap(),
attributes, parent.getTaskExecutor());
_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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -60,7 +60,7 @@ public class ScramSHA1AuthenticationMana
public ScramSHA1AuthenticationManager createInstance(final Map<String, Object> attributes,
final ConfiguredObject<?>... parents)
{
- return new ScramSHA1AuthenticationManager(getParent(Broker.class, parents), Collections.<String,Object>emptyMap(),attributes);
+ return new ScramSHA1AuthenticationManager(getParent(Broker.class, parents), attributes);
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java Fri Apr 11 21:45:28 2014
@@ -55,10 +55,9 @@ public class SimpleAuthenticationManager
private final Map<String, String> _users = Collections.synchronizedMap(new HashMap<String, String>());
public SimpleAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
final Map<String, Object> attributes)
{
- super(broker, defaults, attributes);
+ super(broker, attributes);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java Fri Apr 11 21:45:28 2014
@@ -24,7 +24,6 @@ import java.security.GeneralSecurityExce
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
@@ -46,7 +45,7 @@ import javax.security.sasl.SaslException
import javax.security.sasl.SaslServer;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
+
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedAttributeField;
@@ -98,22 +97,11 @@ public class SimpleLDAPAuthenticationMan
private Class<? extends SocketFactory> _sslSocketFactoryOverrideClass;
protected SimpleLDAPAuthenticationManager(final Broker broker,
- final Map<String, Object> defaults,
final Map<String, Object> attributes)
{
- super(broker, createDefaults(defaults, attributes), attributes);
+ super(broker, attributes);
}
- private static Map<String, Object> createDefaults(final Map<String, Object> defaults,
- final Map<String, Object> attributes)
- {
- final Map<String, Object> newDefaults = new HashMap<String, Object>(defaults);
- if(!defaults.containsKey("providerAuthUrl") && attributes.containsKey("providerUrl"))
- {
- newDefaults.put("providerAuthUrl", attributes.get("providerUrl"));
- }
- return newDefaults;
- }
@Override
public void initialise()
@@ -238,7 +226,8 @@ public class SimpleLDAPAuthenticationMan
return new AuthenticationResult(AuthenticationStatus.CONTINUE);
}
- Hashtable<String, Object> env = createInitialDirContextEnvironment(_providerAuthUrl);
+ String providerAuthUrl = _providerAuthUrl == null ? _providerUrl : _providerAuthUrl;
+ Hashtable<String, Object> env = createInitialDirContextEnvironment(providerAuthUrl);
env.put(Context.SECURITY_AUTHENTICATION, "simple");
env.put(Context.SECURITY_PRINCIPAL, name);
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=1586783&r1=1586782&r2=1586783&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 11 21:45:28 2014
@@ -74,7 +74,7 @@ public class SimpleLDAPAuthenticationMan
public SimpleLDAPAuthenticationManager createInstance(final Map<String, Object> attributes,
final ConfiguredObject<?>... parents)
{
- return new SimpleLDAPAuthenticationManager(getParent(Broker.class, parents), Collections.<String,Object>emptyMap(),attributes);
+ return new SimpleLDAPAuthenticationManager(getParent(Broker.class, parents), attributes);
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransport.java Fri Apr 11 21:45:28 2014
@@ -20,20 +20,21 @@
*/
package org.apache.qpid.server.transport;
+import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS;
+
+import java.net.InetSocketAddress;
+import java.util.Set;
+
+import javax.net.ssl.SSLContext;
+
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.protocol.MultiVersionProtocolEngineFactory;
import org.apache.qpid.transport.NetworkTransportConfiguration;
import org.apache.qpid.transport.network.IncomingNetworkTransport;
-import javax.net.ssl.SSLContext;
-import java.net.InetSocketAddress;
-import java.util.Set;
-
-import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS;
-
class TCPandSSLTransport implements AcceptingTransport
{
private IncomingNetworkTransport _networkTransport;
@@ -41,14 +42,14 @@ class TCPandSSLTransport implements Acce
private SSLContext _sslContext;
private InetSocketAddress _bindingSocketAddress;
private Port<?> _port;
- private Set<AmqpProtocolVersion> _supported;
- private AmqpProtocolVersion _defaultSupportedProtocolReply;
+ private Set<Protocol> _supported;
+ private Protocol _defaultSupportedProtocolReply;
TCPandSSLTransport(final Set<Transport> transports,
final SSLContext sslContext,
final Port<?> port,
- final Set<AmqpProtocolVersion> supported,
- final AmqpProtocolVersion defaultSupportedProtocolReply)
+ final Set<Protocol> supported,
+ final Protocol defaultSupportedProtocolReply)
{
_transports = transports;
_sslContext = sslContext;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransportProvider.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransportProvider.java?rev=1586783&r1=1586782&r2=1586783&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransportProvider.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/TCPandSSLTransportProvider.java Fri Apr 11 21:45:28 2014
@@ -20,12 +20,13 @@
*/
package org.apache.qpid.server.transport;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.protocol.AmqpProtocolVersion;
+import java.util.Set;
import javax.net.ssl.SSLContext;
-import java.util.Set;
+
+import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.Protocol;
+import org.apache.qpid.server.model.Transport;
class TCPandSSLTransportProvider implements TransportProvider
{
@@ -33,8 +34,8 @@ class TCPandSSLTransportProvider impleme
public AcceptingTransport createTransport(final Set<Transport> transports,
final SSLContext sslContext,
final Port port,
- final Set<AmqpProtocolVersion> supported,
- final AmqpProtocolVersion defaultSupportedProtocolReply)
+ final Set<Protocol> supported,
+ final Protocol defaultSupportedProtocolReply)
{
return new TCPandSSLTransport(transports, sslContext, port, supported, defaultSupportedProtocolReply);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org