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 2016/11/20 16:42:59 UTC
svn commit: r1770576 [1/8] - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/
broker-codegen/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/binding/ broker-core...
Author: rgodfrey
Date: Sun Nov 20 16:42:57 2016
New Revision: 1770576
URL: http://svn.apache.org/viewvc?rev=1770576&view=rev
Log:
QPID-7533 : Initial commit of AMQP Management functionality
Added:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java (with props)
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
- copied, changed from r1770575, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java (with props)
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
- copied, changed from r1770575, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (with props)
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
- copied, changed from r1770575, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java (with props)
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java
- copied, changed from r1770575, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/OperationLogMessage.java (with props)
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectCustomSerialization.java (with props)
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java (with props)
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementOutputConverter.java (with props)
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java (with props)
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Publisher.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagedEntityType.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/KeyComparator.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MapComparator.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Connection_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Exchange_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Binding.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectInjectedOperation.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectJacksonModule.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectMethodOperation.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectOperation.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Consumer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Exchange.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ManagedObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ManagedOperation.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Model.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Session.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAccessControlProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAlias.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogInclusionRule.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostLogger.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/HttpPort.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/LastValueQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/PriorityQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/StandardQueue.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/AbstractAMQPConnection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractVirtualHostAlias.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNode.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/JsonVirtualHostNodeImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/DirectExchangeTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/ConfiguredObjectTypeRegistryTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestAbstractEngineImpl.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCarImpl.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCarImpl.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/lifecycle/TestConfiguredObject.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ClientDeliveryMethod.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHostImpl.java
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
qpid/java/trunk/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/java/trunk/broker/pom.xml
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
qpid/java/trunk/test-profiles/test-provider.properties
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java Sun Nov 20 16:42:57 2016
@@ -32,12 +32,11 @@ import java.util.concurrent.TimeoutExcep
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
-
-import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.OperationLogMessage;
import org.apache.qpid.server.logging.messages.HighAvailabilityMessages;
import org.apache.qpid.server.logging.subjects.BDBHAVirtualHostNodeLogSubject;
import org.apache.qpid.server.logging.subjects.GroupLogSubject;
@@ -48,9 +47,8 @@ import org.apache.qpid.server.model.Ille
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
-import org.apache.qpid.server.model.SystemConfig;
-import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDBHARemoteReplicationNodeImpl> implements BDBHARemoteReplicationNode<BDBHARemoteReplicationNodeImpl>
@@ -60,7 +58,7 @@ public class BDBHARemoteReplicationNodeI
private final ReplicatedEnvironmentFacade _replicatedEnvironmentFacade;
private final String _address;
- private final Broker _broker;
+ private final Broker<?> _broker;
private volatile Date _joinTime;
private volatile long _lastTransactionId;
@@ -232,6 +230,12 @@ public class BDBHARemoteReplicationNodeI
}
}
+ @Override
+ protected void logOperation(final String operation)
+ {
+ getEventLogger().message(new OperationLogMessage(this, operation));
+ }
+
void setRole(NodeRole role)
{
_lastKnownRole = role;
@@ -271,6 +275,6 @@ public class BDBHARemoteReplicationNodeI
private EventLogger getEventLogger()
{
- return ((SystemConfig)getParent(VirtualHostNode.class).getParent(Broker.class).getParent(SystemConfig.class)).getEventLogger();
+ return _broker.getEventLogger();
}
}
Modified: qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java (original)
+++ qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java Sun Nov 20 16:42:57 2016
@@ -287,29 +287,43 @@ public class ConfiguredObjectFactoryGene
final Map<? extends ExecutableElement, ? extends AnnotationValue> elementValues =
processingEnv.getElementUtils().getElementValuesWithDefaults(annotationMirror);
+ boolean wrapCallToSuper = false;
+ boolean log = false;
for (ExecutableElement executableElement : elementValues.keySet())
{
if ("changesConfiguredObjectState".contentEquals(executableElement.getSimpleName()))
{
- final String callToSuper = "super." + methodElement.getSimpleName().toString() + parameterList;
+ wrapCallToSuper = (Boolean) elementValues.get(executableElement).getValue();
+ }
+ else if("log".contentEquals(executableElement.getSimpleName()))
+ {
+ log = (Boolean) elementValues.get(executableElement).getValue();
+ }
+ }
- pw.print(" ");
- if (methodElement.getReturnType().getKind() != TypeKind.VOID)
- {
- pw.print("return ");
- }
- if ((Boolean) elementValues.get(executableElement).getValue())
- {
- pw.println(wrapByDoOnConfigThread(callToSuper, className, methodElement));
- }
- else
- {
- pw.println(callToSuper + ";");
- }
+ if(log)
+ {
+ pw.print(" logOperation(\"");
+ pw.print(methodElement.getSimpleName().toString());
+ pw.println("\");");
+ }
- break;
- }
+ final String callToSuper = "super." + methodElement.getSimpleName().toString() + parameterList;
+
+ pw.print(" ");
+ if (methodElement.getReturnType().getKind() != TypeKind.VOID)
+ {
+ pw.print("return ");
+ }
+ if (wrapCallToSuper)
+ {
+ pw.println(wrapByDoOnConfigThread(callToSuper, className, methodElement));
}
+ else
+ {
+ pw.println(callToSuper + ";");
+ }
+
pw.println(" }");
pw.println();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java Sun Nov 20 16:42:57 2016
@@ -153,6 +153,12 @@ public class BindingImpl
}
@Override
+ protected void logOperation(final String operation)
+ {
+ getEventLogger().message(BindingMessages.OPERATION(operation));
+ }
+
+ @Override
public boolean equals(final Object o)
{
if (this == o)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Sun Nov 20 16:42:57 2016
@@ -61,7 +61,7 @@ import org.apache.qpid.server.model.Exch
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.NamedAddressSpace;
-import org.apache.qpid.server.model.Publisher;
+import org.apache.qpid.server.model.Param;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
@@ -383,7 +383,13 @@ public abstract class AbstractExchange<T
_bindings.remove(binding);
}
- public final Collection<Binding<?>> getBindings()
+ @Override
+ public Collection<Binding<?>> getBindings()
+ {
+ return getBindingsImpl();
+ }
+
+ private Collection<Binding<?>> getBindingsImpl()
{
return Collections.unmodifiableList(_bindings);
}
@@ -521,6 +527,14 @@ public abstract class AbstractExchange<T
final InstanceProperties instanceProperties);
@Override
+ public void bind(@Param(name = "queue") final Queue<?> queue,
+ @Param(name = "bindingKey") final String bindingKey,
+ @Param(name = "arguments") final Map<String, Object> arguments)
+ {
+ addBinding(bindingKey, queue, arguments);
+ }
+
+ @Override
public long getMessagesIn()
{
return _receivedMessageCount.get();
@@ -838,7 +852,7 @@ public abstract class AbstractExchange<T
if(org.apache.qpid.server.model.Binding.class.isAssignableFrom(clazz))
{
- return (Collection<C>) getBindings();
+ return (Collection<C>) getBindingsImpl();
}
else
{
@@ -846,12 +860,6 @@ public abstract class AbstractExchange<T
}
}
- private interface BindingListener<X extends AbstractExchange<X>>
- {
- void bindingAdded(AbstractExchange<X> exchange, Binding<?> binding);
- void bindingRemoved(AbstractExchange<X> exchange, Binding<?> binding);
- }
-
private static final class BindingIdentifier
{
private final String _bindingKey;
@@ -908,12 +916,6 @@ public abstract class AbstractExchange<T
}
}
- @Override
- public Collection<Publisher> getPublishers()
- {
- return Collections.emptySet();
- }
-
// Used by the protocol layers
@Override
public boolean deleteBinding(final String bindingKey, final Queue<?> queue)
@@ -938,17 +940,6 @@ public abstract class AbstractExchange<T
}
@Override
- public org.apache.qpid.server.model.Binding createBinding(final String bindingKey,
- final Queue queue,
- final Map<String, Object> bindingArguments,
- final Map<String, Object> attributes)
- {
- addBinding(bindingKey, (Queue<?>) queue, bindingArguments);
- final Binding<?> binding = getBinding(bindingKey, (Queue<?>) queue);
- return binding;
- }
-
- @Override
public NamedAddressSpace getAddressSpace()
{
return _virtualHost;
@@ -960,4 +951,10 @@ public abstract class AbstractExchange<T
{
authorise(token, PUBLISH_ACTION, arguments);
}
+
+ @Override
+ protected void logOperation(final String operation)
+ {
+ getEventLogger().message(ExchangeMessages.OPERATION(operation));
+ }
}
Added: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java?rev=1770576&view=auto
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java (added)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java Sun Nov 20 16:42:57 2016
@@ -0,0 +1,31 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.exchange;
+
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.ManagedObject;
+
+@ManagedObject( category = false, type = ExchangeDefaults.DIRECT_EXCHANGE_CLASS,
+ amqpName = "org.apache.qpid.DirectExchange" )
+public interface DirectExchange<X extends DirectExchange<X>> extends Exchange<X>
+{
+}
Propchange: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java (from r1770575, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java&r1=1770575&r2=1770576&rev=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java Sun Nov 20 16:42:57 2016
@@ -34,7 +34,6 @@ import java.util.concurrent.CopyOnWriteA
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.server.filter.AMQInvalidArgumentException;
import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.filter.FilterSupport;
@@ -42,17 +41,15 @@ import org.apache.qpid.server.filter.Fil
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Binding;
-import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-@ManagedObject( category = false, type = ExchangeDefaults.DIRECT_EXCHANGE_CLASS )
-public class DirectExchange extends AbstractExchange<DirectExchange>
+public class DirectExchangeImpl extends AbstractExchange<DirectExchangeImpl> implements DirectExchange<DirectExchangeImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(DirectExchange.class);
+ private static final Logger _logger = LoggerFactory.getLogger(DirectExchangeImpl.class);
private static final class BindingSet
{
@@ -139,7 +136,7 @@ public class DirectExchange extends Abst
new ConcurrentHashMap<String, BindingSet>();
@ManagedObjectFactoryConstructor
- public DirectExchange(final Map<String, Object> attributes, final QueueManagingVirtualHost<?> vhost)
+ public DirectExchangeImpl(final Map<String, Object> attributes, final QueueManagingVirtualHost<?> vhost)
{
super(attributes, vhost);
}
Added: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java?rev=1770576&view=auto
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java (added)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java Sun Nov 20 16:42:57 2016
@@ -0,0 +1,31 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.exchange;
+
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.ManagedObject;
+
+@ManagedObject( category = false, type = ExchangeDefaults.FANOUT_EXCHANGE_CLASS,
+ amqpName = "org.apache.qpid.FanoutExchange" )
+public interface FanoutExchange<X extends Exchange<X>> extends Exchange<X>
+{
+}
Propchange: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java (from r1770575, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java&r1=1770575&r2=1770576&rev=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java Sun Nov 20 16:42:57 2016
@@ -30,7 +30,6 @@ import java.util.concurrent.atomic.Atomi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.server.filter.AMQInvalidArgumentException;
import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.filter.FilterSupport;
@@ -38,16 +37,14 @@ import org.apache.qpid.server.filter.Fil
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Binding;
-import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-@ManagedObject( category = false, type = ExchangeDefaults.FANOUT_EXCHANGE_CLASS )
-public class FanoutExchange extends AbstractExchange<FanoutExchange>
+class FanoutExchangeImpl extends AbstractExchange<FanoutExchangeImpl> implements FanoutExchange<FanoutExchangeImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(FanoutExchange.class);
+ private static final Logger _logger = LoggerFactory.getLogger(FanoutExchangeImpl.class);
private static final Integer ONE = Integer.valueOf(1);
@@ -66,7 +63,7 @@ public class FanoutExchange extends Abst
}
@ManagedObjectFactoryConstructor
- public FanoutExchange(final Map<String, Object> attributes, final QueueManagingVirtualHost<?> vhost)
+ public FanoutExchangeImpl(final Map<String, Object> attributes, final QueueManagingVirtualHost<?> vhost)
{
super(attributes, vhost);
}
Added: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?rev=1770576&view=auto
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (added)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java Sun Nov 20 16:42:57 2016
@@ -0,0 +1,31 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.exchange;
+
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.ManagedObject;
+
+@ManagedObject( category = false, type = ExchangeDefaults.HEADERS_EXCHANGE_CLASS,
+ amqpName = "org.apache.qpid.HeadersExchange" )
+public interface HeadersExchange<X extends Exchange<X>> extends Exchange<X>
+{
+}
Propchange: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java (from r1770575, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java&r1=1770575&r2=1770576&rev=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java Sun Nov 20 16:42:57 2016
@@ -70,11 +70,10 @@ import org.apache.qpid.server.virtualhos
* amq.match - pub/sub on field content/value
* </pre>
*/
-@ManagedObject( category = false, type = ExchangeDefaults.HEADERS_EXCHANGE_CLASS )
-public class HeadersExchange extends AbstractExchange<HeadersExchange>
+public class HeadersExchangeImpl extends AbstractExchange<HeadersExchangeImpl> implements HeadersExchange<HeadersExchangeImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(HeadersExchange.class);
+ private static final Logger _logger = LoggerFactory.getLogger(HeadersExchangeImpl.class);
private final ConcurrentMap<String, CopyOnWriteArraySet<Binding<?>>> _bindingsByKey =
new ConcurrentHashMap<>();
@@ -83,7 +82,7 @@ public class HeadersExchange extends Abs
new CopyOnWriteArrayList<HeadersBinding>();
@ManagedObjectFactoryConstructor
- public HeadersExchange(final Map<String, Object> attributes, final QueueManagingVirtualHost<?> vhost)
+ public HeadersExchangeImpl(final Map<String, Object> attributes, final QueueManagingVirtualHost<?> vhost)
{
super(attributes, vhost);
}
Added: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java?rev=1770576&view=auto
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java (added)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java Sun Nov 20 16:42:57 2016
@@ -0,0 +1,31 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.exchange;
+
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.ManagedObject;
+
+@ManagedObject( category = false, type = ExchangeDefaults.TOPIC_EXCHANGE_CLASS,
+ amqpName = "org.apache.qpid.TopicExchange" )
+public interface TopicExchange<X extends TopicExchange<X>> extends Exchange<X>
+{
+}
Propchange: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java (from r1770575, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java&r1=1770575&r2=1770576&rev=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java Sun Nov 20 16:42:57 2016
@@ -31,7 +31,6 @@ import java.util.concurrent.ConcurrentHa
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.server.exchange.topic.TopicExchangeResult;
import org.apache.qpid.server.exchange.topic.TopicMatcherResult;
import org.apache.qpid.server.exchange.topic.TopicNormalizer;
@@ -42,17 +41,15 @@ import org.apache.qpid.server.filter.Fil
import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Binding;
-import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-@ManagedObject( category = false, type = ExchangeDefaults.TOPIC_EXCHANGE_CLASS )
-public class TopicExchange extends AbstractExchange<TopicExchange>
+class TopicExchangeImpl extends AbstractExchange<TopicExchangeImpl> implements TopicExchange<TopicExchangeImpl>
{
- private static final Logger _logger = LoggerFactory.getLogger(TopicExchange.class);
+ private static final Logger _logger = LoggerFactory.getLogger(TopicExchangeImpl.class);
private final TopicParser _parser = new TopicParser();
@@ -62,7 +59,7 @@ public class TopicExchange extends Abstr
private final Map<Binding<?>, Map<String,Object>> _bindings = new HashMap<>();
@ManagedObjectFactoryConstructor
- public TopicExchange(final Map<String,Object> attributes, final QueueManagingVirtualHost<?> vhost)
+ public TopicExchangeImpl(final Map<String,Object> attributes, final QueueManagingVirtualHost<?> vhost)
{
super(attributes, vhost);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/LogMessage.java Sun Nov 20 16:42:57 2016
@@ -23,4 +23,5 @@ package org.apache.qpid.server.logging;
public interface LogMessage
{
String getLogHierarchy();
+
}
Added: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/OperationLogMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/OperationLogMessage.java?rev=1770576&view=auto
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/OperationLogMessage.java (added)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/OperationLogMessage.java Sun Nov 20 16:42:57 2016
@@ -0,0 +1,50 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.logging;
+
+import org.apache.qpid.server.model.ConfiguredObject;
+
+public class OperationLogMessage implements LogMessage
+{
+
+ private final String _hierarchy;
+ private final String _logMessage;
+
+ public OperationLogMessage(ConfiguredObject<?> object, String operation)
+ {
+ _hierarchy = AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX
+ + "." + object.getCategoryClass().getSimpleName().toLowerCase()
+ + ".operation";
+ _logMessage = object.getCategoryClass().getSimpleName() + "("+object.getName()+") : Operation " + operation;
+ }
+
+ @Override
+ public String getLogHierarchy()
+ {
+ return _hierarchy;
+ }
+
+ @Override
+ public String toString()
+ {
+ return _logMessage;
+ }
+}
Propchange: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/OperationLogMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java Sun Nov 20 16:42:57 2016
@@ -63,41 +63,47 @@ public class AccessControlMessages
}
public static final String ACCESSCONTROL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol";
- public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.open";
- public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.create";
+ public static final String ALLOWED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.allowed";
+ public static final String DENIED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.denied";
public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.delete";
+ public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.create";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.operation";
public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.close";
- public static final String DENIED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.denied";
- public static final String ALLOWED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.allowed";
public static final String LOADED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.loaded";
-
+ public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.open";
static
{
LoggerFactory.getLogger(ACCESSCONTROL_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
- LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(ALLOWED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(DENIED_LOG_HIERARCHY);
LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
- LoggerFactory.getLogger(DENIED_LOG_HIERARCHY);
- LoggerFactory.getLogger(ALLOWED_LOG_HIERARCHY);
LoggerFactory.getLogger(LOADED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.AccessControl_logmessages", _currentLocale);
}
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1012 : Open</pre>
+ * <pre>ACL-1001 : Allowed : {0} {1} {2}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPEN()
+ public static LogMessage ALLOWED(String param1, String param2, String param3)
{
- String rawMessage = _messages.getString("OPEN");
+ String rawMessage = _messages.getString("ALLOWED");
- final String message = rawMessage;
+ final Object[] messageArguments = {param1, param2, param3};
+ // Create a new MessageFormat to ensure thread safety.
+ // Sharing a MessageFormat and using applyPattern is not thread safe
+ MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
+
+ final String message = formatter.format(messageArguments);
return new LogMessage()
{
@@ -108,7 +114,7 @@ public class AccessControlMessages
public String getLogHierarchy()
{
- return OPEN_LOG_HIERARCHY;
+ return ALLOWED_LOG_HIERARCHY;
}
@Override
@@ -141,16 +147,16 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1011 : Create "{0}"</pre>
+ * <pre>ACL-1002 : Denied : {0} {1} {2}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1)
+ public static LogMessage DENIED(String param1, String param2, String param3)
{
- String rawMessage = _messages.getString("CREATE");
+ String rawMessage = _messages.getString("DENIED");
- final Object[] messageArguments = {param1};
+ final Object[] messageArguments = {param1, param2, param3};
// Create a new MessageFormat to ensure thread safety.
// Sharing a MessageFormat and using applyPattern is not thread safe
MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
@@ -166,7 +172,7 @@ public class AccessControlMessages
public String getLogHierarchy()
{
- return CREATE_LOG_HIERARCHY;
+ return DENIED_LOG_HIERARCHY;
}
@Override
@@ -257,16 +263,21 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1013 : Close</pre>
+ * <pre>ACL-1011 : Create "{0}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE()
+ public static LogMessage CREATE(String param1)
{
- String rawMessage = _messages.getString("CLOSE");
+ String rawMessage = _messages.getString("CREATE");
- final String message = rawMessage;
+ final Object[] messageArguments = {param1};
+ // Create a new MessageFormat to ensure thread safety.
+ // Sharing a MessageFormat and using applyPattern is not thread safe
+ MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
+
+ final String message = formatter.format(messageArguments);
return new LogMessage()
{
@@ -277,7 +288,7 @@ public class AccessControlMessages
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return CREATE_LOG_HIERARCHY;
}
@Override
@@ -310,16 +321,16 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1002 : Denied : {0} {1} {2}</pre>
+ * <pre>ACL-1016 : Operation : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DENIED(String param1, String param2, String param3)
+ public static LogMessage OPERATION(String param1)
{
- String rawMessage = _messages.getString("DENIED");
+ String rawMessage = _messages.getString("OPERATION");
- final Object[] messageArguments = {param1, param2, param3};
+ final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
// Sharing a MessageFormat and using applyPattern is not thread safe
MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
@@ -335,7 +346,7 @@ public class AccessControlMessages
public String getLogHierarchy()
{
- return DENIED_LOG_HIERARCHY;
+ return OPERATION_LOG_HIERARCHY;
}
@Override
@@ -368,21 +379,16 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1001 : Allowed : {0} {1} {2}</pre>
+ * <pre>ACL-1013 : Close</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage ALLOWED(String param1, String param2, String param3)
+ public static LogMessage CLOSE()
{
- String rawMessage = _messages.getString("ALLOWED");
-
- final Object[] messageArguments = {param1, param2, param3};
- // Create a new MessageFormat to ensure thread safety.
- // Sharing a MessageFormat and using applyPattern is not thread safe
- MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
+ String rawMessage = _messages.getString("CLOSE");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -393,7 +399,7 @@ public class AccessControlMessages
public String getLogHierarchy()
{
- return ALLOWED_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -426,7 +432,7 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1015 : Rules loaded "{0}"</pre>
+ * <pre>ACL-1015 : Rules loaded : Source "{0}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
@@ -455,6 +461,59 @@ public class AccessControlMessages
}
@Override
+ public boolean equals(final Object o)
+ {
+ if (this == o)
+ {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass())
+ {
+ return false;
+ }
+
+ final LogMessage that = (LogMessage) o;
+
+ return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString());
+
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = toString().hashCode();
+ result = 31 * result + getLogHierarchy().hashCode();
+ return result;
+ }
+ };
+ }
+
+ /**
+ * Log a AccessControl message of the Format:
+ * <pre>ACL-1012 : Open</pre>
+ * Optional values are contained in [square brackets] and are numbered
+ * sequentially in the method call.
+ *
+ */
+ public static LogMessage OPEN()
+ {
+ String rawMessage = _messages.getString("OPEN");
+
+ final String message = rawMessage;
+
+ return new LogMessage()
+ {
+ public String toString()
+ {
+ return message;
+ }
+
+ public String getLogHierarchy()
+ {
+ return OPEN_LOG_HIERARCHY;
+ }
+
+ @Override
public boolean equals(final Object o)
{
if (this == o)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties Sun Nov 20 16:42:57 2016
@@ -30,4 +30,6 @@ OPEN = ACL-1012 : Open
CLOSE = ACL-1013 : Close
DELETE = ACL-1014 : Delete "{0}"
LOADED = ACL-1015 : Rules loaded : Source "{0}"
+# 0 - operation name
+OPERATION = ACL-1016 : Operation : {0}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java Sun Nov 20 16:42:57 2016
@@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.qpid.server.logging.LogMessage;
import java.text.MessageFormat;
@@ -63,32 +63,92 @@ public class AuthenticationProviderMessa
}
public static final String AUTHENTICATIONPROVIDER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider";
- public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.open";
- public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.create";
public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.delete";
public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.close";
+ public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.create";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.operation";
+ public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.open";
static
{
LoggerFactory.getLogger(AUTHENTICATIONPROVIDER_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
- LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.AuthenticationProvider_logmessages", _currentLocale);
}
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1002 : Open</pre>
+ * <pre>ATH-1004 : Delete "{0}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPEN()
+ public static LogMessage DELETE(String param1)
{
- String rawMessage = _messages.getString("OPEN");
+ String rawMessage = _messages.getString("DELETE");
+
+ final Object[] messageArguments = {param1};
+ // Create a new MessageFormat to ensure thread safety.
+ // Sharing a MessageFormat and using applyPattern is not thread safe
+ MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
+
+ final String message = formatter.format(messageArguments);
+
+ return new LogMessage()
+ {
+ public String toString()
+ {
+ return message;
+ }
+
+ public String getLogHierarchy()
+ {
+ return DELETE_LOG_HIERARCHY;
+ }
+
+ @Override
+ public boolean equals(final Object o)
+ {
+ if (this == o)
+ {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass())
+ {
+ return false;
+ }
+
+ final LogMessage that = (LogMessage) o;
+
+ return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString());
+
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = toString().hashCode();
+ result = 31 * result + getLogHierarchy().hashCode();
+ return result;
+ }
+ };
+ }
+
+ /**
+ * Log a AuthenticationProvider message of the Format:
+ * <pre>ATH-1003 : Close</pre>
+ * Optional values are contained in [square brackets] and are numbered
+ * sequentially in the method call.
+ *
+ */
+ public static LogMessage CLOSE()
+ {
+ String rawMessage = _messages.getString("CLOSE");
final String message = rawMessage;
@@ -101,7 +161,7 @@ public class AuthenticationProviderMessa
public String getLogHierarchy()
{
- return OPEN_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -192,14 +252,14 @@ public class AuthenticationProviderMessa
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1004 : Delete "{0}"</pre>
+ * <pre>ATH-1005 : Operation : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1)
+ public static LogMessage OPERATION(String param1)
{
- String rawMessage = _messages.getString("DELETE");
+ String rawMessage = _messages.getString("OPERATION");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -217,7 +277,7 @@ public class AuthenticationProviderMessa
public String getLogHierarchy()
{
- return DELETE_LOG_HIERARCHY;
+ return OPERATION_LOG_HIERARCHY;
}
@Override
@@ -250,14 +310,14 @@ public class AuthenticationProviderMessa
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1003 : Close</pre>
+ * <pre>ATH-1002 : Open</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE()
+ public static LogMessage OPEN()
{
- String rawMessage = _messages.getString("CLOSE");
+ String rawMessage = _messages.getString("OPEN");
final String message = rawMessage;
@@ -270,7 +330,7 @@ public class AuthenticationProviderMessa
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return OPEN_LOG_HIERARCHY;
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties Sun Nov 20 16:42:57 2016
@@ -22,4 +22,6 @@ CREATE = ATH-1001 : Create "{0}"
OPEN = ATH-1002 : Open
CLOSE = ATH-1003 : Close
DELETE = ATH-1004 : Delete "{0}"
+# 0 - operation name
+OPERATION = ATH-1005 : Operation : {0}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java Sun Nov 20 16:42:57 2016
@@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
+import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.qpid.server.logging.LogMessage;
import java.text.MessageFormat;
@@ -65,12 +65,14 @@ public class BindingMessages
public static final String BINDING_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "binding";
public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "binding.created";
public static final String DELETED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "binding.deleted";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "binding.operation";
static
{
LoggerFactory.getLogger(BINDING_LOG_HIERARCHY);
LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
LoggerFactory.getLogger(DELETED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Binding_logmessages", _currentLocale);
}
@@ -182,6 +184,64 @@ public class BindingMessages
}
@Override
+ public boolean equals(final Object o)
+ {
+ if (this == o)
+ {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass())
+ {
+ return false;
+ }
+
+ final LogMessage that = (LogMessage) o;
+
+ return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString());
+
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = toString().hashCode();
+ result = 31 * result + getLogHierarchy().hashCode();
+ return result;
+ }
+ };
+ }
+
+ /**
+ * Log a Binding message of the Format:
+ * <pre>BND-1003 : Operation : {0}</pre>
+ * Optional values are contained in [square brackets] and are numbered
+ * sequentially in the method call.
+ *
+ */
+ public static LogMessage OPERATION(String param1)
+ {
+ String rawMessage = _messages.getString("OPERATION");
+
+ final Object[] messageArguments = {param1};
+ // Create a new MessageFormat to ensure thread safety.
+ // Sharing a MessageFormat and using applyPattern is not thread safe
+ MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
+
+ final String message = formatter.format(messageArguments);
+
+ return new LogMessage()
+ {
+ public String toString()
+ {
+ return message;
+ }
+
+ public String getLogHierarchy()
+ {
+ return OPERATION_LOG_HIERARCHY;
+ }
+
+ @Override
public boolean equals(final Object o)
{
if (this == o)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Binding_logmessages.properties Sun Nov 20 16:42:57 2016
@@ -20,3 +20,5 @@
#
CREATED = BND-1001 : Create[ : Arguments : {0}]
DELETED = BND-1002 : Deleted
+# 0 - operation name
+OPERATION = BND-1003 : Operation : {0}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java Sun Nov 20 16:42:57 2016
@@ -22,14 +22,14 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
-import org.slf4j.LoggerFactory;
-
-import org.apache.qpid.server.logging.LogMessage;
-
import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.logging.LogMessage;
+
/**
* DO NOT EDIT DIRECTLY, THIS FILE WAS GENERATED.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org