Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java Sun Nov 20 16:42:57 2016 @@ -59,6 +59,12 @@ public class AllowAllAccessControlProvid return AccessControl.ALWAYS_ALLOWED; } + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(AccessControlMessages.OPERATION(operation)); + } + @StateTransition(currentState = {State.UNINITIALIZED, State.QUIESCED, State.ERRORED}, desiredState = State.ACTIVE) @SuppressWarnings("unused") private ListenableFuture<Void> activate()
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java Sun Nov 20 16:42:57 2016 @@ -565,4 +565,9 @@ public class AutoGeneratedSelfSignedKeyS } + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(KeyStoreMessages.OPERATION(operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java Sun Nov 20 16:42:57 2016 @@ -388,4 +388,10 @@ public class FileTrustStoreImpl extends { return _excludedVirtualHostNodeMessageSources; } + + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(TrustStoreMessages.OPERATION(operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java Sun Nov 20 16:42:57 2016 @@ -44,12 +44,12 @@ import javax.net.ssl.X509TrustManager; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.qpid.server.logging.EventLogger; -import org.apache.qpid.server.logging.messages.TrustStoreMessages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; +import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.messages.TrustStoreMessages; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; @@ -404,4 +404,11 @@ public class ManagedPeerCertificateTrust return _x509cert.getNotAfter(); } } + + + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(TrustStoreMessages.OPERATION(operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java Sun Nov 20 16:42:57 2016 @@ -43,12 +43,12 @@ import javax.security.auth.x500.X500Prin import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import org.apache.qpid.server.logging.EventLogger; -import org.apache.qpid.server.logging.messages.TrustStoreMessages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; +import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.messages.TrustStoreMessages; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; @@ -343,4 +343,10 @@ public class NonJavaTrustStoreImpl { return _excludedVirtualHostNodeMessageSources; } + + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(TrustStoreMessages.OPERATION(operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java Sun Nov 20 16:42:57 2016 @@ -401,4 +401,9 @@ public class SiteSpecificTrustStoreImpl } + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(TrustStoreMessages.OPERATION(operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java Sun Nov 20 16:42:57 2016 @@ -31,6 +31,7 @@ import org.apache.qpid.server.logging.me import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.CommonAccessControlProvider; import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.Container; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.StateTransition; @@ -99,4 +100,10 @@ public abstract class AbstractAccessCont }); } + + @Override + protected void logOperation(final String operation) + { + getAncestor(Container.class).getEventLogger().message(AccessControlMessages.OPERATION(operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java Sun Nov 20 16:42:57 2016 @@ -29,11 +29,11 @@ import com.google.common.util.concurrent import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; -import org.apache.qpid.server.logging.EventLogger; -import org.apache.qpid.server.logging.messages.AuthenticationProviderMessages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.messages.AuthenticationProviderMessages; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Container; @@ -192,4 +192,11 @@ public abstract class AbstractAuthentica { return _disabledMechanisms; } + + @Override + protected void logOperation(final String operation) + { + _container.getEventLogger().message(AuthenticationProviderMessages.OPERATION(operation)); + } + } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java Sun Nov 20 16:42:57 2016 @@ -26,7 +26,9 @@ import java.util.Map; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import org.apache.qpid.server.logging.messages.AuthenticationProviderMessages; import org.apache.qpid.server.model.AbstractConfiguredObject; +import org.apache.qpid.server.model.Container; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; @@ -104,4 +106,10 @@ class ManagedUser extends AbstractConfig setAttributes(Collections.<String, Object>singletonMap(User.PASSWORD, password)); } + @Override + protected void logOperation(final String operation) + { + _authenticationManager.getParent(Container.class).getEventLogger().message(AuthenticationProviderMessages.OPERATION(operation)); + } + } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java Sun Nov 20 16:42:57 2016 @@ -46,6 +46,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Container; @@ -70,6 +71,7 @@ public abstract class PrincipalDatabaseA private final Map<Principal, PrincipalAdapter> _userMap = new ConcurrentHashMap<Principal, PrincipalAdapter>(); + private final Container<?> _broker; private PrincipalDatabase _principalDatabase; @ManagedAttributeField @@ -78,6 +80,7 @@ public abstract class PrincipalDatabaseA protected PrincipalDatabaseAuthenticationManager(final Map<String, Object> attributes, final Container<?> broker) { super(attributes, broker); + _broker = broker; } @Override @@ -461,6 +464,12 @@ public abstract class PrincipalDatabaseA return super.changeAttribute(name, desired); } + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(new OperationLogMessage(this, operation)); + } + @StateTransition(currentState = {State.UNINITIALIZED,State.ERRORED}, desiredState = State.ACTIVE) private ListenableFuture<Void> activate() { Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java Sun Nov 20 16:42:57 2016 @@ -25,8 +25,10 @@ import java.util.Map; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.Container; import org.apache.qpid.server.model.Group; import org.apache.qpid.server.model.GroupMember; import org.apache.qpid.server.model.GroupProvider; @@ -78,4 +80,10 @@ public class GroupImpl extends AbstractC return Futures.immediateFuture(null); } + + @Override + protected void logOperation(final String operation) + { + getAncestor(Container.class).getEventLogger().message(new OperationLogMessage(this, operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java Sun Nov 20 16:42:57 2016 @@ -20,20 +20,20 @@ */ package org.apache.qpid.server.security.group; -import java.security.Principal; import java.util.Map; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfiguredObject; +import org.apache.qpid.server.model.Container; import org.apache.qpid.server.model.Group; import org.apache.qpid.server.model.GroupMember; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.StateTransition; -import org.apache.qpid.server.security.auth.UsernamePrincipal; @ManagedObject(category = false, type = GroupMemberImpl.CONFIG_TYPE) public class GroupMemberImpl extends AbstractConfiguredObject<GroupMemberImpl> implements GroupMember<GroupMemberImpl> @@ -60,4 +60,10 @@ public class GroupMemberImpl extends Abs deleted(); return Futures.immediateFuture(null); } + + @Override + protected void logOperation(final String operation) + { + getAncestor(Container.class).getEventLogger().message(new OperationLogMessage(this, operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java Sun Nov 20 16:42:57 2016 @@ -29,6 +29,7 @@ import java.util.Set; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Container; @@ -46,11 +47,13 @@ public class GroupProviderImpl extends A { public static final String CONFIG_TYPE = "ManagedGroupProvider"; + private final Container<?> _container; @ManagedObjectFactoryConstructor public GroupProviderImpl(Map<String, Object> attributes, Container<?> container) { super(parentsMap(container), attributes); + _container = container; } @@ -104,4 +107,9 @@ public class GroupProviderImpl extends A return Futures.immediateFuture(null); } + @Override + protected void logOperation(final String operation) + { + _container.getEventLogger().message(new OperationLogMessage(this, operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java Sun Nov 20 16:42:57 2016 @@ -48,6 +48,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.configuration.IllegalConfigurationException; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Container; @@ -75,6 +76,7 @@ public class CloudFoundryDashboardManage private static final String UTF8 = StandardCharsets.UTF_8.name(); private final ObjectMapper _objectMapper = new ObjectMapper(); + private final Container<?> _container; @ManagedAttributeField private URI _cloudFoundryEndpointURI; @@ -96,6 +98,7 @@ public class CloudFoundryDashboardManage public CloudFoundryDashboardManagementGroupProviderImpl(Map<String, Object> attributes, Container<?> container) { super(parentsMap(container), attributes); + _container = container; } @Override @@ -305,4 +308,10 @@ public class CloudFoundryDashboardManage { return _tlsCipherSuiteBlackList; } + + @Override + protected void logOperation(final String operation) + { + _container.getEventLogger().message(new OperationLogMessage(this, operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java Sun Nov 20 16:42:57 2016 @@ -89,7 +89,7 @@ public class StoredMemoryMessage<T exten { if(_content == null) { - return null; + return Collections.emptyList(); } return Collections.singleton(_content.view(offset, length)); } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java Sun Nov 20 16:42:57 2016 @@ -908,4 +908,11 @@ public abstract class AbstractAMQPConnec } } } + + + @Override + protected void logOperation(final String operation) + { + getEventLogger().message(ConnectionMessages.OPERATION(operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java Sun Nov 20 16:42:57 2016 @@ -373,7 +373,7 @@ public class NonBlockingConnection imple private void shutdown() { - if (_hasShutdown.getAndSet(true)) + if (!_hasShutdown.compareAndSet(false, true)) { return; } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java Sun Nov 20 16:42:57 2016 @@ -28,9 +28,11 @@ import java.util.Map; import com.google.common.util.concurrent.ListenableFuture; +import org.apache.qpid.server.logging.messages.VirtualHostMessages; import org.apache.qpid.server.message.MessageDestination; import org.apache.qpid.server.message.MessageSource; import org.apache.qpid.server.model.AbstractConfiguredObject; +import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.BrokerModel; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Connection; @@ -180,4 +182,10 @@ public abstract class AbstractNonConnect { return null; } + + @Override + protected void logOperation(final String operation) + { + getAncestor(Broker.class).getEventLogger().message(VirtualHostMessages.OPERATION(operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Sun Nov 20 16:42:57 2016 @@ -1308,7 +1308,7 @@ public abstract class AbstractVirtualHos return _broker; } - private ListenableFuture<? extends Queue<?>> addQueueAsync(Map<String, Object> attributes) throws QueueExistsException + private ListenableFuture<? extends Queue<?>> addQueueAsync(Map<String, Object> attributes) { if (shouldCreateDLQ(attributes)) { @@ -1322,18 +1322,9 @@ public abstract class AbstractVirtualHos return Futures.immediateFuture(addQueueWithoutDLQ(attributes)); } - private Queue<?> addQueueWithoutDLQ(Map<String, Object> attributes) throws QueueExistsException + private Queue<?> addQueueWithoutDLQ(Map<String, Object> attributes) { - try - { - return (Queue) getObjectFactory().create(Queue.class, attributes, this); - } - catch (DuplicateNameException e) - { - throw new QueueExistsException(String.format("Queue with name '%s' already exists", e.getName()), - (Queue<?>) e.getExisting()); - } - + return (Queue) getObjectFactory().create(Queue.class, attributes, this); } @@ -1387,7 +1378,7 @@ public abstract class AbstractVirtualHos private ListenableFuture<Exchange<?>> addExchangeAsync(Map<String,Object> attributes) - throws ExchangeExistsException, ReservedExchangeNameException, + throws ReservedExchangeNameException, NoFactoryForTypeException { final SettableFuture<Exchange<?>> returnVal = SettableFuture.create(); @@ -1403,15 +1394,7 @@ public abstract class AbstractVirtualHos @Override public void onFailure(final Throwable t) { - if(t instanceof DuplicateNameException) - { - DuplicateNameException dne = (DuplicateNameException) t; - returnVal.setException(new ExchangeExistsException((Exchange<?>) dne.getExisting())); - } - else - { - returnVal.setException(t); - } + returnVal.setException(t); } }, getTaskExecutor()); return returnVal; @@ -2190,10 +2173,10 @@ public abstract class AbstractVirtualHos attributes.put(org.apache.qpid.server.model.Exchange.ALTERNATE_EXCHANGE, null); dlExchange = (Exchange<?>) createChild(Exchange.class, attributes);; } - catch(ExchangeExistsException e) + catch(AbstractConfiguredObject.DuplicateNameException e) { // We're ok if the exchange already exists - dlExchange = e.getExistingExchange(); + dlExchange = (Exchange<?>) e.getExisting(); } catch (ReservedExchangeNameException | NoFactoryForTypeException | UnknownConfiguredObjectException e) { @@ -2212,21 +2195,12 @@ public abstract class AbstractVirtualHos args.put(CREATE_DLQ_ON_CREATION, false); args.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 0); - try - { - + args.put(Queue.ID, UUID.randomUUID()); + args.put(Queue.NAME, dlQueueName); + args.put(Queue.DURABLE, true); + dlQueue = addQueueWithoutDLQ(args); + childAdded(dlQueue); - args.put(Queue.ID, UUID.randomUUID()); - args.put(Queue.NAME, dlQueueName); - args.put(Queue.DURABLE, true); - dlQueue = addQueueWithoutDLQ(args); - childAdded(dlQueue); - } - catch (QueueExistsException e) - { - // TODO - currently theoretically for two threads to be creating a queue at the same time. - // All model changing operations should be moved to the task executor of the virtual host - } } } @@ -2558,6 +2532,12 @@ public abstract class AbstractVirtualHos } } + @Override + protected void logOperation(final String operation) + { + getEventLogger().message(VirtualHostMessages.OPERATION(operation)); + } + protected void startFileSystemSpaceChecking() { File storeLocationAsFile = _messageStore.getStoreLocationAsFile(); Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java Sun Nov 20 16:42:57 2016 @@ -25,7 +25,9 @@ import java.util.Map; import com.google.common.util.concurrent.ListenableFuture; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfiguredObject; +import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.State; @@ -70,4 +72,10 @@ abstract class AbstractVirtualHostAlias< } }); } + + @Override + protected void logOperation(final String operation) + { + getPort().getParent(Broker.class).getEventLogger().message(new OperationLogMessage(this, operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java Sun Nov 20 16:42:57 2016 @@ -49,6 +49,7 @@ import org.apache.qpid.exchange.Exchange import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.logging.EventLogger; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.logging.messages.ConfigStoreMessages; import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; import org.apache.qpid.server.model.AbstractConfiguredObject; @@ -644,4 +645,10 @@ public abstract class AbstractVirtualHos return Collections.unmodifiableCollection(supportedTypes); } + + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(new OperationLogMessage(this, operation)); + } } Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java Sun Nov 20 16:42:57 2016 @@ -20,8 +20,12 @@ package org.apache.qpid.server.virtualhostnode; import org.apache.qpid.server.model.ManagedAttribute; +import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes; +@ManagedObject(type=JsonVirtualHostNodeImpl.VIRTUAL_HOST_NODE_TYPE, + category=false, validChildTypes = "org.apache.qpid.server.virtualhostnode.JsonVirtualHostNodeImpl#getSupportedChildTypes()", + amqpName = "org.apache.qpid.JsonVirtualHostNode") public interface JsonVirtualHostNode<X extends JsonVirtualHostNode<X>> extends org.apache.qpid.server.model.VirtualHostNode<X>, org.apache.qpid.server.store.FileBasedSettings { Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNodeImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNodeImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNodeImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNodeImpl.java Sun Nov 20 16:42:57 2016 @@ -27,13 +27,11 @@ import java.util.Map; import org.apache.qpid.server.logging.messages.ConfigStoreMessages; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ManagedAttributeField; -import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.store.JsonFileConfigStore; -@ManagedObject(type=JsonVirtualHostNodeImpl.VIRTUAL_HOST_NODE_TYPE, category=false, validChildTypes = "org.apache.qpid.server.virtualhostnode.JsonVirtualHostNodeImpl#getSupportedChildTypes()") public class JsonVirtualHostNodeImpl extends AbstractStandardVirtualHostNode<JsonVirtualHostNodeImpl> implements JsonVirtualHostNode<JsonVirtualHostNodeImpl> { public static final String VIRTUAL_HOST_NODE_TYPE = "JSON"; Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java Sun Nov 20 16:42:57 2016 @@ -34,6 +34,7 @@ import com.google.common.util.concurrent import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfiguredObject; @@ -278,6 +279,13 @@ public class RedirectingVirtualHostNodeI } } + @Override + protected void logOperation(final String operation) + { + _broker.getEventLogger().message(new OperationLogMessage(this,operation)); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override protected <C extends ConfiguredObject> ListenableFuture<C> addChildAsync(Class<C> childClass, Map<String, Object> attributes, Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java Sun Nov 20 16:42:57 2016 @@ -34,7 +34,7 @@ import org.apache.qpid.test.utils.QpidTe public class DirectExchangeTest extends QpidTestCase { - private DirectExchange _exchange; + private DirectExchangeImpl _exchange; private VirtualHost<?> _vhost; @Override @@ -49,7 +49,7 @@ public class DirectExchangeTest extends attributes.put(Exchange.DURABLE, false); attributes.put(Exchange.TYPE, ExchangeDefaults.DIRECT_EXCHANGE_CLASS); - _exchange = (DirectExchange) _vhost.createChild(Exchange.class, attributes, _vhost); + _exchange = (DirectExchangeImpl) _vhost.createChild(Exchange.class, attributes, _vhost); _exchange.open(); } @@ -79,7 +79,7 @@ public class DirectExchangeTest extends try { - _exchange = (DirectExchange) _vhost.createChild(Exchange.class, attributes, _vhost); + _exchange = (DirectExchangeImpl) _vhost.createChild(Exchange.class, attributes, _vhost); _exchange.open(); fail("Exception not thrown"); } @@ -91,7 +91,7 @@ public class DirectExchangeTest extends public void testAmqpDirectRecreationRejected() throws Exception { - DirectExchange ampqDirect = (DirectExchange) _vhost.getChildByName(Exchange.class, ExchangeDefaults.DIRECT_EXCHANGE_NAME); + DirectExchangeImpl ampqDirect = (DirectExchangeImpl) _vhost.getChildByName(Exchange.class, ExchangeDefaults.DIRECT_EXCHANGE_NAME); assertNotNull(ampqDirect); assertSame(ampqDirect, _vhost.getChildById(Exchange.class, ampqDirect.getId())); @@ -104,7 +104,7 @@ public class DirectExchangeTest extends try { - _exchange = (DirectExchange) _vhost.createChild(Exchange.class, attributes, _vhost); + _exchange = (DirectExchangeImpl) _vhost.createChild(Exchange.class, attributes, _vhost); _exchange.open(); fail("Exception not thrown"); } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java Sun Nov 20 16:42:57 2016 @@ -53,7 +53,7 @@ import org.apache.qpid.test.utils.QpidTe public class FanoutExchangeTest extends QpidTestCase { - private FanoutExchange _exchange; + private FanoutExchangeImpl _exchange; private QueueManagingVirtualHost _virtualHost; private TaskExecutor _taskExecutor; @@ -83,7 +83,7 @@ public class FanoutExchangeTest extends when(_virtualHost.getModel()).thenReturn(BrokerModel.getInstance()); when(_virtualHost.getParent(VirtualHostNode.class)).thenReturn(virtualHostNode); when(_virtualHost.getCategoryClass()).thenReturn(VirtualHost.class); - _exchange = new FanoutExchange(attributes, _virtualHost); + _exchange = new FanoutExchangeImpl(attributes, _virtualHost); _exchange.open(); } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Sun Nov 20 16:42:57 2016 @@ -57,7 +57,7 @@ import org.apache.qpid.test.utils.QpidTe public class HeadersExchangeTest extends QpidTestCase { - private HeadersExchange _exchange; + private HeadersExchangeImpl _exchange; private QueueManagingVirtualHost _virtualHost; private TaskExecutor _taskExecutor; private ConfiguredObjectFactoryImpl _factory; @@ -94,7 +94,7 @@ public class HeadersExchangeTest extends attributes.put(Exchange.NAME, "test"); attributes.put(Exchange.DURABLE, false); - _exchange = new HeadersExchange(attributes, _virtualHost); + _exchange = new HeadersExchangeImpl(attributes, _virtualHost); } Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Sun Nov 20 16:42:57 2016 @@ -20,7 +20,7 @@ */ package org.apache.qpid.server.exchange; -import static org.apache.qpid.common.AMQPFilterTypes.*; +import static org.apache.qpid.common.AMQPFilterTypes.JMS_SELECTOR; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -40,19 +40,18 @@ import org.apache.qpid.server.message.In import org.apache.qpid.server.message.MessageReference; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.model.Binding; +import org.apache.qpid.server.model.BrokerTestHelper; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.store.TransactionLogResource; -import org.apache.qpid.server.model.BrokerTestHelper; -import org.apache.qpid.server.virtualhost.QueueExistsException; import org.apache.qpid.test.utils.QpidTestCase; public class TopicExchangeTest extends QpidTestCase { - private TopicExchange _exchange; + private TopicExchangeImpl _exchange; private VirtualHost<?> _vhost; @@ -67,7 +66,7 @@ public class TopicExchangeTest extends Q attributes.put(Exchange.DURABLE, false); attributes.put(Exchange.TYPE, ExchangeDefaults.TOPIC_EXCHANGE_CLASS); - _exchange = (TopicExchange) _vhost.createChild(Exchange.class, attributes, _vhost); + _exchange = (TopicExchangeImpl) _vhost.createChild(Exchange.class, attributes, _vhost); _exchange.open(); } @@ -88,7 +87,7 @@ public class TopicExchangeTest extends Q } } - private Queue<?> createQueue(String name) throws QueueExistsException + private Queue<?> createQueue(String name) { Map<String,Object> attributes = new HashMap<>(); attributes.put(Queue.NAME, name); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java Sun Nov 20 16:42:57 2016 @@ -32,7 +32,13 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.security.Principal; import java.security.PrivilegedAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import javax.security.auth.Subject; @@ -52,7 +58,6 @@ import org.apache.qpid.server.store.Dura import org.apache.qpid.server.store.preferences.PreferenceStore; import org.apache.qpid.server.transport.AMQPConnection; import org.apache.qpid.server.virtualhost.AbstractVirtualHost; -import org.apache.qpid.server.virtualhost.QueueExistsException; import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost; import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost; import org.apache.qpid.test.utils.QpidTestCase; @@ -282,7 +287,6 @@ public class BrokerTestHelper } public static Queue<?> createQueue(String queueName, VirtualHost<?> virtualHost) - throws QueueExistsException { Map<String,Object> attributes = new HashMap<String, Object>(); attributes.put(Queue.ID, UUIDGenerator.generateRandomUUID()); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java Sun Nov 20 16:42:57 2016 @@ -94,8 +94,8 @@ public class ConfiguredObjectTypeRegistr _typeRegistry.getOperations(object.getClass()); assertEquals(2, kitCarOperations.size()); assertTrue(kitCarOperations.containsKey("openDoor")); - final ConfiguredObjectOperation<TestCar> operation = - (ConfiguredObjectOperation<TestCar>) kitCarOperations.get("openDoor"); + final ConfiguredObjectOperation<TestCar<?>> operation = + (ConfiguredObjectOperation<TestCar<?>>) kitCarOperations.get("openDoor"); // test explicitly setting parameter Object returnVal = operation.perform(object, Collections.<String, Object>singletonMap("door", "DRIVER")); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestAbstractEngineImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestAbstractEngineImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestAbstractEngineImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestAbstractEngineImpl.java Sun Nov 20 16:42:57 2016 @@ -92,6 +92,12 @@ public class TestAbstractEngineImpl<X ex return _beforeCloseFuture; } + @Override + protected void logOperation(final String operation) + { + + } + @StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE) private ListenableFuture<Void> onActivate() { Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java Sun Nov 20 16:42:57 2016 @@ -62,6 +62,12 @@ public class TestKitCarImpl extends Abst return getObjectFactory().createAsync(childClass, attributes, this); } + @Override + protected void logOperation(final String operation) + { + + } + private static CurrentThreadTaskExecutor newTaskExecutor() { CurrentThreadTaskExecutor currentThreadTaskExecutor = new CurrentThreadTaskExecutor(); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java Sun Nov 20 16:42:57 2016 @@ -83,6 +83,12 @@ public class TestStandardCarImpl extends return getObjectFactory().createAsync(childClass, attributes, this); } + @Override + protected void logOperation(final String operation) + { + + } + @SuppressWarnings("unused") public static Map<String, Collection<String>> getSupportedChildTypes() { Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java Sun Nov 20 16:42:57 2016 @@ -102,6 +102,12 @@ public class TestConfiguredObject extend } @Override + protected void logOperation(final String operation) + { + + } + + @Override protected void onOpen() { if (_throwExceptionOnOpen) Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java Sun Nov 20 16:42:57 2016 @@ -250,6 +250,12 @@ public class TestSingletonImpl extends A return SYSTEM_PRINCIPAL; } + @Override + protected void logOperation(final String operation) + { + + } + public <T> T doAsSystem(PrivilegedAction<T> action) { return Subject.doAs(SYSTEM_SUBJECT, action); Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java Sun Nov 20 16:42:57 2016 @@ -50,6 +50,7 @@ import org.apache.qpid.exchange.Exchange import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.consumer.TestConsumerTarget; import org.apache.qpid.server.exchange.DirectExchange; +import org.apache.qpid.server.exchange.DirectExchangeImpl; import org.apache.qpid.server.message.AMQMessageHeader; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.MessageInstance; @@ -76,7 +77,7 @@ abstract class AbstractQueueTestBase ext private String _qname = "qname"; private String _owner = "owner"; private String _routingKey = "routing key"; - private DirectExchange _exchange; + private DirectExchangeImpl _exchange; private TestConsumerTarget _consumerTarget = new TestConsumerTarget(); private QueueConsumer<?> _consumer; private Map<String,Object> _arguments = Collections.emptyMap(); @@ -95,7 +96,7 @@ abstract class AbstractQueueTestBase ext _queue = (AbstractQueue<?>) _virtualHost.createChild(Queue.class, attributes); - _exchange = (DirectExchange) _virtualHost.getChildByName(Exchange.class, ExchangeDefaults.DIRECT_EXCHANGE_NAME); + _exchange = (DirectExchangeImpl) _virtualHost.getChildByName(Exchange.class, ExchangeDefaults.DIRECT_EXCHANGE_NAME); } @Override Modified: qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java (original) +++ qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java Sun Nov 20 16:42:57 2016 @@ -70,7 +70,9 @@ class LegacyAccessControlAdapter "performGC", "getThreadStackTraces", "findThreadStackTraces", - "extractConfig"))); + "extractConfig", + "restart"))); + private static final Set<String> VIRTUALHOST_UPDATE_OPERATIONS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("importMessageStore", "extractMessageStore"))); Modified: qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java (original) +++ qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java Sun Nov 20 16:42:57 2016 @@ -31,7 +31,7 @@ import org.apache.qpid.server.model.Para import org.apache.qpid.server.model.VirtualHostAccessControlProvider; import org.apache.qpid.server.security.Result; -@ManagedObject( category = false, type= RuleBasedVirtualHostAccessControlProvider.RULE_BASED_TYPE) +@ManagedObject( category = false, type= RuleBasedVirtualHostAccessControlProvider.RULE_BASED_TYPE, amqpName = "org.apache.qpid.RuleBaseVirtualHostAccessControlProvider") public interface RuleBasedVirtualHostAccessControlProvider<X extends RuleBasedVirtualHostAccessControlProvider<X>> extends VirtualHostAccessControlProvider<X> { String RULE_BASED_TYPE = "RuleBased"; Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Sun Nov 20 16:42:57 2016 @@ -52,6 +52,7 @@ import org.apache.qpid.server.message.In import org.apache.qpid.server.message.MessageDestination; import org.apache.qpid.server.message.MessageReference; import org.apache.qpid.server.message.MessageSource; +import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.ExclusivityPolicy; import org.apache.qpid.server.model.LifetimePolicy; @@ -77,9 +78,7 @@ import org.apache.qpid.server.txn.Timeou import org.apache.qpid.server.txn.UnknownDtxBranchException; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; import org.apache.qpid.server.util.ServerScopedRuntimeException; -import org.apache.qpid.server.virtualhost.ExchangeExistsException; import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException; -import org.apache.qpid.server.virtualhost.QueueExistsException; import org.apache.qpid.server.virtualhost.RequiredExchangeException; import org.apache.qpid.server.virtualhost.ReservedExchangeNameException; import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException; @@ -936,9 +935,9 @@ public class ServerSessionDelegate exten { exception(session, method, ExecutionErrorCode.NOT_FOUND, "Unknown Exchange Type: " + method.getType()); } - catch(ExchangeExistsException e) + catch(AbstractConfiguredObject.DuplicateNameException e) { - Exchange<?> exchange = e.getExistingExchange(); + Exchange<?> exchange = (Exchange<?>) e.getExisting(); if(!exchange.getType().equals(method.getType())) { exception(session, method, ExecutionErrorCode.NOT_ALLOWED, @@ -1530,9 +1529,9 @@ public class ServerSessionDelegate exten queue = addressSpace.createMessageSource(Queue.class, arguments); } - catch(QueueExistsException qe) + catch(AbstractConfiguredObject.DuplicateNameException qe) { - queue = qe.getExistingQueue(); + queue = (Queue<?>) qe.getExisting(); if (!verifySessionAccess((ServerSession) session, queue)) { String description = "Cannot declare queue('" + queueName + "')," Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Sun Nov 20 16:42:57 2016 @@ -79,21 +79,7 @@ import org.apache.qpid.server.message.Me import org.apache.qpid.server.message.MessageReference; import org.apache.qpid.server.message.MessageSource; import org.apache.qpid.server.message.ServerMessage; -import org.apache.qpid.server.model.AbstractConfigurationChangeListener; -import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.ConfigurationChangeListener; -import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.Connection; -import org.apache.qpid.server.model.Consumer; -import org.apache.qpid.server.model.Exchange; -import org.apache.qpid.server.model.ExclusivityPolicy; -import org.apache.qpid.server.model.LifetimePolicy; -import org.apache.qpid.server.model.NamedAddressSpace; -import org.apache.qpid.server.model.NoFactoryForTypeException; -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.UnknownConfiguredObjectException; +import org.apache.qpid.server.model.*; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.protocol.CapacityChecker; import org.apache.qpid.server.protocol.ConsumerListener; @@ -111,9 +97,7 @@ import org.apache.qpid.server.txn.LocalT import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.util.Action; import org.apache.qpid.server.util.ServerScopedRuntimeException; -import org.apache.qpid.server.virtualhost.ExchangeExistsException; import org.apache.qpid.server.virtualhost.ExchangeIsAlternateException; -import org.apache.qpid.server.virtualhost.QueueExistsException; import org.apache.qpid.server.virtualhost.RequiredExchangeException; import org.apache.qpid.server.virtualhost.ReservedExchangeNameException; import org.apache.qpid.transport.network.Ticker; @@ -1465,7 +1449,7 @@ public class AMQChannel } @Override - public long deliverToClient(final ConsumerImpl sub, final ServerMessage message, + public long deliverToClient(final ConsumerTarget_0_8 target, final ServerMessage message, final InstanceProperties props, final long deliveryTag) { @@ -2962,9 +2946,9 @@ public class AMQChannel _connection.writeFrame(declareOkBody.generateFrame(getChannelId())); } } - catch (ExchangeExistsException e) + catch (AbstractConfiguredObject.DuplicateNameException e) { - exchange = e.getExistingExchange(); + exchange = (Exchange<?>) e.getExisting(); if (!exchange.getType().equals(typeString)) { _connection.sendConnectionClose(ErrorCodes.NOT_ALLOWED, "Attempt to redeclare exchange: '" @@ -3323,10 +3307,10 @@ public class AMQChannel } } } - catch (QueueExistsException qe) + catch (AbstractConfiguredObject.DuplicateNameException qe) { - queue = qe.getExistingQueue(); + queue = (Queue<?>) qe.getExisting(); if (!queue.verifySessionAccess(this)) { Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java Sun Nov 20 16:42:57 2016 @@ -60,7 +60,6 @@ import org.apache.qpid.configuration.Com import org.apache.qpid.framing.*; import org.apache.qpid.properties.ConnectionStartProperties; import org.apache.qpid.protocol.ErrorCodes; -import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.logging.messages.ConnectionMessages; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.ServerMessage; @@ -1299,14 +1298,14 @@ public class AMQPConnection_0_8Impl } @Override - public long deliverToClient(final ConsumerImpl sub, final ServerMessage message, + public long deliverToClient(final ConsumerTarget_0_8 target, final ServerMessage message, final InstanceProperties props, final long deliveryTag) { long size = _protocolOutputConverter.writeDeliver(message, props, _channelId, deliveryTag, - new AMQShortString(sub.getName())); + target.getConsumerTag()); registerMessageDelivered(size); return size; } Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java Sun Nov 20 16:42:57 2016 @@ -20,12 +20,11 @@ */ package org.apache.qpid.server.protocol.v0_8; -import org.apache.qpid.server.consumer.ConsumerImpl; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.ServerMessage; public interface ClientDeliveryMethod { - long deliverToClient(final ConsumerImpl sub, final ServerMessage message, final InstanceProperties props, + long deliverToClient(final ConsumerTarget_0_8 target, final ServerMessage message, final InstanceProperties props, final long deliveryTag); } Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java (original) +++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java Sun Nov 20 16:42:57 2016 @@ -417,7 +417,7 @@ public abstract class ConsumerTarget_0_8 final InstanceProperties props, final long deliveryTag) { - return _deliveryMethod.deliverToClient(consumer, message, props, deliveryTag); + return _deliveryMethod.deliverToClient(this, message, props, deliveryTag); } Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Sun Nov 20 16:42:57 2016 @@ -35,7 +35,23 @@ import java.util.concurrent.ConcurrentMa import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.qpid.exchange.ExchangeDefaults; +import org.apache.qpid.filter.SelectorParsingException; +import org.apache.qpid.filter.selector.ParseException; +import org.apache.qpid.filter.selector.TokenMgrError; +import org.apache.qpid.server.consumer.ConsumerImpl; +import org.apache.qpid.server.filter.FilterManager; +import org.apache.qpid.server.filter.JMSSelectorFilter; +import org.apache.qpid.server.message.MessageInstance; +import org.apache.qpid.server.message.MessageSource; +import org.apache.qpid.server.model.AbstractConfiguredObject; +import org.apache.qpid.server.model.Binding; +import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.Exchange; +import org.apache.qpid.server.model.ExclusivityPolicy; +import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.NamedAddressSpace; +import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException; import org.apache.qpid.server.protocol.v1_0.type.Binary; import org.apache.qpid.server.protocol.v1_0.type.DeliveryState; @@ -57,25 +73,9 @@ import org.apache.qpid.server.protocol.v import org.apache.qpid.server.protocol.v1_0.type.transport.Detach; import org.apache.qpid.server.protocol.v1_0.type.transport.Error; import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer; -import org.apache.qpid.exchange.ExchangeDefaults; -import org.apache.qpid.filter.SelectorParsingException; -import org.apache.qpid.filter.selector.ParseException; -import org.apache.qpid.filter.selector.TokenMgrError; -import org.apache.qpid.server.consumer.ConsumerImpl; -import org.apache.qpid.server.filter.FilterManager; -import org.apache.qpid.server.filter.JMSSelectorFilter; -import org.apache.qpid.server.message.MessageInstance; -import org.apache.qpid.server.message.MessageSource; -import org.apache.qpid.server.model.Binding; -import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.Exchange; -import org.apache.qpid.server.model.ExclusivityPolicy; -import org.apache.qpid.server.model.LifetimePolicy; -import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.txn.AutoCommitTransaction; import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; -import org.apache.qpid.server.virtualhost.QueueExistsException; public class SendingLink_1_0 implements Link_1_0 { @@ -321,7 +321,7 @@ public class SendingLink_1_0 implements qd = new QueueDestination(queue, name); } - catch (QueueExistsException e) + catch (AbstractConfiguredObject.DuplicateNameException e) { _logger.error("A randomly generated temporary queue name collided with an existing queue",e); throw new ConnectionScopedRuntimeException(e); Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original) +++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Sun Nov 20 16:42:57 2016 @@ -58,6 +58,7 @@ import org.apache.qpid.server.logging.su import org.apache.qpid.server.message.MessageDestination; import org.apache.qpid.server.message.MessageSource; import org.apache.qpid.server.model.AbstractConfigurationChangeListener; +import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ConfigurationChangeListener; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.Consumer; @@ -104,7 +105,6 @@ import org.apache.qpid.server.txn.AutoCo import org.apache.qpid.server.txn.ServerTransaction; import org.apache.qpid.server.util.Action; import org.apache.qpid.server.util.ConnectionScopedRuntimeException; -import org.apache.qpid.server.virtualhost.QueueExistsException; import org.apache.qpid.transport.network.Ticker; public class Session_1_0 implements AMQSessionModel<Session_1_0>, LogSubject @@ -1132,7 +1132,7 @@ public class Session_1_0 implements AMQS _connection.close(error); } - catch (QueueExistsException e) + catch (AbstractConfiguredObject.DuplicateNameException e) { _logger.error("A temporary queue was created with a name which collided with an existing queue name"); throw new ConnectionScopedRuntimeException(e); Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java Sun Nov 20 16:42:57 2016 @@ -20,10 +20,12 @@ package org.apache.qpid.server.virtualhost.derby; import org.apache.qpid.server.model.ManagedAttribute; +import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.store.FileBasedSettings; import org.apache.qpid.server.store.SizeMonitoringSettings; import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost; +@ManagedObject(category = false, type = DerbyVirtualHostImpl.VIRTUAL_HOST_TYPE, amqpName = "org.apache.qpid.DerbyVirtualHost") public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends QueueManagingVirtualHost<X>, FileBasedSettings, SizeMonitoringSettings Modified: qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHostImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHostImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHostImpl.java (original) +++ qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHostImpl.java Sun Nov 20 16:42:57 2016 @@ -20,9 +20,10 @@ */ package org.apache.qpid.server.virtualhost.derby; +import java.util.Map; + import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.model.ManagedAttributeField; -import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.store.MessageStore; @@ -31,9 +32,6 @@ import org.apache.qpid.server.store.derb import org.apache.qpid.server.util.FileHelper; import org.apache.qpid.server.virtualhost.AbstractVirtualHost; -import java.util.Map; - -@ManagedObject(category = false, type = DerbyVirtualHostImpl.VIRTUAL_HOST_TYPE) public class DerbyVirtualHostImpl extends AbstractVirtualHost<DerbyVirtualHostImpl> implements DerbyVirtualHost<DerbyVirtualHostImpl> { public static final String VIRTUAL_HOST_TYPE = "DERBY"; Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java Sun Nov 20 16:42:57 2016 @@ -36,11 +36,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.server.logging.LogInclusionRule; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfigurationChangeListener; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.BrokerLogInclusionRule; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry; +import org.apache.qpid.server.model.Container; import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.StateTransition; @@ -213,4 +215,9 @@ public abstract class AbstractLogger<X e return Collections.unmodifiableCollection(supportedTypes); } + @Override + protected void logOperation(final String operation) + { + getAncestor(Container.class).getEventLogger().message(new OperationLogMessage(this, operation)); + } } Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java Sun Nov 20 16:42:57 2016 @@ -29,8 +29,10 @@ import com.google.common.util.concurrent import com.google.common.util.concurrent.ListenableFuture; import org.apache.qpid.server.logging.LogLevel; +import org.apache.qpid.server.logging.OperationLogMessage; import org.apache.qpid.server.model.AbstractConfiguredObject; import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.Container; import org.apache.qpid.server.model.ManagedAttributeField; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.StateTransition; @@ -105,4 +107,11 @@ public abstract class AbstractNameAndLev QpidLoggerTurboFilter.filterAddedToRootContext(_filter); return Futures.immediateFuture(null); } + + + @Override + protected void logOperation(final String operation) + { + getAncestor(Container.class).getEventLogger().message(new OperationLogMessage(this, operation)); + } } Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java Sun Nov 20 16:42:57 2016 @@ -33,7 +33,10 @@ import org.apache.qpid.server.model.Para import org.apache.qpid.server.model.Content; import org.apache.qpid.server.model.VirtualHostLogger; -@ManagedObject( category = false, type = VirtualHostFileLogger.TYPE, validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedVirtualHostLoggerChildTypes()") +@ManagedObject( category = false, + type = VirtualHostFileLogger.TYPE, + validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedVirtualHostLoggerChildTypes()", + amqpName = "org.apache.qpid.VirtualHostLogbackFileLogger") public interface VirtualHostFileLogger<X extends VirtualHostFileLogger<X>> extends VirtualHostLogger<X> { String TYPE = "File"; Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java Sun Nov 20 16:42:57 2016 @@ -25,7 +25,8 @@ import org.apache.qpid.server.model.Mana import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.VirtualHostLogInclusionRule; -@ManagedObject( category = false, type = VirtualHostNameAndLevelLogInclusionRule.TYPE) +@ManagedObject( category = false, type = VirtualHostNameAndLevelLogInclusionRule.TYPE, + amqpName = "org.apache.qpid.VirtualHostNameAndLevelLogbackLogInclusionRule") public interface VirtualHostNameAndLevelLogInclusionRule<X extends VirtualHostNameAndLevelLogInclusionRule<X>> extends VirtualHostLogInclusionRule<X>, LogBackLogInclusionRule { String TYPE = "NameAndLevel"; Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java (original) +++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java Sun Nov 20 16:42:57 2016 @@ -25,7 +25,8 @@ import org.apache.qpid.server.model.Mana import org.apache.qpid.server.model.VirtualHostLogger; @ManagedObject( category = false, type = VirtualHostSyslogLogger.TYPE, - validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedVirtualHostLoggerChildTypes()") + validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedVirtualHostLoggerChildTypes()", + amqpName = "org.apache.qpid.VirtualHostLogbackSyslogLogger") public interface VirtualHostSyslogLogger<X extends VirtualHostSyslogLogger<X>> extends VirtualHostLogger<X> { String TYPE = "Syslog"; Modified: qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java (original) +++ qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java Sun Nov 20 16:42:57 2016 @@ -85,7 +85,7 @@ public class ManagementAddressSpace impl _addressSpaceRegistry = addressSpaceRegistry; _broker = addressSpaceRegistry.getBroker(); - _managementNode = new ManagementNode(this, addressSpaceRegistry.getBroker(), null); + _managementNode = new ManagementNode(this, addressSpaceRegistry.getBroker()); _propertiesNode = new VirtualHostPropertiesNode(this); _messageStore = new MemoryMessageStore(); _principal = new ManagementAddressSpacePrincipal(this); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
