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/02/23 19:38:10 UTC
svn commit: r1571054 [3/4] - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/configuration/startup/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/model/adapter/ broke...
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java Sun Feb 23 18:38:07 2014
@@ -33,27 +33,14 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
-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.Connection;
-import org.apache.qpid.server.model.KeyStore;
-import org.apache.qpid.server.model.LifetimePolicy;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Protocol;
-import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.Statistics;
-import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.VirtualHostAlias;
+import org.apache.qpid.server.model.*;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.util.MapValueConverter;
import org.apache.qpid.server.util.ParameterizedTypeImpl;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
-public class PortAdapter extends AbstractAdapter implements Port
+abstract public class PortAdapter<X extends PortAdapter<X>> extends AbstractConfiguredObject<X> implements Port<X>
{
@SuppressWarnings("serial")
public static final Map<String, Type> ATTRIBUTE_TYPES = Collections.unmodifiableMap(new HashMap<String, Type>(){{
@@ -73,11 +60,11 @@ public class PortAdapter extends Abstrac
put(AUTHENTICATION_PROVIDER, String.class);
}});
- private final Broker _broker;
+ private final Broker<?> _broker;
private AuthenticationProvider _authenticationProvider;
private AtomicReference<State> _state;
- public PortAdapter(UUID id, Broker broker, Map<String, Object> attributes, Map<String, Object> defaults, TaskExecutor taskExecutor)
+ public PortAdapter(UUID id, Broker<?> broker, Map<String, Object> attributes, Map<String, Object> defaults, TaskExecutor taskExecutor)
{
super(id, defaults, MapValueConverter.convert(attributes, ATTRIBUTE_TYPES), taskExecutor);
_broker = broker;
@@ -162,9 +149,9 @@ public class PortAdapter extends Abstrac
public Collection<VirtualHostAlias> getVirtualHostBindings()
{
List<VirtualHostAlias> aliases = new ArrayList<VirtualHostAlias>();
- for(VirtualHost vh : _broker.getVirtualHosts())
+ for(VirtualHost<?> vh : _broker.getVirtualHosts())
{
- for(VirtualHostAlias alias : vh.getAliases())
+ for(VirtualHostAlias<?> alias : vh.getAliases())
{
if(alias.getPort().equals(this))
{
@@ -194,7 +181,7 @@ public class PortAdapter extends Abstrac
}
@Override
- public State getActualState()
+ public State getState()
{
return _state.get();
}
@@ -272,7 +259,7 @@ public class PortAdapter extends Abstrac
}
else if(STATE.equals(name))
{
- return getActualState();
+ return getState();
}
else if(DURABLE.equals(name))
{
@@ -300,7 +287,7 @@ public class PortAdapter extends Abstrac
@Override
public Collection<String> getAttributeNames()
{
- return AVAILABLE_ATTRIBUTES;
+ return Attribute.getAttributeNames(Port.class);
}
@Override
@@ -465,9 +452,9 @@ public class PortAdapter extends Abstrac
String authenticationProviderName = (String)merged.get(AUTHENTICATION_PROVIDER);
if (authenticationProviderName != null)
{
- Collection<AuthenticationProvider> providers = _broker.getAuthenticationProviders();
- AuthenticationProvider provider = null;
- for (AuthenticationProvider p : providers)
+ Collection<AuthenticationProvider<?>> providers = _broker.getAuthenticationProviders();
+ AuthenticationProvider<?> provider = null;
+ for (AuthenticationProvider<?> p : providers)
{
if (p.getName().equals(authenticationProviderName))
{
@@ -567,4 +554,33 @@ public class PortAdapter extends Abstrac
return getClass().getSimpleName() + " [id=" + getId() + ", name=" + getName() + ", port=" + getPort() + "]";
}
+ @Override
+ public boolean isTcpNoDelay()
+ {
+ return (Boolean)getAttribute(TCP_NO_DELAY);
+ }
+
+ @Override
+ public int getSendBufferSize()
+ {
+ return (Integer)getAttribute(SEND_BUFFER_SIZE);
+ }
+
+ @Override
+ public int getReceiveBufferSize()
+ {
+ return (Integer)getAttribute(RECEIVE_BUFFER_SIZE);
+ }
+
+ @Override
+ public boolean getNeedClientAuth()
+ {
+ return (Boolean)getAttribute(NEED_CLIENT_AUTH);
+ }
+
+ @Override
+ public boolean getWantClientAuth()
+ {
+ return (Boolean)getAttribute(WANT_CLIENT_AUTH);
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java Sun Feb 23 18:38:07 2014
@@ -141,7 +141,7 @@ public class PortFactory
}
defaults.put(Port.NAME, portValue + "-" + protocol.name());
- port = new PortAdapter(id, broker, attributes, defaults, broker.getTaskExecutor());
+ port = new NonAmqpPortAdapter(id, broker, attributes, defaults, broker.getTaskExecutor());
boolean rmiPort = port.getProtocols().contains(Protocol.RMI);
if (rmiPort && port.getTransports().contains(Transport.SSL))
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java Sun Feb 23 18:38:07 2014
@@ -39,7 +39,7 @@ import org.apache.qpid.server.store.Dura
import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.util.MapValueConverter;
-final class QueueAdapter<Q extends AMQQueue<?,Q,?>> extends AbstractAdapter implements Queue,
+final class QueueAdapter<Q extends AMQQueue<?,Q,?>> extends AbstractConfiguredObject<QueueAdapter<Q>> implements Queue<QueueAdapter<Q>>,
MessageSource.ConsumerRegistrationListener<Q>,
AMQQueue.NotificationListener
{
@@ -135,6 +135,124 @@ final class QueueAdapter<Q extends AMQQu
}
}
+ @Override
+ public String getQueueType()
+ {
+ return (String) getAttribute(QUEUE_TYPE);
+ }
+
+ @Override
+ public Exchange getAlternateExchange()
+ {
+ org.apache.qpid.server.exchange.Exchange alternateExchange = _queue.getAlternateExchange();
+ return alternateExchange == null ? null :
+ ConfiguredObjectFinder.findConfiguredObjectByName(_vhost.getExchanges(),
+ alternateExchange.getName());
+ }
+
+ @Override
+ public ExclusivityPolicy getExclusive()
+ {
+ return (ExclusivityPolicy) _queue.getAttribute(EXCLUSIVE);
+ }
+
+ @Override
+ public String getOwner()
+ {
+ return _queue.getOwner();
+ }
+
+ @Override
+ public boolean getNoLocal()
+ {
+ // TODO
+ return false;
+ }
+
+ @Override
+ public String getLvqKey()
+ {
+ return (String) _queue.getAttribute(LVQ_KEY);
+ }
+
+ @Override
+ public String getSortKey()
+ {
+ return (String) _queue.getAttribute(SORT_KEY);
+ }
+
+ @Override
+ public String getMessageGroupKey()
+ {
+ return (String) _queue.getAttribute(MESSAGE_GROUP_KEY);
+ }
+
+ @Override
+ public int getMessageGroupSharedGroups()
+ {
+ return (Integer) _queue.getAttribute(MESSAGE_GROUP_SHARED_GROUPS);
+ }
+
+ @Override
+ public int getMaximumDeliveryAttempts()
+ {
+ return _queue.getMaximumDeliveryCount();
+ }
+
+ @Override
+ public long getQueueFlowControlSizeBytes()
+ {
+ return _queue.getCapacity();
+ }
+
+ @Override
+ public long getQueueFlowResumeSizeBytes()
+ {
+ return _queue.getFlowResumeCapacity();
+ }
+
+ @Override
+ public boolean isQueueFlowStopped()
+ {
+ return false;
+ }
+
+ @Override
+ public long getAlertThresholdMessageAge()
+ {
+ return _queue.getMaximumMessageAge();
+ }
+
+ @Override
+ public long getAlertThresholdMessageSize()
+ {
+ return _queue.getMaximumMessageSize();
+ }
+
+ @Override
+ public long getAlertThresholdQueueDepthBytes()
+ {
+ return _queue.getMaximumQueueDepth();
+ }
+
+ @Override
+ public long getAlertThresholdQueueDepthMessages()
+ {
+ return _queue.getMaximumMessageCount();
+ }
+
+ @Override
+ public long getAlertRepeatGap()
+ {
+ return _queue.getMinimumAlertRepeatGap();
+ }
+
+ @Override
+ public int getPriorities()
+ {
+ return (Integer) _queue.getAttribute(PRIORITIES);
+ }
+
public Collection<org.apache.qpid.server.model.Binding> getBindings()
{
synchronized (_bindingAdapters)
@@ -173,7 +291,7 @@ final class QueueAdapter<Q extends AMQQu
return null; //TODO
}
- public State getActualState()
+ public State getState()
{
return null; //TODO
}
@@ -215,7 +333,7 @@ final class QueueAdapter<Q extends AMQQu
@Override
public Collection<String> getAttributeNames()
{
- return Queue.AVAILABLE_ATTRIBUTES;
+ return Attribute.getAttributeNames(Queue.class);
}
@Override
@@ -451,10 +569,6 @@ final class QueueAdapter<Q extends AMQQu
}
return "standard";
}
- else if(CREATED.equals(name))
- {
- // TODO
- }
else if(DURABLE.equals(name))
{
return _queue.isDurable();
@@ -479,10 +593,6 @@ final class QueueAdapter<Q extends AMQQu
{
// TODO
}
- else if(UPDATED.equals(name))
- {
- // TODO
- }
else if (DESCRIPTION.equals(name))
{
return _queue.getDescription();
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=1571054&r1=1571053&r2=1571054&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 Sun Feb 23 18:38:07 2014
@@ -28,18 +28,13 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.LifetimePolicy;
-import org.apache.qpid.server.model.Publisher;
-import org.apache.qpid.server.model.Session;
-import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.Statistics;
-import org.apache.qpid.server.model.UUIDGenerator;
+
+import org.apache.qpid.server.model.*;
import org.apache.qpid.server.consumer.Consumer;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.protocol.AMQSessionModel;
-final class SessionAdapter extends AbstractAdapter implements Session
+final class SessionAdapter extends AbstractConfiguredObject<SessionAdapter> implements Session<SessionAdapter>
{
// Attributes
@@ -55,6 +50,18 @@ final class SessionAdapter extends Abstr
_statistics = new SessionStatistics();
}
+ @Override
+ public int getChannelId()
+ {
+ return _session.getChannelId();
+ }
+
+ @Override
+ public boolean isProducerFlowBlocked()
+ {
+ return _session.getBlocking();
+ }
+
public Collection<org.apache.qpid.server.model.Consumer> getConsumers()
{
synchronized (_consumerAdapters)
@@ -79,7 +86,7 @@ final class SessionAdapter extends Abstr
return null; //TODO
}
- public State getActualState()
+ public State getState()
{
return null; //TODO
}
@@ -151,10 +158,7 @@ final class SessionAdapter extends Abstr
@Override
public Collection<String> getAttributeNames()
{
- Collection<String> names = new HashSet<String>(super.getAttributeNames());
- names.addAll(AVAILABLE_ATTRIBUTES);
-
- return Collections.unmodifiableCollection(names);
+ return Attribute.getAttributeNames(Session.class);
}
@Override
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/TrustStoreAdapter.java Sun Feb 23 18:38:07 2014
@@ -38,9 +38,9 @@ import javax.net.ssl.TrustManagerFactory
import javax.net.ssl.X509TrustManager;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.model.Attribute;
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.IntegrityViolationException;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
@@ -52,35 +52,35 @@ import org.apache.qpid.transport.network
import org.apache.qpid.transport.network.security.ssl.QpidPeersOnlyTrustManager;
import org.apache.qpid.transport.network.security.ssl.SSLUtil;
-public class TrustStoreAdapter extends AbstractKeyStoreAdapter implements TrustStore
+public class TrustStoreAdapter extends AbstractKeyStoreAdapter<TrustStoreAdapter> implements TrustStore<TrustStoreAdapter>
{
@SuppressWarnings("serial")
public static final Map<String, Type> ATTRIBUTE_TYPES = Collections.unmodifiableMap(new HashMap<String, Type>(){{
put(NAME, String.class);
put(PATH, String.class);
put(PASSWORD, String.class);
- put(TYPE, String.class);
+ put(TRUST_STORE_TYPE, String.class);
put(PEERS_ONLY, Boolean.class);
put(TRUST_MANAGER_FACTORY_ALGORITHM, String.class);
}});
@SuppressWarnings("serial")
public static final Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>(){{
- put(TrustStore.TYPE, DEFAULT_KEYSTORE_TYPE);
+ put(TrustStore.TRUST_STORE_TYPE, DEFAULT_KEYSTORE_TYPE);
put(TrustStore.PEERS_ONLY, Boolean.FALSE);
put(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM, TrustManagerFactory.getDefaultAlgorithm());
}});
- private Broker _broker;
+ private Broker<?> _broker;
- public TrustStoreAdapter(UUID id, Broker broker, Map<String, Object> attributes)
+ public TrustStoreAdapter(UUID id, Broker<?> broker, Map<String, Object> attributes)
{
super(id, broker, DEFAULTS, MapValueConverter.convert(attributes, ATTRIBUTE_TYPES));
_broker = broker;
String trustStorePath = (String) getAttribute(TrustStore.PATH);
String trustStorePassword = getPassword();
- String trustStoreType = (String) getAttribute(TrustStore.TYPE);
+ String trustStoreType = (String) getAttribute(TrustStore.TRUST_STORE_TYPE);
String trustManagerFactoryAlgorithm = (String) getAttribute(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM);
validateTrustStoreAttributes(trustStoreType, trustStorePath,
@@ -90,7 +90,7 @@ public class TrustStoreAdapter extends A
@Override
public Collection<String> getAttributeNames()
{
- return AVAILABLE_ATTRIBUTES;
+ return Attribute.getAttributeNames(TrustStore.class);
}
@Override
@@ -101,7 +101,7 @@ public class TrustStoreAdapter extends A
// verify that it is not in use
String storeName = getName();
- Collection<Port> ports = new ArrayList<Port>(_broker.getPorts());
+ Collection<Port<?>> ports = new ArrayList<Port<?>>(_broker.getPorts());
for (Port port : ports)
{
Collection<TrustStore> trustStores = port.getTrustStores();
@@ -180,7 +180,7 @@ public class TrustStoreAdapter extends A
String trustStorePath = (String)merged.get(TrustStore.PATH);
String trustStorePassword = (String) merged.get(TrustStore.PASSWORD);
- String trustStoreType = (String)merged.get(TrustStore.TYPE);
+ String trustStoreType = (String)merged.get(TrustStore.TRUST_STORE_TYPE);
String trustManagerFactoryAlgorithm = (String)merged.get(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM);
validateTrustStoreAttributes(trustStoreType, trustStorePath,
@@ -211,11 +211,35 @@ public class TrustStoreAdapter extends A
}
}
+ @Override
+ public String getPath()
+ {
+ return (String) getAttribute(PATH);
+ }
+
+ @Override
+ public String getTrustManagerFactoryAlgorithm()
+ {
+ return (String) getAttribute(TRUST_MANAGER_FACTORY_ALGORITHM);
+ }
+
+ @Override
+ public String getTrustStoreType()
+ {
+ return (String) getAttribute(TRUST_STORE_TYPE);
+ }
+
+ @Override
+ public boolean isPeersOnly()
+ {
+ return (Boolean) getAttribute(PEERS_ONLY);
+ }
+
public TrustManager[] getTrustManagers() throws GeneralSecurityException
{
String trustStorePath = (String)getAttribute(TrustStore.PATH);
String trustStorePassword = getPassword();
- String trustStoreType = (String)getAttribute(TrustStore.TYPE);
+ String trustStoreType = (String)getAttribute(TrustStore.TRUST_STORE_TYPE);
String trustManagerFactoryAlgorithm = (String)getAttribute(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM);
try
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java Sun Feb 23 18:38:07 2014
@@ -45,20 +45,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.XmlConfigurationUtilities.MyConfiguration;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.Connection;
-import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.IntegrityViolationException;
-import org.apache.qpid.server.model.LifetimePolicy;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.Protocol;
-import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.model.QueueType;
-import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.Statistics;
-import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.VirtualHostAlias;
+import org.apache.qpid.server.model.*;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.plugin.ExchangeType;
import org.apache.qpid.server.protocol.AMQConnectionModel;
@@ -73,7 +60,6 @@ import org.apache.qpid.server.txn.Server
import org.apache.qpid.server.util.MapValueConverter;
import org.apache.qpid.server.plugin.VirtualHostFactory;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.virtualhost.AbstractVirtualHost;
import org.apache.qpid.server.virtualhost.ExchangeExistsException;
import org.apache.qpid.server.virtualhost.ReservedExchangeNameException;
import org.apache.qpid.server.virtualhost.UnknownExchangeException;
@@ -81,7 +67,7 @@ import org.apache.qpid.server.virtualhos
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
import org.apache.qpid.server.virtualhost.QueueExistsException;
-public final class VirtualHostAdapter extends AbstractAdapter implements VirtualHost, VirtualHostListener
+public final class VirtualHostAdapter extends AbstractConfiguredObject<VirtualHostAdapter> implements VirtualHost<VirtualHostAdapter>, VirtualHostListener
{
private static final Logger LOGGER = Logger.getLogger(VirtualHostAdapter.class);
@@ -106,11 +92,11 @@ public final class VirtualHostAdapter ex
private final Map<org.apache.qpid.server.exchange.Exchange, ExchangeAdapter> _exchangeAdapters =
new HashMap<org.apache.qpid.server.exchange.Exchange, ExchangeAdapter>();
private StatisticsAdapter _statistics;
- private final Broker _broker;
+ private final Broker<?> _broker;
private final List<VirtualHostAlias> _aliases = new ArrayList<VirtualHostAlias>();
private StatisticsGatherer _brokerStatisticsGatherer;
- public VirtualHostAdapter(UUID id, Map<String, Object> attributes, Broker broker, StatisticsGatherer brokerStatisticsGatherer, TaskExecutor taskExecutor)
+ public VirtualHostAdapter(UUID id, Map<String, Object> attributes, Broker<?> broker, StatisticsGatherer brokerStatisticsGatherer, TaskExecutor taskExecutor)
{
super(id, null, MapValueConverter.convert(attributes, ATTRIBUTE_TYPES, false), taskExecutor, false);
_broker = broker;
@@ -460,7 +446,7 @@ public final class VirtualHostAdapter ex
@Override
- public State getActualState()
+ public State getState()
{
if (_virtualHost == null)
{
@@ -817,7 +803,7 @@ public final class VirtualHostAdapter ex
}
else if(STATE.equals(name))
{
- return getActualState();
+ return getState();
}
else if(DURABLE.equals(name))
{
@@ -931,7 +917,7 @@ public final class VirtualHostAdapter ex
@Override
public Collection<String> getAttributeNames()
{
- return AVAILABLE_ATTRIBUTES;
+ return Attribute.getAttributeNames(VirtualHost.class);
}
private void checkVHostStateIsActive()
@@ -943,6 +929,137 @@ public final class VirtualHostAdapter ex
}
}
+ @Override
+ public Collection<String> getSupportedExchangeTypes()
+ {
+ List<String> types = new ArrayList<String>();
+ for(@SuppressWarnings("rawtypes") ExchangeType type : _virtualHost.getExchangeTypes())
+ {
+ types.add(type.getType());
+ }
+ return Collections.unmodifiableCollection(types);
+ }
+
+ @Override
+ public Collection<String> getSupportedQueueTypes()
+ {
+ // TODO
+ return null;
+ }
+
+ @Override
+ public boolean isQueue_deadLetterQueueEnabled()
+ {
+ return _virtualHost.getConfiguration().isDeadLetterQueueEnabled();
+ }
+
+ @Override
+ public long getHousekeepingCheckPeriod()
+ {
+ return _virtualHost.getConfiguration().getHousekeepingCheckPeriod();
+ }
+
+ @Override
+ public int getQueue_maximumDeliveryAttempts()
+ {
+ return _virtualHost.getConfiguration().getMaxDeliveryCount();
+ }
+
+ @Override
+ public long getQueue_flowControlSizeBytes()
+ {
+ return _virtualHost.getConfiguration().getCapacity();
+ }
+
+ @Override
+ public long getQueue_flowResumeSizeBytes()
+ {
+ return _virtualHost.getConfiguration().getFlowResumeCapacity();
+ }
+
+ @Override
+ public String getConfigStoreType()
+ {
+ return (String) getAttribute(CONFIG_STORE_TYPE);
+ }
+
+ @Override
+ public String getConfigStorePath()
+ {
+ return (String) getAttribute(CONFIG_PATH);
+ }
+
+ @Override
+ public String getStoreType()
+ {
+ return _virtualHost.getMessageStore().getStoreType();
+ }
+
+ @Override
+ public String getStorePath()
+ {
+ return _virtualHost.getMessageStore().getStoreLocation();
+ }
+
+ @Override
+ public long getStoreTransactionIdleTimeoutClose()
+ {
+ return _virtualHost.getConfiguration().getTransactionTimeoutIdleClose();
+ }
+
+ @Override
+ public long getStoreTransactionIdleTimeoutWarn()
+ {
+ return _virtualHost.getConfiguration().getTransactionTimeoutIdleWarn();
+ }
+
+ @Override
+ public long getStoreTransactionOpenTimeoutClose()
+ {
+ return _virtualHost.getConfiguration().getTransactionTimeoutOpenClose();
+ }
+
+ @Override
+ public long getStoreTransactionOpenTimeoutWarn()
+ {
+ return _virtualHost.getConfiguration().getTransactionTimeoutOpenWarn();
+ }
+
+ @Override
+ public long getQueue_alertRepeatGap()
+ {
+ return _virtualHost.getConfiguration().getMinimumAlertRepeatGap();
+ }
+
+ @Override
+ public long getQueue_alertThresholdMessageAge()
+ {
+ return _virtualHost.getConfiguration().getMaximumMessageAge();
+ }
+
+ @Override
+ public long getQueue_alertThresholdMessageSize()
+ {
+ return _virtualHost.getConfiguration().getMaximumMessageSize();
+ }
+
+ @Override
+ public long getQueue_alertThresholdQueueDepthBytes()
+ {
+ return _virtualHost.getConfiguration().getMaximumQueueDepth();
+ }
+
+ @Override
+ public long getQueue_alertThresholdQueueDepthMessages()
+ {
+ return _virtualHost.getConfiguration().getMaximumMessageCount();
+ }
+
+ @Override
+ public String getConfigPath()
+ {
+ return (String) getAttribute(CONFIG_PATH);
+ }
private static class VirtualHostStatisticsAdapter extends StatisticsAdapter
{
@@ -1058,7 +1175,7 @@ public final class VirtualHostAdapter ex
_virtualHost = null;
}
- setAttribute(VirtualHost.STATE, getActualState(), State.DELETED);
+ setAttribute(VirtualHost.STATE, getState(), State.DELETED);
return true;
}
return false;
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=1571054&r1=1571053&r2=1571054&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 Sun Feb 23 18:38:07 2014
@@ -36,7 +36,7 @@ import java.security.AccessControlExcept
import java.util.Collection;
import java.util.Collections;
-public class VirtualHostAliasAdapter extends AbstractAdapter implements VirtualHostAlias
+public class VirtualHostAliasAdapter extends AbstractConfiguredObject<VirtualHostAliasAdapter> implements VirtualHostAlias<VirtualHostAliasAdapter>
{
private VirtualHostAdapter _vhost;
private Port _port;
@@ -79,7 +79,7 @@ public class VirtualHostAliasAdapter ex
}
@Override
- public State getActualState()
+ public State getState()
{
return State.ACTIVE; // TODO - Implement
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/PreferencesProviderFactory.java Sun Feb 23 18:38:07 2014
@@ -28,6 +28,6 @@ public interface PreferencesProviderFact
{
PluggableFactoryLoader<PreferencesProviderFactory> FACTORIES = new PluggableFactoryLoader<PreferencesProviderFactory>(PreferencesProviderFactory.class);
- PreferencesProvider createInstance(UUID id, Map<String, Object> attributes, AuthenticationProvider authenticationProvider);
+ PreferencesProvider createInstance(UUID id, Map<String, Object> attributes, AuthenticationProvider<? extends AuthenticationProvider> authenticationProvider);
}
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=1571054&r1=1571053&r2=1571054&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 Sun Feb 23 18:38:07 2014
@@ -48,7 +48,7 @@ public class MultiVersionProtocolEngineF
private final Transport _transport;
private final ProtocolEngineCreator[] _creators;
- public MultiVersionProtocolEngineFactory(Broker broker,
+ public MultiVersionProtocolEngineFactory(Broker<?> broker,
SSLContext sslContext,
boolean wantClientAuth,
boolean needClientAuth,
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueArgumentsConverter.java Sun Feb 23 18:38:07 2014
@@ -88,8 +88,7 @@ public class QueueArgumentsConverter
ATTRIBUTE_MAPPINGS.put(QPID_GROUP_HEADER_KEY, Queue.MESSAGE_GROUP_KEY);
//ATTRIBUTE_MAPPINGS.put(QPID_SHARED_MSG_GROUP, Queue.MESSAGE_GROUP_SHARED_GROUPS);
ATTRIBUTE_MAPPINGS.put(QPID_DEFAULT_MESSAGE_GROUP_ARG, Queue.MESSAGE_GROUP_DEFAULT_GROUP);
- ATTRIBUTE_MAPPINGS.put(QPID_TRACE_EXCLUDE, Queue.FEDERATION_EXCLUDES);
- ATTRIBUTE_MAPPINGS.put(QPID_TRACE_ID, Queue.FEDERATION_ID);
+
ATTRIBUTE_MAPPINGS.put(QPID_NO_LOCAL, Queue.NO_LOCAL);
}
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Sun Feb 23 18:38:07 2014
@@ -253,7 +253,7 @@ public class ApplicationRegistry impleme
if (_broker != null)
{
- _broker.setDesiredState(_broker.getActualState(), State.STOPPED);
+ _broker.setDesiredState(_broker.getState(), State.STOPPED);
}
//Shutdown virtualhosts
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java Sun Feb 23 18:38:07 2014
@@ -587,7 +587,7 @@ public class SecurityManager implements
Collection<AccessControlProvider> providers = _broker.getAccessControlProviders();
for(AccessControlProvider p : providers)
{
- if(p == object || p.getActualState() != State.ACTIVE)
+ if(p == object || p.getState() != State.ACTIVE)
{
//we don't count ourself as another
continue;
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java Sun Feb 23 18:38:07 2014
@@ -71,6 +71,24 @@ public class JsonFileConfigStore impleme
{
_name = virtualHost.getName();
+ setup(virtualHost);
+ load();
+ recoveryHandler.beginConfigurationRecovery(this,_configVersion);
+ List<ConfiguredObjectRecord> records = new ArrayList<ConfiguredObjectRecord>(_objectsById.values());
+ for(ConfiguredObjectRecord record : records)
+ {
+ recoveryHandler.configuredObject(record.getId(), record.getType(), record.getAttributes());
+ }
+ int oldConfigVersion = _configVersion;
+ _configVersion = recoveryHandler.completeConfigurationRecovery();
+ if(oldConfigVersion != _configVersion)
+ {
+ save();
+ }
+ }
+
+ protected void setup(final VirtualHost virtualHost)
+ {
Object storePathAttr = virtualHost.getAttribute(VirtualHost.CONFIG_STORE_PATH);
if(!(storePathAttr instanceof String))
{
@@ -101,21 +119,6 @@ public class JsonFileConfigStore impleme
renameFile(_backupFileName, _configFileName);
}
}
-
-
- load();
- recoveryHandler.beginConfigurationRecovery(this,_configVersion);
- List<ConfiguredObjectRecord> records = new ArrayList<ConfiguredObjectRecord>(_objectsById.values());
- for(ConfiguredObjectRecord record : records)
- {
- recoveryHandler.configuredObject(record.getId(), record.getType(), record.getAttributes());
- }
- int oldConfigVersion = _configVersion;
- _configVersion = recoveryHandler.completeConfigurationRecovery();
- if(oldConfigVersion != _configVersion)
- {
- save();
- }
}
private void renameFile(String fromFileName, String toFileName)
@@ -194,39 +197,13 @@ public class JsonFileConfigStore impleme
}
}
- private void load()
+ protected void load()
{
final File configFile = new File(_directoryName, _configFileName);
try
{
Map data = _objectMapper.readValue(configFile,Map.class);
- Collection<Class<? extends ConfiguredObject>> childClasses =
- MODEL.getChildTypes(VirtualHost.class);
- data.remove("modelVersion");
- Object configVersion;
- if((configVersion = data.remove("configVersion")) instanceof Integer)
- {
- _configVersion = (Integer) configVersion;
- }
- for(Class<? extends ConfiguredObject> childClass : childClasses)
- {
- final String type = childClass.getSimpleName();
- String attrName = type.toLowerCase() + "s";
- Object children = data.remove(attrName);
- if(children != null)
- {
- if(children instanceof Collection)
- {
- for(Object child : (Collection)children)
- {
- if(child instanceof Map)
- {
- loadChild(childClass, (Map)child, VirtualHost.class, null);
- }
- }
- }
- }
- }
+ loadFromMap(data);
}
catch (JsonMappingException e)
{
@@ -243,6 +220,37 @@ public class JsonFileConfigStore impleme
}
+ protected void loadFromMap(final Map data)
+ {
+ Collection<Class<? extends ConfiguredObject>> childClasses =
+ MODEL.getChildTypes(VirtualHost.class);
+ data.remove("modelVersion");
+ Object configVersion;
+ if((configVersion = data.remove("configVersion")) instanceof Integer)
+ {
+ _configVersion = (Integer) configVersion;
+ }
+ for(Class<? extends ConfiguredObject> childClass : childClasses)
+ {
+ final String type = childClass.getSimpleName();
+ String attrName = type.toLowerCase() + "s";
+ Object children = data.remove(attrName);
+ if(children != null)
+ {
+ if(children instanceof Collection)
+ {
+ for(Object child : (Collection)children)
+ {
+ if(child instanceof Map)
+ {
+ loadChild(childClass, (Map)child, VirtualHost.class, null);
+ }
+ }
+ }
+ }
+ }
+ }
+
private void loadChild(final Class<? extends ConfiguredObject> clazz,
final Map<String,Object> data,
final Class<? extends ConfiguredObject> parentClass,
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=1571054&r1=1571053&r2=1571054&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 Sun Feb 23 18:38:07 2014
@@ -40,13 +40,13 @@ class TCPandSSLTransport implements Acce
private Set<Transport> _transports;
private SSLContext _sslContext;
private InetSocketAddress _bindingSocketAddress;
- private Port _port;
+ private Port<?> _port;
private Set<AmqpProtocolVersion> _supported;
private AmqpProtocolVersion _defaultSupportedProtocolReply;
TCPandSSLTransport(final Set<Transport> transports,
final SSLContext sslContext,
- final Port port,
+ final Port<?> port,
final Set<AmqpProtocolVersion> supported,
final AmqpProtocolVersion defaultSupportedProtocolReply)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java Sun Feb 23 18:38:07 2014
@@ -109,7 +109,7 @@ public class KeyStoreRecovererTest exten
attributes.put(KeyStore.NAME, getName());
attributes.put(KeyStore.PATH, TestSSLConstants.BROKER_KEYSTORE);
attributes.put(KeyStore.PASSWORD, TestSSLConstants.BROKER_KEYSTORE_PASSWORD);
- attributes.put(KeyStore.TYPE, "jks");
+ attributes.put(KeyStore.KEY_STORE_TYPE, "jks");
attributes.put(KeyStore.KEY_MANAGER_FACTORY_ALGORITHM, KeyManagerFactory.getDefaultAlgorithm());
attributes.put(KeyStore.CERTIFICATE_ALIAS, "java-broker");
return attributes;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java Sun Feb 23 18:38:07 2014
@@ -108,7 +108,7 @@ public class TrustStoreRecovererTest ext
attributes.put(TrustStore.NAME, getName());
attributes.put(TrustStore.PATH, TestSSLConstants.BROKER_TRUSTSTORE);
attributes.put(TrustStore.PASSWORD, TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD);
- attributes.put(TrustStore.TYPE, "jks");
+ attributes.put(TrustStore.TRUST_STORE_TYPE, "jks");
attributes.put(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM, TrustManagerFactory.getDefaultAlgorithm());
attributes.put(TrustStore.PEERS_ONLY, Boolean.TRUE);
return attributes;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java Sun Feb 23 18:38:07 2014
@@ -286,7 +286,7 @@ public abstract class ConfigurationEntry
attributes.put(TrustStore.NAME, getName());
attributes.put(TrustStore.PATH, "/path/to/truststore");
attributes.put(TrustStore.PASSWORD, "my-secret-password");
- attributes.put(TrustStore.TYPE, "NON-JKS");
+ attributes.put(TrustStore.TRUST_STORE_TYPE, "NON-JKS");
attributes.put(TrustStore.TRUST_MANAGER_FACTORY_ALGORITHM, "NON-STANDARD");
attributes.put(TrustStore.DESCRIPTION, "Description");
@@ -309,7 +309,7 @@ public abstract class ConfigurationEntry
attributes.put(KeyStore.NAME, getName());
attributes.put(KeyStore.PATH, "/path/to/truststore");
attributes.put(KeyStore.PASSWORD, "my-secret-password");
- attributes.put(KeyStore.TYPE, "NON-JKS");
+ attributes.put(KeyStore.KEY_STORE_TYPE, "NON-JKS");
attributes.put(KeyStore.KEY_MANAGER_FACTORY_ALGORITHM, "NON-STANDARD");
attributes.put(KeyStore.DESCRIPTION, "Description");
attributes.put(KeyStore.CERTIFICATE_ALIAS, "Alias");
@@ -382,7 +382,7 @@ public abstract class ConfigurationEntry
attributes.put(KeyStore.NAME, getName());
attributes.put(KeyStore.PATH, "/path/to/truststore");
attributes.put(KeyStore.PASSWORD, "my-secret-password");
- attributes.put(KeyStore.TYPE, "NON-JKS");
+ attributes.put(KeyStore.KEY_STORE_TYPE, "NON-JKS");
attributes.put(KeyStore.KEY_MANAGER_FACTORY_ALGORITHM, "NON-STANDARD");
attributes.put(KeyStore.DESCRIPTION, "Description");
attributes.put(KeyStore.CERTIFICATE_ALIAS, "Alias");
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java Sun Feb 23 18:38:07 2014
@@ -180,7 +180,7 @@ public class ConfiguredObjectStateTransi
private void assertInvalidStateTransition(ConfiguredObject object, State initialState, State... invalidStates)
{
- assertEquals("Unexpected state", initialState, object.getActualState());
+ assertEquals("Unexpected state", initialState, object.getState());
for (State state : invalidStates)
{
try
@@ -192,19 +192,19 @@ public class ConfiguredObjectStateTransi
// expected
}
assertEquals("Transition from state " + initialState + " into state " + state + " did occur", initialState,
- object.getActualState());
+ object.getState());
}
}
private void assertValidStateTransition(ConfiguredObject object, State initialState, State... validStateSequence)
{
- assertEquals("Unexpected state", initialState, object.getActualState());
+ assertEquals("Unexpected state", initialState, object.getState());
State currentState = initialState;
for (State state : validStateSequence)
{
object.setDesiredState(currentState, state);
assertEquals("Transition from state " + currentState + " into state " + state + " did not occur", state,
- object.getActualState());
+ object.getState());
currentState = state;
}
}
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=1571054&r1=1571053&r2=1571054&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 Sun Feb 23 18:38:07 2014
@@ -139,7 +139,7 @@ public class VirtualHostTest extends Qpi
host.createChild(Queue.class, arguments);
- Queue queue = ConfiguredObjectFinder.findConfiguredObjectByName(host.getQueues(), queueName);
+ Queue queue = (Queue) ConfiguredObjectFinder.findConfiguredObjectByName(host.getQueues(), queueName);
Object messageGroupKey = queue.getAttribute(Queue.MESSAGE_GROUP_KEY);
assertEquals("Unexpected message group key attribute", "mykey", messageGroupKey);
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=1571054&r1=1571053&r2=1571054&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 Sun Feb 23 18:38:07 2014
@@ -71,7 +71,7 @@ public class FileSystemPreferencesProvid
{
if (_preferencesProvider != null)
{
- _preferencesProvider.setDesiredState(_preferencesProvider.getActualState(), State.DELETED);
+ _preferencesProvider.setDesiredState(_preferencesProvider.getState(), State.DELETED);
}
BrokerTestHelper.tearDown();
_preferencesFile.delete();
@@ -85,7 +85,7 @@ public class FileSystemPreferencesProvid
public void testConstructionWithExistingFile()
{
_preferencesProvider = createPreferencesProvider();
- assertEquals(State.INITIALISING, _preferencesProvider.getActualState());
+ assertEquals(State.INITIALISING, _preferencesProvider.getState());
}
public void testConstructionWithNonExistingFile()
@@ -98,7 +98,7 @@ public class FileSystemPreferencesProvid
attributes.put(FileSystemPreferencesProvider.PATH, nonExistingFile.getAbsolutePath());
_preferencesProvider = new FileSystemPreferencesProvider(UUID.randomUUID(), attributes, _authenticationProvider, _broker.getTaskExecutor());
_preferencesProvider.createStoreIfNotExist();
- assertEquals(State.INITIALISING, _preferencesProvider.getActualState());
+ assertEquals(State.INITIALISING, _preferencesProvider.getState());
assertTrue("Preferences file was not created", nonExistingFile.exists());
}
finally
@@ -117,7 +117,7 @@ public class FileSystemPreferencesProvid
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(FileSystemPreferencesProvider.PATH, emptyPrefsFile.getAbsolutePath());
_preferencesProvider = new FileSystemPreferencesProvider(UUID.randomUUID(), attributes, _authenticationProvider, _broker.getTaskExecutor());
- assertEquals(State.INITIALISING, _preferencesProvider.getActualState());
+ assertEquals(State.INITIALISING, _preferencesProvider.getState());
}
finally
{
@@ -130,7 +130,7 @@ public class FileSystemPreferencesProvid
_preferencesProvider = createPreferencesProvider();
_preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);
- assertEquals("Unexpected state", State.ACTIVE, _preferencesProvider.getActualState());
+ assertEquals("Unexpected state", State.ACTIVE, _preferencesProvider.getState());
}
public void testChangeAttributes()
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Sun Feb 23 18:38:07 2014
@@ -33,6 +33,7 @@ import org.apache.qpid.server.message.Se
import org.apache.qpid.server.message.internal.InternalMessage;
import org.apache.qpid.server.message.internal.InternalMessageHeader;
import org.apache.qpid.server.model.AmqpManagement;
+import org.apache.qpid.server.model.Attribute;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Model;
@@ -96,7 +97,7 @@ class ManagementNode implements MessageS
new CopyOnWriteArrayList<ConsumerRegistrationListener<ManagementNode>>();
private final SystemNodeCreator.SystemNodeRegistry _registry;
- private final ConfiguredObject _managedObject;
+ private final ConfiguredObject<?> _managedObject;
private Map<String, ManagementNodeConsumer> _consumers = new ConcurrentHashMap<String, ManagementNodeConsumer>();
private Map<String,ManagedEntityType> _entityTypes = Collections.synchronizedMap(new LinkedHashMap<String, ManagedEntityType>());
@@ -105,7 +106,7 @@ class ManagementNode implements MessageS
public ManagementNode(final SystemNodeCreator.SystemNodeRegistry registry,
- final ConfiguredObject configuredObject)
+ final ConfiguredObject<?> configuredObject)
{
_virtualHost = registry.getVirtualHost();
_registry = registry;
@@ -213,7 +214,9 @@ class ManagementNode implements MessageS
}
}
- managedEntityType = new ManagedEntityType(clazz.getName(), parentSet.toArray(new ManagedEntityType[parentSet.size()]), entityType.attributes(), opsList.toArray(new String[opsList.size()]));
+ managedEntityType = new ManagedEntityType(clazz.getName(), parentSet.toArray(new ManagedEntityType[parentSet.size()]),
+ (String[])(Attribute.getAttributeNames(clazz).toArray(new String[0])),
+ opsList.toArray(new String[opsList.size()]));
_entityTypes.put(clazz.getName(),managedEntityType);
_entities.put(managedEntityType, Collections.synchronizedMap(new LinkedHashMap<String, ConfiguredObject>()));
@@ -463,7 +466,7 @@ class ManagementNode implements MessageS
responseHeader.setHeader(TYPE_ATTRIBUTE, type);
try
{
- entity.setDesiredState(entity.getActualState(),State.DELETED);
+ entity.setDesiredState(entity.getState(),State.DELETED);
responseHeader.setHeader(STATUS_CODE_HEADER, STATUS_CODE_NO_CONTENT);
}
catch(AccessControlException e)
@@ -802,7 +805,6 @@ class ManagementNode implements MessageS
count = Integer.MAX_VALUE;
}
- responseHeader.setHeader(ATTRIBUTES_HEADER, attributes);
responseHeader.setHeader(STATUS_CODE_HEADER, STATUS_CODE_OK);
List<List<? extends Object>> responseList = new ArrayList<List<? extends Object>>();
@@ -855,7 +857,7 @@ class ManagementNode implements MessageS
break;
}
}
- responseHeader.setHeader(COUNT_HEADER, count);
+ responseHeader.setHeader(COUNT_HEADER, responseList.size()-1);
responseMessage = InternalMessage.createListMessage(_virtualHost.getMessageStore(),
responseHeader,
responseList);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Sun Feb 23 18:38:07 2014
@@ -51,28 +51,8 @@ import org.apache.qpid.server.management
import org.apache.qpid.server.management.plugin.servlet.rest.RestServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.SaslServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.StructureServlet;
-import org.apache.qpid.server.model.AccessControlProvider;
-import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Binding;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.Connection;
-import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.Group;
-import org.apache.qpid.server.model.GroupMember;
-import org.apache.qpid.server.model.GroupProvider;
-import org.apache.qpid.server.model.KeyStore;
-import org.apache.qpid.server.model.Plugin;
-import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.PreferencesProvider;
-import org.apache.qpid.server.model.Protocol;
+import org.apache.qpid.server.model.*;
import org.apache.qpid.server.model.Queue;
-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.model.TrustStore;
-import org.apache.qpid.server.model.User;
-import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.adapter.AbstractPluginAdapter;
import org.apache.qpid.server.plugin.PluginFactory;
import org.apache.qpid.server.util.MapValueConverter;
@@ -88,7 +68,7 @@ import org.eclipse.jetty.servlet.Servlet
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
-public class HttpManagement extends AbstractPluginAdapter implements HttpManagementConfiguration
+public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implements HttpManagementConfiguration<HttpManagement>
{
private final Logger _logger = Logger.getLogger(HttpManagement.class);
@@ -108,17 +88,6 @@ public class HttpManagement extends Abst
public static final String PLUGIN_TYPE = "MANAGEMENT-HTTP";
- @SuppressWarnings("serial")
- private static final Collection<String> AVAILABLE_ATTRIBUTES = Collections.unmodifiableSet(new HashSet<String>(Plugin.AVAILABLE_ATTRIBUTES)
- {{
- add(HTTP_BASIC_AUTHENTICATION_ENABLED);
- add(HTTPS_BASIC_AUTHENTICATION_ENABLED);
- add(HTTP_SASL_AUTHENTICATION_ENABLED);
- add(HTTPS_SASL_AUTHENTICATION_ENABLED);
- add(TIME_OUT);
- add(PluginFactory.PLUGIN_TYPE);
- }});
-
private static final String OPERATIONAL_LOGGING_NAME = "Web";
@@ -206,8 +175,7 @@ public class HttpManagement extends Abst
CurrentActor.get().message(ManagementConsoleMessages.STOPPED(OPERATIONAL_LOGGING_NAME));
}
- /** Added for testing purposes */
- int getSessionTimeout()
+ public int getSessionTimeout()
{
return (Integer)getAttribute(TIME_OUT);
}
@@ -224,7 +192,7 @@ public class HttpManagement extends Abst
int lastPort = -1;
for (Port port : ports)
{
- if (State.QUIESCED.equals(port.getActualState()))
+ if (State.QUIESCED.equals(port.getState()))
{
continue;
}
@@ -462,7 +430,7 @@ public class HttpManagement extends Abst
@Override
public Collection<String> getAttributeNames()
{
- return Collections.unmodifiableCollection(AVAILABLE_ATTRIBUTES);
+ return Attribute.getAttributeNames(HttpManagement.class);
}
@Override
@@ -524,4 +492,10 @@ public class HttpManagement extends Abst
}
}
+
+ @Override
+ public String getPluginType()
+ {
+ return PLUGIN_TYPE;
+ }
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java Sun Feb 23 18:38:07 2014
@@ -23,16 +23,26 @@ package org.apache.qpid.server.managemen
import java.net.SocketAddress;
import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ManagedAttribute;
+import org.apache.qpid.server.model.Plugin;
-public interface HttpManagementConfiguration
+public interface HttpManagementConfiguration<X extends HttpManagementConfiguration<X>> extends Plugin<X>
{
+ @ManagedAttribute
boolean isHttpsSaslAuthenticationEnabled();
+ @ManagedAttribute
boolean isHttpSaslAuthenticationEnabled();
+ @ManagedAttribute
boolean isHttpsBasicAuthenticationEnabled();
+ @ManagedAttribute
boolean isHttpBasicAuthenticationEnabled();
+ @ManagedAttribute
+ public int getSessionTimeout();
+
AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress);
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementUtil.java Sun Feb 23 18:38:07 2014
@@ -75,9 +75,9 @@ public class HttpManagementUtil
private static final String ATTR_SUBJECT = "Qpid.subject";
private static final String ATTR_LOG_ACTOR = "Qpid.logActor";
- public static Broker getBroker(ServletContext servletContext)
+ public static Broker<?> getBroker(ServletContext servletContext)
{
- return (Broker) servletContext.getAttribute(ATTR_BROKER);
+ return (Broker<?>) servletContext.getAttribute(ATTR_BROKER);
}
public static HttpManagementConfiguration getManagementConfiguration(ServletContext servletContext)
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java Sun Feb 23 18:38:07 2014
@@ -50,7 +50,7 @@ public abstract class AbstractServlet ex
{
private static final Logger LOGGER = Logger.getLogger(AbstractServlet.class);
- private Broker _broker;
+ private Broker<?> _broker;
private HttpManagementConfiguration _managementConfiguration;
protected AbstractServlet()
@@ -240,7 +240,7 @@ public abstract class AbstractServlet ex
return subject;
}
- protected Broker getBroker()
+ protected Broker<?> getBroker()
{
return _broker;
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java Sun Feb 23 18:38:07 2014
@@ -37,7 +37,7 @@ public class ConfiguredObjectToMapConver
private Model _model = Model.getInstance();
- public Map<String, Object> convertObjectToMap(final ConfiguredObject confObject,
+ public Map<String, Object> convertObjectToMap(final ConfiguredObject<?> confObject,
Class<? extends ConfiguredObject> clazz,
int depth)
{
@@ -62,7 +62,7 @@ public class ConfiguredObjectToMapConver
}
private void incorporateAttributesIntoMap(
- final ConfiguredObject confObject, Map<String, Object> object)
+ final ConfiguredObject<?> confObject, Map<String, Object> object)
{
for(String name : confObject.getAttributeNames())
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/HelperServlet.java Sun Feb 23 18:38:07 2014
@@ -58,7 +58,7 @@ public class HelperServlet extends Abstr
new ListAuthenticationProviderAttributes(),
new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_STORE_TYPES, "ListMessageStoreTypes"),
new ListBrokerAttribute(Broker.SUPPORTED_VIRTUALHOST_TYPES, "ListVirtualHostTypes"),
- new ListBrokerAttribute(Broker.SUPPORTED_PREFERENCES_PROVIDERS_TYPES, "ListPreferencesProvidersTypes"),
+ new ListBrokerAttribute(Broker.SUPPORTED_PREFERENCES_PROVIDER_TYPES, "ListPreferencesProvidersTypes"),
new ListBrokerAttribute(Broker.PRODUCT_VERSION, "version"),
new ListGroupProviderAttributes(),
new ListAccessControlProviderAttributes(),
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java Sun Feb 23 18:38:07 2014
@@ -77,7 +77,7 @@ public class MessageContentServlet exten
String vhostName = pathInfoElements[0];
String queueName = pathInfoElements[1];
- VirtualHost vhost = null;
+ VirtualHost<?> vhost = null;
for(VirtualHost vh : getBroker().getVirtualHosts())
{
@@ -91,7 +91,7 @@ public class MessageContentServlet exten
return getQueueFromVirtualHost(queueName, vhost);
}
- private Queue getQueueFromVirtualHost(String queueName, VirtualHost vhost)
+ private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost)
{
Queue queue = null;
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java Sun Feb 23 18:38:07 2014
@@ -122,7 +122,7 @@ public class MessageServlet extends Abst
mapper.writeValue(writer, messages);
}
- private Queue getQueueFromRequest(HttpServletRequest request)
+ private Queue<?> getQueueFromRequest(HttpServletRequest request)
{
// TODO - validation that there is a vhost and queue and only those in the path
@@ -134,9 +134,9 @@ public class MessageServlet extends Abst
String vhostName = pathInfoElements[0];
String queueName = pathInfoElements[1];
- VirtualHost vhost = null;
+ VirtualHost<?> vhost = null;
- for(VirtualHost vh : getBroker().getVirtualHosts())
+ for(VirtualHost<?> vh : getBroker().getVirtualHosts())
{
if(vh.getName().equals(vhostName))
{
@@ -148,7 +148,7 @@ public class MessageServlet extends Abst
return getQueueFromVirtualHost(queueName, vhost);
}
- private Queue getQueueFromVirtualHost(String queueName, VirtualHost vhost)
+ private Queue getQueueFromVirtualHost(String queueName, VirtualHost<?> vhost)
{
Queue queue = null;
@@ -410,7 +410,7 @@ public class MessageServlet extends Abst
try
{
- final Queue sourceQueue = getQueueFromRequest(request);
+ final Queue<?> sourceQueue = getQueueFromRequest(request);
ObjectMapper mapper = new ObjectMapper();
@@ -420,7 +420,7 @@ public class MessageServlet extends Abst
String destQueueName = (String) providedObject.get("destinationQueue");
Boolean move = (Boolean) providedObject.get("move");
- final VirtualHost vhost = sourceQueue.getParent(VirtualHost.class);
+ final VirtualHost<?> vhost = sourceQueue.getParent(VirtualHost.class);
boolean isMoveTransaction = move != null && Boolean.valueOf(move);
@@ -459,9 +459,9 @@ public class MessageServlet extends Abst
protected void doDeleteWithSubjectAndActor(HttpServletRequest request, HttpServletResponse response)
{
- final Queue sourceQueue = getQueueFromRequest(request);
+ final Queue<?> sourceQueue = getQueueFromRequest(request);
- final VirtualHost vhost = sourceQueue.getParent(VirtualHost.class);
+ final VirtualHost<?> vhost = sourceQueue.getParent(VirtualHost.class);
final List<Long> messageIds = new ArrayList<Long>();
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Sun Feb 23 18:38:07 2014
@@ -112,7 +112,7 @@ public class RestServlet extends Abstrac
}
}
- protected Collection<ConfiguredObject> getObjects(HttpServletRequest request)
+ protected Collection<ConfiguredObject<?>> getObjects(HttpServletRequest request)
{
String[] pathInfoElements = getPathInfoElements(request);
List<String> names = new ArrayList<String>();
@@ -128,8 +128,9 @@ public class RestServlet extends Abstrac
names.addAll(Arrays.asList(pathInfoElements));
}
- Collection<ConfiguredObject> parents = Collections.singleton((ConfiguredObject) getBroker());
- Collection<ConfiguredObject> children = new ArrayList<ConfiguredObject>();
+ Collection<ConfiguredObject<?>> parents = new ArrayList<ConfiguredObject<?>>();
+ parents.add(getBroker());
+ Collection<ConfiguredObject<?>> children = new ArrayList<ConfiguredObject<?>>();
Map<Class<? extends ConfiguredObject>, String> filters =
new HashMap<Class<? extends ConfiguredObject>, String>();
@@ -139,14 +140,14 @@ public class RestServlet extends Abstrac
if(i == 0 || Model.getInstance().getChildTypes(_hierarchy[i - 1]).contains(_hierarchy[i]))
{
- for(ConfiguredObject parent : parents)
+ for(ConfiguredObject<?> parent : parents)
{
if(names.size() > i
&& names.get(i) != null
&& !names.get(i).equals("*")
&& names.get(i).trim().length() != 0)
{
- for(ConfiguredObject child : parent.getChildren(_hierarchy[i]))
+ for(ConfiguredObject<?> child : parent.getChildren(_hierarchy[i]))
{
if(child.getName().equals(names.get(i)))
{
@@ -156,7 +157,7 @@ public class RestServlet extends Abstrac
}
else
{
- children.addAll(parent.getChildren(_hierarchy[i]));
+ children.addAll((Collection<? extends ConfiguredObject<?>>) parent.getChildren(_hierarchy[i]));
}
}
}
@@ -173,13 +174,13 @@ public class RestServlet extends Abstrac
}
parents = children;
- children = new ArrayList<ConfiguredObject>();
+ children = new ArrayList<ConfiguredObject<?>>();
}
if(!filters.isEmpty())
{
- Collection<ConfiguredObject> potentials = parents;
- parents = new ArrayList<ConfiguredObject>();
+ Collection<ConfiguredObject<?>> potentials = parents;
+ parents = new ArrayList<ConfiguredObject<?>>();
for(ConfiguredObject o : potentials)
{
@@ -215,7 +216,7 @@ public class RestServlet extends Abstrac
return filter(parents, request);
}
- private Collection<ConfiguredObject> filter(Collection<ConfiguredObject> objects, HttpServletRequest request)
+ private Collection<ConfiguredObject<?>> filter(Collection<ConfiguredObject<?>> objects, HttpServletRequest request)
{
@@ -234,9 +235,9 @@ public class RestServlet extends Abstrac
return objects;
}
- Collection<ConfiguredObject> filteredObj = new ArrayList<ConfiguredObject>(objects);
+ Collection<ConfiguredObject<?>> filteredObj = new ArrayList<ConfiguredObject<?>>(objects);
- Iterator<ConfiguredObject> iter = filteredObj.iterator();
+ Iterator<ConfiguredObject<?>> iter = filteredObj.iterator();
while(iter.hasNext())
{
@@ -293,7 +294,7 @@ public class RestServlet extends Abstrac
setCachingHeadersOnResponse(response);
- Collection<ConfiguredObject> allObjects = getObjects(request);
+ Collection<ConfiguredObject<?>> allObjects = getObjects(request);
// TODO - sort special params, everything else should act as a filter
int depth = getDepthParameterFromRequest(request);
@@ -392,9 +393,9 @@ public class RestServlet extends Abstrac
{
if(Model.getInstance().getChildTypes(_hierarchy[j]).contains(_hierarchy[i]))
{
- for(ConfiguredObject parent : objects[j])
+ for(ConfiguredObject<?> parent : objects[j])
{
- for(ConfiguredObject object : parent.getChildren(_hierarchy[i]))
+ for(ConfiguredObject<?> object : parent.getChildren(_hierarchy[i]))
{
if(object.getName().equals(names.get(i)))
{
@@ -523,10 +524,10 @@ public class RestServlet extends Abstrac
setCachingHeadersOnResponse(response);
try
{
- Collection<ConfiguredObject> allObjects = getObjects(request);
+ Collection<ConfiguredObject<?>> allObjects = getObjects(request);
for(ConfiguredObject o : allObjects)
{
- o.setDesiredState(o.getActualState(), State.DELETED);
+ o.setDesiredState(o.getState(), State.DELETED);
}
response.setStatus(HttpServletResponse.SC_OK);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js Sun Feb 23 18:38:07 2014
@@ -606,7 +606,7 @@ define(["dojo/_base/xhr",
new UpdatableStore(that.brokerData.keystores, query(".broker-key-stores")[0],
[ { name: "Name", field: "name", width: "20%"},
{ name: "Path", field: "path", width: "40%"},
- { name: "Type", field: "type", width: "5%"},
+ { name: "Type", field: "keyStoreType", width: "5%"},
{ name: "Key Manager Algorithm", field: "keyManagerFactoryAlgorithm", width: "20%"},
{ name: "Alias", field: "certificateAlias", width: "15%"}
], function(obj) {
@@ -623,7 +623,7 @@ define(["dojo/_base/xhr",
new UpdatableStore(that.brokerData.truststores, query(".broker-trust-stores")[0],
[ { name: "Name", field: "name", width: "20%"},
{ name: "Path", field: "path", width: "40%"},
- { name: "Type", field: "type", width: "5%"},
+ { name: "Type", field: "trustStoreType", width: "5%"},
{ name: "Trust Manager Algorithm", field: "trustManagerFactoryAlgorithm", width: "25%"},
{ name: "Peers only", field: "peersOnly", width: "10%",
formatter: function(val){
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js Sun Feb 23 18:38:07 2014
@@ -101,7 +101,7 @@ define(["dojo/dom",
storeNodes(["name",
"path",
- "type",
+ "keyStoreType",
"keyManagerFactoryAlgorithm",
"certificateAlias",
"peersOnly"
@@ -121,7 +121,7 @@ define(["dojo/dom",
{
this.name.innerHTML = entities.encode(String(this.keyStoreData[ "name" ]));
this.path.innerHTML = entities.encode(String(this.keyStoreData[ "path" ]));
- this.type.innerHTML = entities.encode(String(this.keyStoreData[ "type" ]));
+ this.keyStoreType.innerHTML = entities.encode(String(this.keyStoreData[ "keyStoreType" ]));
this.keyManagerFactoryAlgorithm.innerHTML = entities.encode(String(this.keyStoreData[ "keyManagerFactoryAlgorithm" ]));
this.certificateAlias.innerHTML = this.keyStoreData[ "certificateAlias" ] ? entities.encode(String( this.keyStoreData[ "certificateAlias" ])) : "";
};
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js Sun Feb 23 18:38:07 2014
@@ -101,7 +101,7 @@ define(["dojo/dom",
storeNodes(["name",
"path",
- "type",
+ "trustStoreType",
"trustManagerFactoryAlgorithm",
"certificateAlias",
"peersOnly"
@@ -121,7 +121,7 @@ define(["dojo/dom",
{
this.name.innerHTML = entities.encode(String(this.keyStoreData[ "name" ]));
this.path.innerHTML = entities.encode(String(this.keyStoreData[ "path" ]));
- this.type.innerHTML = entities.encode(String(this.keyStoreData[ "type" ]));
+ this.trustStoreType.innerHTML = entities.encode(String(this.keyStoreData[ "trustStoreType" ]));
this.trustManagerFactoryAlgorithm.innerHTML = entities.encode(String(this.keyStoreData[ "trustManagerFactoryAlgorithm" ]));
this.peersOnly.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.keyStoreData[ "peersOnly" ] ? "checked='checked'": "")+" />" ;
};
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addKeystore.js Sun Feb 23 18:38:07 2014
@@ -129,10 +129,10 @@ define(["dojo/_base/lang",
}
optionalFieldContainer.addChild(new dijit.form.ValidationTextBox({
required: false,
- value: keystore.type,
+ value: isKeystore ? keystore.keyStoreType : keystore.trustStoreType,
label: "Key store type:",
placeHolder: "Use default",
- name: "type"}));
+ name: isKeystore ? "keyStoreType" : "trustStoreType"}));
var panel = new dijit.TitlePane({title: "Optional Attributes", content: optionalFieldContainer.domNode, open: false});
return panel;
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html?rev=1571054&r1=1571053&r2=1571054&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html Sun Feb 23 18:38:07 2014
@@ -25,7 +25,7 @@
<div class="nameValue" style="float:left;"></div><br/>
<div class="formLabel-labelCell" style="float:left; width: 250px;">Type:</div>
- <div class="typeValue" style="float:left;"></div><br/>
+ <div class="keyStoreTypeValue" style="float:left;"></div><br/>
<div class="formLabel-labelCell" style="float:left; width: 250px;">Key Manager Factory Algorithm:</div>
<div class="keyManagerFactoryAlgorithmValue" style="float:left;"></div><br/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org