[qpid-java] 02/09: Updated version 6.1.4 from 'upstream/6.1.4'

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Thu Dec 21 23:23:45 UTC 2017


This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository qpid-java.

commit 30c008a662cef3f9fd1c336e1f604715ee54bc9a
Merge: 5f4016e 55a0474
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Fri Sep 29 23:52:33 2017 +0100

    Updated version 6.1.4 from 'upstream/6.1.4'
    
    with Debian dir e3c0f21934f532233263f2dee5def8ab8b773b4c

 DEPENDENCIES                                       |    2 +-
 NOTICE                                             |    2 +-
 bdbstore/bin/backup.sh                             |   41 -
 bdbstore/jmx/pom.xml                               |   85 -
 .../jmx/BDBHAMessageStoreManagerMBean.java         |  253 ---
 .../jmx/BDBHAMessageStoreManagerMBeanProvider.java |   70 -
 .../berkeleydb/jmx/ManagedBDBHAMessageStore.java   |   85 -
 .../org.apache.qpid.server.jmx.MBeanProvider       |   19 -
 .../jmx/BDBHAMessageStoreManagerMBeanTest.java     |  224 --
 bdbstore/pom.xml                                   |   33 +-
 .../main/java/org/apache/qpid/server/JECheck.java  |   37 +
 .../store/berkeleydb/AbstractBDBMessageStore.java  |  307 +--
 .../berkeleydb/AbstractBDBPreferenceStore.java     |  381 ++++
 .../store/berkeleydb/BDBCacheSizeSetter.java       |    2 +-
 .../store/berkeleydb/BDBConfigurationStore.java    |  272 ++-
 .../store/berkeleydb/BDBEnvironmentContainer.java  |   18 +-
 .../server/store/berkeleydb/BDBMessageStore.java   |    2 +-
 .../store/berkeleydb/BDBPreferenceStore.java       |  144 ++
 .../BDBPreferenceStoreFactoryService.java          |   57 +
 .../server/store/berkeleydb/BDBSystemConfig.java   |    8 +-
 .../store/berkeleydb/BDBSystemConfigImpl.java      |   11 +-
 .../qpid/server/store/berkeleydb/BDBUtils.java     |   16 -
 .../server/store/berkeleydb/EnvHomeRegistry.java   |    2 +-
 .../server/store/berkeleydb/EnvironmentUtils.java  |    5 -
 .../berkeleydb/StandardEnvironmentFacade.java      |   15 +
 .../replication/ReplicatedEnvironmentFacade.java   |  141 +-
 .../server/store/berkeleydb/tuple/MapBinding.java  |   75 +
 .../berkeleydb/tuple/MessageMetaDataBinding.java   |   23 +-
 .../tuple/PreparedTransactionBinding.java          |   46 +-
 .../store/berkeleydb/tuple/QueueEntryBinding.java  |   50 +-
 .../store/berkeleydb/upgrade/UpgradeFrom4To5.java  |   17 +-
 .../store/berkeleydb/upgrade/UpgradeFrom8To9.java  |   93 +
 .../berkeleydb/BDBHAReplicaVirtualHost.java        |    7 +-
 .../berkeleydb/BDBHAReplicaVirtualHostImpl.java    |  194 +-
 .../virtualhost/berkeleydb/BDBHAVirtualHost.java   |   12 +-
 .../berkeleydb/BDBHAVirtualHostImpl.java           |    2 +-
 .../virtualhost/berkeleydb/BDBVirtualHost.java     |   10 +-
 .../virtualhost/berkeleydb/BDBVirtualHostImpl.java |    6 +-
 .../berkeleydb/BDBHARemoteReplicationNode.java     |    4 +-
 .../berkeleydb/BDBHARemoteReplicationNodeImpl.java |    9 +-
 .../berkeleydb/BDBHAVirtualHostNode.java           |    5 +-
 .../berkeleydb/BDBHAVirtualHostNodeImpl.java       |  135 +-
 .../berkeleydb/BDBVirtualHostNode.java             |   11 +-
 .../berkeleydb/BDBVirtualHostNodeImpl.java         |   13 +-
 .../js/qpid/management/virtualhost/bdb/add.js      |   21 +-
 .../js/qpid/management/virtualhost/bdb/edit.js     |   31 +-
 .../js/qpid/management/virtualhost/bdb/show.js     |   11 +-
 .../js/qpid/management/virtualhost/bdb_ha/add.js   |   10 +-
 .../js/qpid/management/virtualhost/bdb_ha/edit.js  |   31 +-
 .../js/qpid/management/virtualhost/bdb_ha/show.js  |   33 +-
 .../management/virtualhost/bdb_ha_replica/show.js  |   31 +
 .../js/qpid/management/virtualhostnode/bdb/add.js  |   10 +-
 .../js/qpid/management/virtualhostnode/bdb/edit.js |   28 +-
 .../js/qpid/management/virtualhostnode/bdb/show.js |   15 +-
 .../qpid/management/virtualhostnode/bdb_ha/add.js  |  100 +-
 .../bdb_ha/add/existinggroup/add.js                |   31 +-
 .../virtualhostnode/bdb_ha/add/newgroup/add.js     |  256 ++-
 .../qpid/management/virtualhostnode/bdb_ha/edit.js |  328 +--
 .../qpid/management/virtualhostnode/bdb_ha/show.js |  292 +--
 .../store/berkeleydb/BDBHAVirtualHostNodeTest.java |   45 +-
 .../store/berkeleydb/BDBMessageStoreTest.java      |    4 +-
 .../store/berkeleydb/BDBPreferenceStoreTest.java   |  211 ++
 .../berkeleydb/BDBStoreUpgradeTestPreparer.java    |   57 +-
 .../berkeleydb/StandardEnvironmentFacadeTest.java  |    3 +-
 .../ReplicatedEnvironmentFacadeTest.java           |   28 +-
 .../berkeleydb/upgrade/UpgradeFrom7To8Test.java    |    4 +-
 .../berkeleydb/upgrade/UpgradeFrom8To9Test.java    |   73 +
 .../store/berkeleydb/upgrade/UpgraderTest.java     |    1 -
 .../berkeleydb/BDBVirtualHostImplTest.java         |    2 +-
 .../berkeleydb/BDBHARemoteReplicationNodeTest.java |   45 +-
 .../berkeleydb/BDBHAVirtualHostNodeTestHelper.java |   29 +-
 .../berkeleydb/BDBVirtualHostNodeTest.java         |    2 +-
 .../upgrade/bdbstore-v8/test-store/00000000.jdb    |  Bin 0 -> 5702 bytes
 bdbstore/systests/pom.xml                          |   10 +-
 .../server/store/berkeleydb/BDBBackupTest.java     |   60 +-
 .../server/store/berkeleydb/BDBUpgradeTest.java    |  326 ++-
 .../replication/BDBHAVirtualHostNodeRestTest.java  |   11 +-
 .../replication/BDBHAVirtualHostRestTest.java      |   10 +-
 .../store/berkeleydb/replication/GroupCreator.java |  191 +-
 .../berkeleydb/replication/JMXManagementTest.java  |  320 ---
 .../berkeleydb/replication/MultiNodeTest.java      |  341 ++-
 .../store/berkeleydb/replication/TwoNodeTest.java  |    9 +-
 broker-codegen/pom.xml                             |    4 +-
 .../model/ConfiguredObjectFactoryGenerator.java    |  417 +++-
 .../model/ManagedObjectFactoryConstructor.java     |    2 +
 .../server/model/SystemConfigFactoryGenerator.java |    4 +-
 .../validation/AttributeAnnotationValidator.java   |  169 +-
 broker-core/pom.xml                                |   43 +-
 .../main/java/org/apache/qpid/server/Broker.java   |  247 ---
 .../java/org/apache/qpid/server/BrokerOptions.java |   77 +-
 .../org/apache/qpid/server/BrokerPrincipal.java    |   65 +
 .../qpid/server/TransactionTimeoutHelper.java      |  109 -
 .../apache/qpid/server/binding/BindingFactory.java |    6 +-
 .../apache/qpid/server/binding/BindingImpl.java    |   36 +-
 .../server/configuration/BrokerProperties.java     |    3 -
 .../store/ManagementModeStoreHandler.java          |  357 ++-
 .../store/StoreConfigurationChangeListener.java    |   25 +-
 .../server/configuration/updater/TaskExecutor.java |    5 +-
 .../configuration/updater/TaskExecutorImpl.java    |   82 +-
 .../server/connection/ConnectionPrincipal.java     |    6 -
 .../connection/ConnectionVersionValidator.java     |    6 +-
 .../server/consumer/AbstractConsumerTarget.java    |  152 +-
 .../apache/qpid/server/consumer/ConsumerImpl.java  |    4 +
 .../qpid/server/consumer/ConsumerTarget.java       |   10 +-
 .../qpid/server/exchange/AbstractExchange.java     |  228 +-
 .../qpid/server/exchange/DefaultDestination.java   |   93 +-
 .../qpid/server/exchange/DirectExchange.java       |   40 +-
 .../apache/qpid/server/exchange/ExchangeImpl.java  |  112 -
 .../qpid/server/exchange/FanoutExchange.java       |   68 +-
 .../qpid/server/exchange/HeadersBinding.java       |   12 +-
 .../qpid/server/exchange/HeadersExchange.java      |   37 +-
 .../apache/qpid/server/exchange/TopicExchange.java |   38 +-
 .../server/exchange/topic/TopicExchangeResult.java |   42 +-
 .../apache/qpid/server/filter/FilterSupport.java   |    4 +-
 .../qpid/server/filter/JMSSelectorFilter.java      |    6 +-
 .../server/flow/AbstractFlowCreditManager.java     |    4 +-
 .../qpid/server/logging/AbstractBrokerLogger.java  |   61 -
 .../apache/qpid/server/logging/AbstractLogger.java |  186 --
 .../qpid/server/logging/AbstractMessageLogger.java |    8 +-
 .../AbstractNameAndLevelLogInclusionRule.java      |  107 -
 .../server/logging/AbstractVirtualHostLogger.java  |   54 -
 .../apache/qpid/server/logging/AppenderUtils.java  |  198 --
 .../qpid/server/logging/BrokerConsoleLogger.java   |   43 -
 .../server/logging/BrokerConsoleLoggerImpl.java    |   95 -
 .../qpid/server/logging/BrokerFileLogger.java      |   79 -
 .../qpid/server/logging/BrokerFileLoggerImpl.java  |  265 ---
 .../server/logging/BrokerLogbackSocketLogger.java  |   55 -
 .../logging/BrokerLogbackSocketLoggerImpl.java     |  132 --
 .../qpid/server/logging/BrokerMemoryLogger.java    |   50 -
 .../server/logging/BrokerMemoryLoggerImpl.java     |  121 -
 .../BrokerNameAndLevelLogInclusionRule.java        |   40 -
 .../BrokerNameAndLevelLogInclusionRuleImpl.java    |   55 -
 .../qpid/server/logging/BrokerSyslogLogger.java    |   47 -
 .../server/logging/BrokerSyslogLoggerImpl.java     |   94 -
 .../qpid/server/logging/CompositeFilter.java       |  103 -
 .../qpid/server/logging/EffectiveLevelFilter.java  |   31 -
 .../qpid/server/logging/FileLoggerSettings.java    |   46 -
 .../qpid/server/logging/LogInclusionRule.java      |    5 -
 .../org/apache/qpid/server/logging/LogRecord.java  |   67 -
 .../apache/qpid/server/logging/LogRecorder.java    |   42 -
 .../server/logging/LoggerNameAndLevelFilter.java   |  115 -
 .../apache/qpid/server/logging/PathContent.java    |    5 +
 .../server/logging/PrincipalLogEventFilter.java    |   64 -
 .../qpid/server/logging/QpidLoggerTurboFilter.java |  207 --
 .../qpid/server/logging/RecordEventAppender.java   |   67 -
 .../qpid/server/logging/StartupAppender.java       |  103 -
 .../qpid/server/logging/VirtualHostFileLogger.java |   74 -
 .../server/logging/VirtualHostFileLoggerImpl.java  |  202 --
 .../VirtualHostLogEventExcludingFilter.java        |   85 -
 .../VirtualHostNameAndLevelLogInclusionRule.java   |   39 -
 ...irtualHostNameAndLevelLogInclusionRuleImpl.java |   55 -
 .../server/logging/VirtualHostSyslogLogger.java    |   46 -
 .../logging/VirtualHostSyslogLoggerImpl.java       |   94 -
 .../apache/qpid/server/logging/ZippedContent.java  |    6 +
 .../logging/messages/AccessControlMessages.java    |   62 +-
 .../messages/AccessControl_logmessages.properties  |    1 +
 .../messages/AuthenticationProviderMessages.java   |    1 -
 .../server/logging/messages/BindingMessages.java   |    1 -
 .../server/logging/messages/BrokerMessages.java    |  121 -
 .../logging/messages/Broker_logmessages.properties |    7 +-
 .../server/logging/messages/ChannelMessages.java   |    1 -
 .../logging/messages/ConfigStoreMessages.java      |    1 -
 .../logging/messages/ConnectionMessages.java       |    1 -
 .../server/logging/messages/ExchangeMessages.java  |    1 -
 .../logging/messages/HighAvailabilityMessages.java |    1 -
 .../server/logging/messages/KeyStoreMessages.java  |   61 +-
 .../messages/KeyStore_logmessages.properties       |    1 +
 .../messages/ManagementConsoleMessages.java        |    1 -
 .../logging/messages/MessageStoreMessages.java     |   54 -
 .../messages/MessageStore_logmessages.properties   |    1 -
 .../qpid/server/logging/messages/PortMessages.java |    1 -
 .../server/logging/messages/QueueMessages.java     |  120 -
 .../logging/messages/Queue_logmessages.properties  |    6 +-
 .../logging/messages/SubscriptionMessages.java     |    1 -
 .../logging/messages/TransactionLogMessages.java   |    1 -
 .../logging/messages/TrustStoreMessages.java       |    1 -
 .../logging/messages/VirtualHostMessages.java      |  120 +-
 .../messages/VirtualHost_logmessages.properties    |    2 +
 .../server/logging/subjects/BindingLogSubject.java |   12 +-
 .../server/logging/subjects/ChannelLogSubject.java |    2 +-
 .../logging/subjects/ConnectionLogSubject.java     |    4 +-
 .../logging/subjects/ExchangeLogSubject.java       |    6 +-
 .../server/logging/subjects/QueueLogSubject.java   |    4 +-
 .../server/message/AbstractServerMessageImpl.java  |   32 +-
 .../qpid/server/message/MessageContentSource.java  |    4 +-
 .../qpid/server/message/MessageDestination.java    |   11 +-
 .../apache/qpid/server/message/MessageInfo.java    |    8 +-
 .../qpid/server/message/MessageInfoImpl.java       |   50 +-
 .../qpid/server/message/MessageInstance.java       |   92 +-
 .../qpid/server/message/MessageReference.java      |    7 +-
 .../apache/qpid/server/message/MessageSource.java  |   12 +-
 .../apache/qpid/server/message/ServerMessage.java  |    3 -
 .../server/message/internal/InternalMessage.java   |   26 +-
 .../message/internal/InternalMessageMetaData.java  |   13 +-
 .../internal/InternalMessageMetaDataType.java      |    1 -
 .../server/model/AbstractConfiguredObject.java     |  970 ++++++--
 .../model/AbstractConfiguredObjectTypeFactory.java |   11 +-
 .../qpid/server/model/AbstractContainer.java       |  515 +++++
 .../qpid/server/model/AbstractSystemConfig.java    |  296 ++-
 .../server/model/AbstractUnresolvedObject.java     |    6 +-
 .../qpid/server/model/AccessControlProvider.java   |    9 +-
 .../qpid/server/model/AccessControlSource.java     |   28 +
 .../qpid/server/model/AttributeValueConverter.java |  161 +-
 .../qpid/server/model/AuthenticationProvider.java  |   17 -
 .../java/org/apache/qpid/server/model/Binding.java |    3 +
 .../java/org/apache/qpid/server/model/Broker.java  |  112 +-
 .../qpid/server/model/BrokerAttributeInjector.java |   97 +-
 .../qpid/server/model/BrokerContainerType.java     |   53 +
 .../org/apache/qpid/server/model/BrokerImpl.java   | 1163 ++++++++++
 .../org/apache/qpid/server/model/BrokerModel.java  |   10 +-
 .../server/model/CommonAccessControlProvider.java  |   54 +
 .../qpid/server/model/ConfigurationExtractor.java  |  300 +++
 .../model/ConfigurationSecretEncrypterSource.java  |   28 +
 .../server/model/ConfiguredAutomatedAttribute.java |   55 +
 .../apache/qpid/server/model/ConfiguredObject.java |   54 +-
 .../server/model/ConfiguredObjectAttribute.java    |    1 -
 .../ConfiguredObjectAttributeOrStatistic.java      |    2 +-
 .../server/model/ConfiguredObjectFactoryImpl.java  |    5 +-
 ...nfiguredObjectInjectedAttributeOrStatistic.java |   28 -
 .../model/ConfiguredObjectInjectedOperation.java   |  110 +-
 .../model/ConfiguredObjectJacksonModule.java       |   35 +
 .../model/ConfiguredObjectMethodAttribute.java     |   20 -
 ...ConfiguredObjectMethodAttributeOrStatistic.java |   10 -
 .../model/ConfiguredObjectMethodOperation.java     |  104 +-
 .../model/ConfiguredObjectMethodStatistic.java     |    7 +-
 .../server/model/ConfiguredObjectOperation.java    |    2 +
 .../server/model/ConfiguredObjectStatistic.java    |    2 +-
 .../server/model/ConfiguredObjectTypeRegistry.java |  468 ++--
 .../server/model/ConfiguredSettableAttribute.java  |    8 +
 .../model/ConfiguredSettableInjectedAttribute.java |   81 +-
 .../org/apache/qpid/server/model/Connection.java   |   16 +-
 .../org/apache/qpid/server/model/Consumer.java     |   21 +-
 .../org/apache/qpid/server/model/Container.java    |   36 +
 .../model/ContainerStoreUpgraderAndRecoverer.java  |   30 +
 .../apache/qpid/server/model/ContainerType.java    |   31 +
 .../java/org/apache/qpid/server/model/Content.java |    2 +
 .../apache/qpid/server/model/ContextProvider.java  |   33 +
 .../org/apache/qpid/server/model/DynamicModel.java |   26 +
 .../org/apache/qpid/server/model/Exchange.java     |   79 +-
 .../ExternalFileBasedAuthenticationManager.java    |    2 +-
 .../java/org/apache/qpid/server/model/Group.java   |    2 -
 .../org/apache/qpid/server/model/GroupMember.java  |    3 -
 .../apache/qpid/server/model/Initialization.java   |   28 +
 .../qpid/server/model/JsonSystemConfigImpl.java    |    6 +-
 .../org/apache/qpid/server/model/KeyStore.java     |   13 +-
 .../qpid/server/model/ManageableMessage.java       |   56 +
 .../apache/qpid/server/model/ManagedAttribute.java |    4 +
 .../qpid/server/model/ManagedContextDefault.java   |    1 +
 .../server/model/ManagedContextDependency.java     |   32 +
 .../apache/qpid/server/model/ManagedOperation.java |    3 +
 .../java/org/apache/qpid/server/model/Model.java   |   33 +-
 .../org/apache/qpid/server/model/ModelVersion.java |   72 +
 .../java/org/apache/qpid/server/model/Named.java   |   26 +
 .../qpid/server/model/NamedAddressSpace.java       |   71 +
 .../server/model/NoFactoryForTypeException.java    |    4 +-
 .../server/model/OperationTimeoutException.java    |   38 +
 .../qpid/server/model/PermissionedObject.java      |   28 +
 .../java/org/apache/qpid/server/model/Port.java    |    5 +-
 .../qpid/server/model/PreferencesProvider.java     |   64 -
 ...referencesSupportingAuthenticationProvider.java |   36 -
 .../org/apache/qpid/server/model/Protocol.java     |    6 +-
 .../java/org/apache/qpid/server/model/Queue.java   |  171 +-
 .../java/org/apache/qpid/server/model/Session.java |   23 +-
 .../qpid/server/model/SystemAddressSpaceAlias.java |   39 +
 .../org/apache/qpid/server/model/SystemConfig.java |   31 +-
 .../server/model/SystemConfigBootstrapModel.java   |  111 +
 .../qpid/server/model/SystemPrincipalSource.java   |   28 +
 .../qpid/server/model/TaskExecutorProvider.java    |   28 +
 .../org/apache/qpid/server/model/TrustStore.java   |   13 +-
 .../apache/qpid/server/model/UUIDGenerator.java    |    4 -
 .../java/org/apache/qpid/server/model/User.java    |   13 +-
 .../org/apache/qpid/server/model/VirtualHost.java  |  133 +-
 .../model/VirtualHostAccessControlProvider.java    |   28 +
 .../apache/qpid/server/model/VirtualHostAlias.java |    3 +-
 .../server/model/VirtualHostLogInclusionRule.java  |    3 +-
 .../apache/qpid/server/model/VirtualHostNode.java  |   10 +-
 .../model/adapter/AbstractPluginAdapter.java       |    1 -
 .../qpid/server/model/adapter/BrokerAdapter.java   | 1232 -----------
 .../model/adapter/FileBasedGroupProvider.java      |    2 +-
 .../model/adapter/FileBasedGroupProviderImpl.java  |  101 +-
 .../adapter/FileSystemPreferencesProvider.java     |   35 -
 .../adapter/FileSystemPreferencesProviderImpl.java |  579 -----
 .../qpid/server/model/adapter/SessionAdapter.java  |  152 +-
 ...tractClientAuthCapablePortWithAuthProvider.java |    4 +-
 .../qpid/server/model/port/AbstractPort.java       |   55 +-
 .../model/port/AbstractPortWithAuthProvider.java   |   15 +-
 .../apache/qpid/server/model/port/AmqpPort.java    |   18 +-
 .../qpid/server/model/port/AmqpPortImpl.java       |  137 +-
 .../apache/qpid/server/model/port/HttpPort.java    |    6 +-
 .../qpid/server/model/port/HttpPortImpl.java       |   23 +-
 .../org/apache/qpid/server/model/port/JmxPort.java |   45 -
 .../apache/qpid/server/model/port/JmxPortImpl.java |   65 -
 .../apache/qpid/server/model/port/PortFactory.java |    4 +-
 .../org/apache/qpid/server/model/port/RmiPort.java |   46 -
 .../apache/qpid/server/model/port/RmiPortImpl.java |   65 -
 .../model/preferences/GenericPreferenceValue.java  |   40 +
 .../preferences/GenericPreferenceValueFactory.java |   41 +
 .../server/model/preferences/GenericPrincipal.java |  196 ++
 .../qpid/server/model/preferences/Preference.java  |   65 +
 .../model/preferences/PreferenceFactory.java       |  204 ++
 .../server/model/preferences/PreferenceImpl.java   |  160 ++
 .../server/model/preferences/PreferenceValue.java  |   27 +
 .../preferences/PreferenceValueFactoryService.java |   29 +
 .../server/model/preferences/UserPreferences.java  |   44 +
 .../model/preferences/UserPreferencesImpl.java     |  682 ++++++
 .../qpid/server/plugin/ConnectionValidator.java    |    2 +-
 .../qpid/server/plugin/MessageConverter.java       |    4 +-
 .../qpid/server/plugin/ProtocolEngineCreator.java  |    2 +-
 .../server/plugin/SystemAddressSpaceCreator.java   |   41 +
 .../qpid/server/plugin/SystemConfigFactory.java    |    8 +-
 .../qpid/server/plugin/SystemNodeCreator.java      |    7 +-
 .../QpidByteBufferDisposingThreadPoolExecutor.java |   81 +
 .../qpid/server/protocol/AMQSessionModel.java      |   37 +-
 .../apache/qpid/server/protocol/LinkRegistry.java  |   57 +-
 .../qpid/server/protocol/LinkRegistryImpl.java     |   84 +
 .../server/protocol/PublishAuthorisationCache.java |  110 +
 .../org/apache/qpid/server/queue/AMQQueue.java     |  121 -
 .../apache/qpid/server/queue/AbstractQueue.java    |  750 ++++---
 .../org/apache/qpid/server/queue/ConsumerNode.java |  110 +
 .../qpid/server/queue/ConsumerNodeIterator.java    |   43 +
 .../queue/DefinedGroupMessageGroupManager.java     |   32 +-
 .../apache/qpid/server/queue/LastValueQueue.java   |    3 +-
 .../qpid/server/queue/LastValueQueueImpl.java      |    4 +-
 .../server/queue/MessageContentJsonConverter.java  |  209 ++
 .../qpid/server/queue/NotificationCheck.java       |   29 +-
 .../qpid/server/queue/OrderedQueueEntryList.java   |    7 +-
 .../apache/qpid/server/queue/OutOfOrderQueue.java  |    6 +-
 .../apache/qpid/server/queue/PriorityQueue.java    |    3 +-
 .../qpid/server/queue/PriorityQueueImpl.java       |    4 +-
 .../qpid/server/queue/QueueArgumentsConverter.java |   10 +-
 .../apache/qpid/server/queue/QueueConsumer.java    |   13 +-
 .../qpid/server/queue/QueueConsumerImpl.java       |  150 +-
 .../qpid/server/queue/QueueConsumerList.java       |  110 -
 .../org/apache/qpid/server/queue/QueueEntry.java   |    3 +-
 .../apache/qpid/server/queue/QueueEntryImpl.java   |  113 +-
 .../apache/qpid/server/queue/QueueEntryList.java   |    3 +-
 .../qpid/server/queue/QueueEntryTransaction.java   |    1 +
 .../org/apache/qpid/server/queue/QueueRunner.java  |    1 -
 .../org/apache/qpid/server/queue/SortedQueue.java  |    3 +-
 .../apache/qpid/server/queue/SortedQueueImpl.java  |    4 +-
 .../apache/qpid/server/queue/StandardQueue.java    |    3 +-
 .../qpid/server/queue/StandardQueueImpl.java       |    4 +-
 .../qpid/server/security/AbstractKeyStore.java     |  234 ++
 .../apache/qpid/server/security/AccessControl.java |   99 +-
 .../security/AllowAllAccessControlProvider.java    |   33 +
 .../AllowAllAccessControlProviderImpl.java         |  102 +
 .../security/AutoGeneratedSelfSignedKeyStore.java  |   15 +-
 .../AutoGeneratedSelfSignedKeyStoreImpl.java       |   18 +-
 .../qpid/server/security/CertificateDetails.java   |    4 +-
 .../server/security/CompoundAccessControl.java     |  108 +
 .../server/security/CompoundSecurityToken.java     |  120 +
 .../qpid/server/security/FileKeyStoreImpl.java     |   84 +-
 .../qpid/server/security/FileTrustStoreImpl.java   |   16 +-
 .../security/ManagedPeerCertificateTrustStore.java |    6 +-
 .../ManagedPeerCertificateTrustStoreImpl.java      |  182 +-
 .../qpid/server/security/NonJavaKeyStore.java      |    6 +-
 .../qpid/server/security/NonJavaKeyStoreImpl.java  |   83 +-
 .../server/security/NonJavaTrustStoreImpl.java     |   19 +-
 .../apache/qpid/server/security/QpidPrincipal.java |   30 +
 .../org/apache/qpid/server/security/Result.java    |   25 +-
 .../qpid/server/security/SecurityManager.java      |  812 -------
 .../apache/qpid/server/security/SecurityToken.java |   25 +
 .../server/security/SiteSpecificTrustStore.java    |    9 +-
 .../security/SiteSpecificTrustStoreImpl.java       |   78 +-
 .../qpid/server/security/SubjectCreator.java       |   11 -
 .../security/SubjectFixedResultAccessControl.java  |  101 +
 .../server/security/TrustStoreMessageSource.java   |    8 +-
 .../security/TrustStoreMessageSourceCreator.java   |   13 +-
 .../access/AbstractAccessControlProvider.java      |  102 +
 .../access/FileAccessControlProviderConstants.java |   27 -
 .../server/security/access/ObjectProperties.java   |  253 ---
 .../qpid/server/security/access/ObjectType.java    |  109 -
 .../qpid/server/security/access/Operation.java     |  153 +-
 .../security/access/OperationLoggingDetails.java   |   89 -
 .../qpid/server/security/access/OperationType.java |   32 +
 .../qpid/server/security/access/Permission.java    |   45 -
 .../security/auth/AuthenticatedPrincipal.java      |   49 +-
 .../server/security/auth/UsernamePrincipal.java    |   53 +-
 .../AbstractPasswordFilePrincipalDatabase.java     |   33 +-
 .../Base64MD5PasswordFilePrincipalDatabase.java    |   29 +-
 .../server/security/auth/database/HashedUser.java  |   12 +-
 .../PlainPasswordFilePrincipalDatabase.java        |    5 +-
 .../server/security/auth/database/PlainUser.java   |   10 +-
 .../security/auth/database/PrincipalDatabase.java  |    4 +
 .../security/auth/jmx/JMXConnectionPrincipal.java  |   82 -
 .../auth/jmx/JMXPasswordAuthenticator.java         |  145 --
 .../manager/AbstractAuthenticationManager.java     |  171 +-
 .../AbstractScramAuthenticationManager.java        |   13 +-
 .../manager/AnonymousAuthenticationManager.java    |   31 +-
 .../auth/manager/AuthenticationResultCacher.java   |  142 ++
 ...64MD5PasswordDatabaseAuthenticationManager.java |    2 +-
 .../manager/CachingAuthenticationProvider.java     |   44 +
 ...odelPasswordManagingAuthenticationProvider.java |   24 +-
 .../manager/ExternalAuthenticationManager.java     |    3 +-
 .../manager/ExternalAuthenticationManagerImpl.java |    9 +-
 .../manager/KerberosAuthenticationManager.java     |   11 +-
 .../auth/manager/MD5AuthenticationProvider.java    |    5 +-
 .../server/security/auth/manager/ManagedUser.java  |   60 +-
 .../auth/manager/PlainAuthenticationProvider.java  |   14 +-
 .../PrincipalDatabaseAuthenticationManager.java    |  147 +-
 .../manager/ScramSHA1AuthenticationManager.java    |    1 -
 .../manager/ScramSHA256AuthenticationManager.java  |    1 -
 .../auth/manager/SimpleAuthenticationManager.java  |   74 +-
 .../manager/SimpleLDAPAuthenticationManager.java   |   42 +-
 .../SimpleLDAPAuthenticationManagerImpl.java       |  361 ++-
 .../oauth2/OAuth2AuthenticationProvider.java       |   13 +-
 .../oauth2/OAuth2AuthenticationProviderImpl.java   |   56 +-
 .../auth/manager/oauth2/OAuth2UserPrincipal.java   |   16 +-
 .../CloudFoundryOAuth2IdentityResolverService.java |    2 +-
 .../facebook/FacebookIdentityResolverService.java  |    2 +-
 .../GitHubOAuth2IdentityResolverService.java       |    2 +-
 .../GoogleOAuth2IdentityResolverService.java       |    2 +-
 ...MicrosoftLiveOAuth2IdentityResolverService.java |    2 +-
 .../auth/sasl/UsernamePasswordInitialiser.java     |    2 +-
 .../auth/sasl/anonymous/AnonymousSaslServer.java   |    2 +-
 .../auth/sasl/crammd5/CRAMMD5HexInitialiser.java   |    7 +
 .../auth/sasl/external/ExternalSaslServer.java     |    7 +-
 .../auth/sasl/plain/PlainAdapterSaslServer.java    |    1 -
 .../security/auth/sasl/plain/PlainSaslServer.java  |   31 +-
 .../security/auth/sasl/scram/ScramSaslServer.java  |    6 +-
 .../security/encryption/AESKeyFileEncrypter.java   |    6 +-
 .../encryption/AESKeyFileEncrypterFactory.java     |    2 +-
 .../qpid/server/security/group/GroupImpl.java      |   16 -
 .../qpid/server/security/group/GroupManager.java   |   48 -
 .../server/security/group/GroupMemberImpl.java     |   19 +-
 .../qpid/server/security/group/GroupPrincipal.java |   66 +-
 .../server/security/group/GroupProviderImpl.java   |   11 +-
 ...oudFoundryDashboardManagementGroupProvider.java |    6 +-
 ...oundryDashboardManagementGroupProviderImpl.java |   68 +-
 .../qpid/server/stats/StatisticsCounter.java       |  146 +-
 .../qpid/server/stats/StatisticsGatherer.java      |    2 +-
 .../store/AbstractJDBCConfigurationStore.java      |  387 ++--
 .../server/store/AbstractJDBCMessageStore.java     |  398 ++--
 .../qpid/server/store/AbstractJsonFileStore.java   |  277 +++
 .../qpid/server/store/AbstractMemoryStore.java     |   75 +-
 .../store/BrokerStoreUpgraderAndRecoverer.java     |  154 +-
 .../store/ConfiguredObjectRecordConverter.java     |   60 +-
 .../server/store/DurableConfigurationStore.java    |   12 +-
 .../apache/qpid/server/store/GenericRecoverer.java |   17 +-
 .../qpid/server/store/GenericStoreUpgrader.java    |   38 +-
 .../qpid/server/store/JsonFileConfigStore.java     |  475 ++--
 .../qpid/server/store/MemoryMessageStore.java      |   12 +-
 .../apache/qpid/server/store/MessageHandle.java    |    2 -
 .../org/apache/qpid/server/store/MessageStore.java |    2 +
 .../apache/qpid/server/store/NullMessageStore.java |   31 +-
 .../apache/qpid/server/store/ResolvedObject.java   |   70 -
 .../qpid/server/store/StorableMessageMetaData.java |    5 -
 .../qpid/server/store/StoredMemoryMessage.java     |  124 +-
 .../apache/qpid/server/store/StoredMessage.java    |    4 +-
 .../VirtualHostStoreUpgraderAndRecoverer.java      |   80 +-
 .../handler/ConfiguredObjectRecordHandler.java     |    7 +-
 .../preferences/AbstractJDBCPreferenceStore.java   |  448 ++++
 .../store/preferences/JsonFilePreferenceStore.java |  272 +++
 .../JsonFilePreferenceStoreFactoryService.java     |   54 +
 .../NoopPreferenceStoreFactoryService.java         |   81 +
 .../server/store/preferences/PreferenceRecord.java |   29 +
 .../store/preferences/PreferenceRecordImpl.java    |   55 +
 .../server/store/preferences/PreferenceStore.java  |   38 +
 .../preferences/PreferenceStoreAttributes.java     |   32 +
 .../preferences/PreferenceStoreAttributesImpl.java |   40 +
 .../preferences/PreferenceStoreFactoryService.java |   31 +
 .../store/preferences/PreferenceStoreProvider.java |   25 +
 .../store/preferences/PreferenceStoreUpdater.java  |   28 +
 .../preferences/PreferenceStoreUpdaterImpl.java    |   40 +
 .../store/preferences/PreferencesRecoverer.java    |  186 ++
 .../server/store/preferences/PreferencesRoot.java  |   25 +
 .../ProvidedPreferenceStoreFactoryService.java     |   53 +
 .../store/preferences/UserPreferencesCreator.java  |   29 +
 .../store/serializer/MessageStoreSerializer.java   |   49 +
 .../serializer/MessageStoreSerializerFactory.java  |   71 +
 .../qpid/server/store/serializer/v1/DTXRecord.java |  227 ++
 .../server/store/serializer/v1/Deserializer.java   |  140 ++
 .../store/serializer/v1/MessageInstanceRecord.java |   75 +
 .../server/store/serializer/v1/MessageRecord.java  |  109 +
 .../serializer/v1/MessageStoreSerializer_v1.java   |  426 ++++
 .../store/serializer/v1/QueueMappingRecord.java    |   72 +
 .../qpid/server/store/serializer/v1/Record.java    |   30 +
 .../server/store/serializer/v1/RecordType.java     |   78 +
 .../server/store/serializer/v1/Serializer.java     |  107 +
 .../server/store/serializer/v1/VersionRecord.java  |   56 +
 .../qpid/server/transport/AMQPConnection.java      |   21 +-
 .../server/transport/AbstractAMQPConnection.java   |  267 ++-
 .../qpid/server/transport/AggregateTicker.java     |  100 +
 .../transport/MultiVersionProtocolEngine.java      |    7 +-
 .../transport/NetworkConnectionScheduler.java      |   18 +-
 .../server/transport/NonBlockingConnection.java    |   25 +-
 .../transport/NonBlockingConnectionDelegate.java   |    1 -
 .../NonBlockingConnectionTLSDelegate.java          |    4 +
 .../transport/NonBlockingNetworkTransport.java     |   15 +-
 .../qpid/server/transport/ProtocolEngine.java      |    1 -
 .../qpid/server/transport/SelectorThread.java      |  110 +-
 .../server/transport/TransactionTimeoutTicker.java |  121 +
 .../qpid/server/txn/DistributedTransaction.java    |   18 +-
 .../java/org/apache/qpid/server/txn/DtxBranch.java |   22 +-
 .../qpid/server/txn/DtxNotSupportedException.java  |   41 +
 .../org/apache/qpid/server/txn/DtxRegistry.java    |   20 +
 .../apache/qpid/server/txn/LocalTransaction.java   |    3 -
 .../qpid/server/util/CachingUUIDFactory.java       |   56 +
 ...uiteAndProtocolRestrictingSSLSocketFactory.java |  122 ++
 .../apache/qpid/server/util/ConnectionBuilder.java |   85 +-
 .../qpid/server/util/ExternalServiceException.java |   37 +
 .../util/ExternalServiceTimeoutException.java      |   37 +
 .../qpid/server/util/FixedKeyMapCreator.java       |  329 +++
 .../org/apache/qpid/server/util/FutureHelper.java  |   86 +
 .../qpid/server/util/HousekeepingExecutor.java     |  125 ++
 .../qpid/server/util/StateChangeListener.java      |    2 +-
 .../qpid/server/util/StateChangeListenerEntry.java |    2 +-
 .../server/util/urlstreamhandler/data/Handler.java |    4 +-
 .../virtualhost/AbstractSystemMessageSource.java   |   73 +-
 .../server/virtualhost/AbstractVirtualHost.java    | 1462 +++++++++----
 .../AsynchronousMessageStoreRecoverer.java         |   58 +-
 .../virtualhost/ExchangeExistsException.java       |   10 +-
 .../qpid/server/virtualhost/HouseKeepingTask.java  |   16 +-
 .../server/virtualhost/ManagedVirtualHost.java     |   44 -
 .../server/virtualhost/MessageStoreRecoverer.java  |    4 +-
 .../server/virtualhost/NodeAutoCreationPolicy.java |   41 +
 .../server/virtualhost/NonStandardVirtualHost.java |    4 +-
 .../virtualhost/ProvidedStoreVirtualHost.java      |   10 +-
 .../server/virtualhost/QueueExistsException.java   |   10 +-
 .../SynchronousMessageStoreRecoverer.java          |   28 +-
 .../virtualhost/VirtualHostConnectionListener.java |   29 -
 .../qpid/server/virtualhost/VirtualHostImpl.java   |  114 -
 .../server/virtualhost/VirtualHostPrincipal.java   |    4 +-
 .../virtualhost/VirtualHostPropertiesNode.java     |   20 +-
 .../VirtualHostUnavailableException.java           |    2 +-
 .../AbstractFixedVirtualHostNodeAlias.java         |   21 +-
 .../virtualhostalias/AbstractVirtualHostAlias.java |   19 +-
 .../DefaultVirtualHostAliasImpl.java               |    8 +-
 .../server/virtualhostalias/HostNameAliasImpl.java |   19 -
 .../virtualhostalias/PatternMatchingAliasImpl.java |    2 +-
 .../SystemAddressSpaceAliasImpl.java               |  103 +
 .../virtualhostalias/VirtualHostNameAliasImpl.java |   20 +-
 .../AbstractStandardVirtualHostNode.java           |   60 +-
 .../virtualhostnode/AbstractVirtualHostNode.java   |   53 +-
 .../virtualhostnode/JsonVirtualHostNode.java       |    5 +
 .../virtualhostnode/RedirectingVirtualHost.java    |   12 +-
 .../RedirectingVirtualHostImpl.java                |  217 +-
 .../RedirectingVirtualHostNode.java                |    5 +-
 .../RedirectingVirtualHostNodeImpl.java            |  160 +-
 broker-core/src/main/resources/initial-config.json |   12 +-
 .../org/apache/qpid/server/BrokerOptionsTest.java  |   22 -
 .../java/org/apache/qpid/server/BrokerTest.java    |  160 --
 .../qpid/server/TransactionTimeoutHelperTest.java  |  222 --
 .../qpid/server/binding/BindingImplTest.java       |   15 +-
 .../startup/PreferencesProviderCreationTest.java   |  125 --
 .../startup/VirtualHostCreationTest.java           |   11 +-
 .../store/ManagementModeStoreHandlerTest.java      |  379 ++--
 .../StoreConfigurationChangeListenerTest.java      |    3 +-
 .../updater/CurrentThreadTaskExecutor.java         |   42 +-
 .../apache/qpid/server/consumer/MockConsumer.java  |   67 +-
 .../qpid/server/exchange/DirectExchangeTest.java   |    8 +-
 .../qpid/server/exchange/FanoutExchangeTest.java   |   38 +-
 .../qpid/server/exchange/HeadersBindingTest.java   |   20 +-
 .../qpid/server/exchange/HeadersExchangeTest.java  |   62 +-
 .../qpid/server/exchange/TopicExchangeTest.java    |   43 +-
 .../qpid/server/logging/AppenderUtilsTest.java     |  204 --
 .../BrokerFileLoggerStatusListenerTest.java        |  102 -
 .../qpid/server/logging/BrokerFileLoggerTest.java  |  131 --
 .../qpid/server/logging/BrokerLoggerTest.java      |  256 ---
 .../server/logging/BrokerMemoryLoggerTest.java     |  143 --
 .../BrokerNameAndLevelLogInclusionRuleTest.java    |  145 --
 .../qpid/server/logging/CompositeFilterTest.java   |  143 --
 .../logging/LoggerNameAndLevelFilterTest.java      |  116 -
 .../logging/PrincipalLogEventFilterTest.java       |   95 -
 .../server/logging/QpidLoggerTurboFilterTest.java  |  115 -
 .../qpid/server/logging/StartupAppenderTest.java   |  171 --
 .../VirtualHostLogEventExcludingFilterTest.java    |  116 -
 .../qpid/server/logging/VirtualHostLoggerTest.java |  249 ---
 ...alHostNameAndLevelLogInclusionRuleImplTest.java |  163 --
 .../actors/BaseConnectionActorTestCase.java        |    8 +-
 .../logging/messages/AbstractTestMessages.java     |    2 +-
 .../logging/messages/ExchangeMessagesTest.java     |   10 +-
 .../messages/ManagementConsoleMessagesTest.java    |    4 +-
 .../logging/subjects/AbstractTestLogSubject.java   |   14 +-
 .../logging/subjects/BindingLogSubjectTest.java    |   17 +-
 .../logging/subjects/ConnectionLogSubjectTest.java |    2 +-
 .../logging/subjects/ExchangeLogSubjectTest.java   |   11 +-
 .../subjects/MessageStoreLogSubjectTest.java       |    6 +-
 .../logging/subjects/QueueLogSubjectTest.java      |   12 +-
 .../server/model/AttributeValueConverterTest.java  |  129 ++
 .../apache/qpid/server/model/BrokerTestHelper.java |  408 ++++
 .../model/ConfiguredObjectJacksonModuleTest.java   |   27 +
 .../apache/qpid/server/model/VirtualHostTest.java  |  105 +-
 .../server/model/adapter/BrokerAdapterTest.java    |  186 --
 .../qpid/server/model/adapter/BrokerImplTest.java  |  295 +++
 .../adapter/FileBasedGroupProviderImplTest.java    |    3 +-
 .../adapter/FileSystemPreferencesProviderTest.java |  373 ----
 .../qpid/server/model/adapter/PortFactoryTest.java |   79 +-
 .../qpid/server/model/port/AmqpPortImplTest.java   |   16 +-
 .../qpid/server/model/port/HttpPortImplTest.java   |   14 +-
 .../model/preferences/GenericPrincipalTest.java    |  191 ++
 .../model/preferences/PreferenceFactoryTest.java   |   72 +
 .../model/preferences/PreferenceTestHelper.java    |   90 +
 .../model/preferences/UserPreferencesTest.java     |  310 +++
 .../model/testmodels/TestSecurityManager.java      |   40 -
 .../hierarchy/AbstractConfiguredObjectTest.java    |   17 +
 .../ConfiguredObjectTypeRegistryTest.java          |   24 +
 .../hierarchy/InjectedAttributeTest.java           |   70 +-
 .../hierarchy/TestAbstractEngineImpl.java          |    9 -
 .../server/model/testmodels/hierarchy/TestCar.java |   12 +-
 .../testmodels/hierarchy/TestElecEngineImpl.java   |    4 -
 .../model/testmodels/hierarchy/TestEngine.java     |    1 -
 .../testmodels/hierarchy/TestHybridEngineImpl.java |    5 -
 .../model/testmodels/hierarchy/TestKitCar.java     |    2 +-
 .../model/testmodels/hierarchy/TestKitCarImpl.java |   29 +-
 .../testmodels/hierarchy/TestPetrolEngineImpl.java |    4 -
 .../testmodels/hierarchy/TestStandardCar.java      |    5 +-
 .../testmodels/hierarchy/TestStandardCarImpl.java  |   44 +-
 .../testmodels/lifecycle/TestConfiguredObject.java |   22 +-
 .../singleton/AbstractConfiguredObjectTest.java    |  248 ++-
 .../testmodels/singleton/PreferencesTest.java      | 1267 +++++++++++
 .../model/testmodels/singleton/TestSingleton.java  |   38 +-
 .../testmodels/singleton/TestSingletonImpl.java    |   97 +-
 .../qpid/server/queue/AbstractQueueTestBase.java   |  164 +-
 .../apache/qpid/server/queue/ConsumerListTest.java |   25 +-
 .../qpid/server/queue/LastValueQueueListTest.java  |   21 +-
 .../qpid/server/queue/LastValueQueueTest.java      |    2 +-
 .../qpid/server/queue/MockMessageInstance.java     |   15 +-
 .../qpid/server/queue/NotificationCheckTest.java   |    3 +-
 .../qpid/server/queue/PriorityQueueListTest.java   |   18 +-
 .../qpid/server/queue/PriorityQueueTest.java       |    2 +-
 .../qpid/server/queue/QueueEntryImplTestBase.java  |   57 +-
 .../qpid/server/queue/QueueEntryListTestBase.java  |   21 +-
 .../server/queue/QueueMessageRecoveryTest.java     |    8 +-
 .../server/queue/SimpleQueueEntryImplTest.java     |   14 +-
 .../server/queue/SortedQueueEntryListTest.java     |   17 +-
 .../qpid/server/queue/SortedQueueEntryTest.java    |   14 +-
 .../server/queue/StandardQueueEntryListTest.java   |   35 +-
 .../qpid/server/queue/StandardQueueTest.java       |   43 +-
 .../qpid/server/security/FileKeyStoreTest.java     |    2 -
 .../qpid/server/security/FileTrustStoreTest.java   |    2 -
 .../qpid/server/security/NonJavaKeyStoreTest.java  |   75 +-
 .../server/security/NonJavaTrustStoreTest.java     |    3 +-
 .../qpid/server/security/SecurityManagerTest.java  | 1249 -----------
 .../qpid/server/security/SubjectCreatorTest.java   |    2 +-
 .../security/TrustStoreMessageSourceTest.java      |   20 +-
 .../security/auth/AuthenticatedPrincipalTest.java  |   23 +-
 .../security/auth/AuthenticationProviderTest.java  |    2 +-
 .../server/security/auth/TestPrincipalUtils.java   |   23 +-
 .../security/auth/UsernamePrincipalTest.java       |   18 +-
 .../AbstractPasswordFilePrincipalDatabaseTest.java |  169 ++
 ...Base64MD5PasswordFilePrincipalDatabaseTest.java |  128 +-
 .../security/auth/database/HashedUserTest.java     |    4 +-
 .../PlainPasswordFilePrincipalDatabaseTest.java    |  100 +-
 .../security/auth/database/PlainUserTest.java      |    4 +-
 .../auth/jmx/JMXPasswordAuthenticatorTest.java     |  149 --
 .../AnonymousAuthenticationManagerTest.java        |    6 +-
 .../manager/AuthenticationResultCacherTest.java    |  171 ++
 .../manager/ExternalAuthenticationManagerTest.java |   10 +-
 .../ManagedAuthenticationManagerTestBase.java      |    7 +-
 ...sswordFileAuthenticationManagerFactoryTest.java |    2 +-
 ...PrincipalDatabaseAuthenticationManagerTest.java |   11 +-
 .../manager/SimpleAuthenticationManagerTest.java   |    2 +-
 ...SimpleLDAPAuthenticationManagerFactoryTest.java |    2 +-
 .../OAuth2AuthenticationProviderImplTest.java      |  306 +++
 .../auth/manager/oauth2/OAuth2MockEndpoint.java    |  145 ++
 .../manager/oauth2/OAuth2MockEndpointHolder.java   |  157 ++
 .../auth/sasl/CRAMMD5HexInitialiserTest.java       |    2 +-
 .../security/auth/sasl/CRAMMD5HexServerTest.java   |    2 +-
 .../security/auth/sasl/TestPrincipalDatabase.java  |    6 +
 .../encryption/AESKeyFileEncrypterFactoryTest.java |   16 +-
 .../server/security/group/GroupPrincipalTest.java  |   25 +-
 .../qpid/server/stats/StatisticsCounterTest.java   |   33 -
 .../AbstractDurableConfigurationStoreTestCase.java |   86 +-
 .../qpid/server/store/BrokerRecovererTest.java     |   24 +-
 .../store/BrokerStoreUpgraderAndRecovererTest.java |  368 +++-
 .../JsonFileConfigStoreConfigurationTest.java      |    5 +-
 .../qpid/server/store/JsonFileConfigStoreTest.java |   83 +-
 .../store/MessageStoreQuotaEventsTestBase.java     |    1 -
 .../qpid/server/store/TestMessageMetaData.java     |   29 +-
 .../server/store/TestMessageMetaDataFactory.java   |   22 +-
 .../qpid/server/store/TestMessageMetaDataType.java |   16 +-
 .../VirtualHostStoreUpgraderAndRecovererTest.java  |   41 +-
 .../preferences/JsonFilePreferenceStoreTest.java   |  200 ++
 .../preferences/PreferencesRecovererTest.java      |  128 ++
 .../server/transport/TCPandSSLTransportTest.java   |   32 +
 .../transport/TransactionTimeoutTickerTest.java    |  246 +++
 .../apache/qpid/server/txn/MockServerMessage.java  |    9 +-
 .../apache/qpid/server/util/BrokerTestHelper.java  |  253 ---
 .../qpid/server/util/CachingUUIDFactoryTest.java   |   47 +
 .../virtualhost/AbstractVirtualHostTest.java       |   37 +-
 .../AsynchronousMessageStoreRecovererTest.java     |  153 +-
 .../SynchronousMessageStoreRecovererTest.java      |   45 +-
 .../virtualhost/VirtualHostPropertiesNodeTest.java |    2 +-
 .../virtualhost/VirtualHostQueueCreationTest.java  |   75 +-
 .../virtualhostalias/VirtualHostAliasTest.java     |  109 +-
 .../AbstractStandardVirtualHostNodeTest.java       |   66 +-
 .../RedirectingVirtualHostNodeTest.java            |  154 ++
 .../virtualhostnode/TestVirtualHostNode.java       |   14 +
 .../src/test/resources/ssl/test_keystore.jks       |  Bin 0 -> 5786 bytes
 broker-plugins/access-control/pom.xml              |   10 +-
 .../server/security/access/config/AclAction.java   |   11 +-
 .../security/access/config/AclFileParser.java      |  365 +++
 .../security/access/config/AclRulePredicates.java  |   34 +-
 .../qpid/server/security/access/config/Action.java |   45 +-
 .../access/config/CachingSecurityToken.java        |  141 ++
 .../security/access/config/ClientAction.java       |    7 +-
 .../security/access/config/ConfigurationFile.java  |   39 -
 .../access/config/LegacyAccessControl.java         |   28 +
 .../access/config/LegacyAccessControlAdapter.java  |  518 +++++
 .../security/access/config/LegacyOperation.java    |   45 +
 .../security/access/config/ObjectProperties.java   |  255 +++
 .../server/security/access/config/ObjectType.java  |   85 +
 .../access/config/OperationLoggingDetails.java     |   89 +
 .../security/access/config/PlainConfiguration.java |  323 ---
 .../qpid/server/security/access/config/Rule.java   |   92 +-
 .../access/config/RuleBasedAccessControl.java      |  148 ++
 .../server/security/access/config/RuleSet.java     |  238 +-
 .../security/access/config/RuleSetCreator.java     |  136 ++
 .../security/access/firewall/InetNetwork.java      |    2 +-
 .../plugins/ACLFileAccessControlProvider.java      |   32 -
 .../plugins/ACLFileAccessControlProviderImpl.java  |  218 --
 ...stractCommonRuleBasedAccessControlProvider.java |  213 ++
 .../AbstractLegacyAccessControlProvider.java       |  126 ++
 .../plugins/AclFileAccessControlProvider.java      |   41 +
 .../plugins/AclFileAccessControlProviderImpl.java  |  134 ++
 .../server/security/access/plugins/AclRule.java    |   39 +
 .../access/plugins/DefaultAccessControl.java       |  201 --
 .../plugins/RuleBasedAccessControlProvider.java    |   55 +
 .../RuleBasedAccessControlProviderImpl.java        |   49 +
 .../RuleBasedVirtualHostAccessControlProvider.java |   52 +
 ...eBasedVirtualHostAccessControlProviderImpl.java |   75 +
 .../security/access/plugins/RuleOutcome.java       |   52 +
 .../security/access/config/AclActionTest.java      |    7 +-
 .../security/access/config/AclFileParserTest.java  |  431 ++++
 .../access/config/AclRulePredicatesTest.java       |    2 +-
 .../server/security/access/config/ActionTest.java  |   32 +-
 .../config/LegacyAccessControlAdapterTest.java     |  983 +++++++++
 .../access/config/PlainConfigurationTest.java      |  445 ----
 .../access/config/RuleBasedAccessControlTest.java  |  468 ++++
 .../server/security/access/config/RuleSetTest.java |  487 ++++
 .../server/security/access/config/RuleTest.java    |   11 +-
 .../ACLFileAccessControlProviderFactoryTest.java   |  120 -
 .../ACLFileAccessControlProviderImplTest.java      |   83 -
 .../AclFileAccessControlProviderFactoryTest.java   |  117 +
 .../AclFileAccessControlProviderImplTest.java      |   83 +
 .../access/plugins/DefaultAccessControlTest.java   |  470 ----
 .../security/access/plugins/RuleSetTest.java       |  468 ----
 broker-plugins/amqp-0-10-protocol/pom.xml          |   10 +-
 .../server/protocol/v0_10/AMQPConnection_0_10.java |   51 +-
 .../server/protocol/v0_10/ConsumerTarget_0_10.java |  133 +-
 .../server/protocol/v0_10/CreditCreditManager.java |   36 +-
 .../ImplicitAcceptDispositionChangeListener.java   |    2 +-
 .../v0_10/MessageConverter_Internal_to_v0_10.java  |   45 +-
 .../protocol/v0_10/MessageConverter_v0_10.java     |   37 +-
 .../v0_10/MessageConverter_v0_10_to_Internal.java  |   32 +-
 .../protocol/v0_10/MessageMetaData_0_10.java       |  121 +-
 .../protocol/v0_10/MessageTransferMessage.java     |    6 +-
 .../protocol/v0_10/ProtocolEngineCreator_0_10.java |    2 +-
 .../server/protocol/v0_10/ServerAssembler.java     |    7 -
 .../server/protocol/v0_10/ServerConnection.java    |  132 +-
 .../protocol/v0_10/ServerConnectionDelegate.java   |   24 +-
 .../server/protocol/v0_10/ServerDisassembler.java  |    3 -
 .../qpid/server/protocol/v0_10/ServerEncoder.java  |   27 +-
 .../qpid/server/protocol/v0_10/ServerFrame.java    |    4 -
 .../qpid/server/protocol/v0_10/ServerSession.java  |  130 +-
 .../protocol/v0_10/ServerSessionDelegate.java      |  237 +-
 .../server/protocol/v0_10/WindowCreditManager.java |   31 +-
 .../protocol/v0_10/ServerSessionDelegateTest.java  |   19 +-
 .../server/protocol/v0_10/ServerSessionTest.java   |   30 +-
 broker-plugins/amqp-0-8-protocol/pom.xml           |   10 +-
 .../qpid/server/protocol/v0_8/AMQChannel.java      |  462 ++--
 .../server/protocol/v0_8/AMQPConnection_0_8.java   | 1559 +------------
 .../protocol/v0_8/AMQPConnection_0_8Impl.java      | 1478 +++++++++++++
 .../qpid/server/protocol/v0_8/BrokerDecoder.java   |   83 +-
 .../qpid/server/protocol/v0_8/CachedFrame.java     |  106 +
 .../server/protocol/v0_8/ConsumerTarget_0_8.java   |  137 +-
 .../v0_8/MessageConverter_Internal_to_v0_8.java    |   45 +-
 .../v0_8/MessageConverter_v0_8_to_Internal.java    |   34 +-
 .../qpid/server/protocol/v0_8/MessageMetaData.java |  108 +-
 .../server/protocol/v0_8/Pre0_10CreditManager.java |  123 +-
 .../protocol/v0_8/ProtocolEngineCreator_0_8.java   |    6 +-
 .../protocol/v0_8/ProtocolEngineCreator_0_9.java   |    6 +-
 .../protocol/v0_8/ProtocolEngineCreator_0_9_1.java |    6 +-
 .../protocol/v0_8/ProtocolOutputConverterImpl.java |  283 ++-
 .../protocol/v0_8/UnacknowledgedMessageMap.java    |    1 -
 .../v0_8/UnacknowledgedMessageMapImpl.java         |    4 +-
 .../qpid/server/protocol/v0_8/AMQChannelTest.java  |   63 +-
 .../protocol/v0_8/AMQPConnection_0_8Test.java      |   29 +-
 .../protocol/v0_8/ExtractResendAndRequeueTest.java |    6 +-
 .../protocol/v0_8/Pre0_10CreditManagerTest.java    |  167 ++
 .../v0_8/UnacknowledgedMessageMapTest.java         |    6 +-
 broker-plugins/amqp-1-0-protocol/pom.xml           |   10 +-
 .../codec/AbstractDescribedTypeWriter.java         |  190 --
 .../qpid/amqp_1_0/codec/AbstractListWriter.java    |   41 -
 .../qpid/amqp_1_0/codec/AbstractMapWriter.java     |   95 -
 .../qpid/amqp_1_0/codec/ArrayTypeConstructor.java  |  122 --
 .../apache/qpid/amqp_1_0/codec/ArrayWriter.java    |   82 -
 .../apache/qpid/amqp_1_0/codec/BinaryString.java   |   93 -
 .../qpid/amqp_1_0/codec/BinaryTypeConstructor.java |   64 -
 .../apache/qpid/amqp_1_0/codec/BinaryWriter.java   |   75 -
 .../qpid/amqp_1_0/codec/BooleanConstructor.java    |   79 -
 .../apache/qpid/amqp_1_0/codec/BooleanWriter.java  |   70 -
 .../qpid/amqp_1_0/codec/ByteArrayWriter.java       |   66 -
 .../qpid/amqp_1_0/codec/ByteTypeConstructor.java   |   58 -
 .../org/apache/qpid/amqp_1_0/codec/ByteWriter.java |   90 -
 .../qpid/amqp_1_0/codec/CharTypeConstructor.java   |   66 -
 .../org/apache/qpid/amqp_1_0/codec/CharWriter.java |   53 -
 .../qpid/amqp_1_0/codec/CompoundTypeAssembler.java |   36 -
 .../amqp_1_0/codec/CompoundTypeConstructor.java    |  188 --
 .../apache/qpid/amqp_1_0/codec/CompoundWriter.java |  417 ----
 .../qpid/amqp_1_0/codec/DecimalConstructor.java    |  230 --
 .../codec/DefaultDescribedTypeConstructor.java     |   70 -
 .../qpid/amqp_1_0/codec/DelegatingValueWriter.java |   52 -
 .../apache/qpid/amqp_1_0/codec/DescribedType.java  |   85 -
 .../amqp_1_0/codec/DescribedTypeConstructor.java   |   40 -
 .../codec/DescribedTypeConstructorRegistry.java    |   35 -
 .../qpid/amqp_1_0/codec/DoubleTypeConstructor.java |   57 -
 .../apache/qpid/amqp_1_0/codec/DoubleWriter.java   |   54 -
 .../qpid/amqp_1_0/codec/FixedEightWriter.java      |  108 -
 .../qpid/amqp_1_0/codec/FixedFourWriter.java       |  122 --
 .../apache/qpid/amqp_1_0/codec/FixedOneWriter.java |   79 -
 .../qpid/amqp_1_0/codec/FixedSixteenWriter.java    |  150 --
 .../apache/qpid/amqp_1_0/codec/FixedTwoWriter.java |   96 -
 .../qpid/amqp_1_0/codec/FloatTypeConstructor.java  |   57 -
 .../apache/qpid/amqp_1_0/codec/FloatWriter.java    |   54 -
 .../apache/qpid/amqp_1_0/codec/FrameWriter.java    |  283 ---
 .../qpid/amqp_1_0/codec/IntTypeConstructor.java    |   57 -
 .../apache/qpid/amqp_1_0/codec/IntegerWriter.java  |  106 -
 .../org/apache/qpid/amqp_1_0/codec/ListWriter.java |  173 --
 .../qpid/amqp_1_0/codec/LongTypeConstructor.java   |   57 -
 .../org/apache/qpid/amqp_1_0/codec/LongWriter.java |  111 -
 .../org/apache/qpid/amqp_1_0/codec/MapWriter.java  |  102 -
 .../qpid/amqp_1_0/codec/NullTypeConstructor.java   |   43 -
 .../org/apache/qpid/amqp_1_0/codec/NullWriter.java |   70 -
 .../qpid/amqp_1_0/codec/ProtocolHandler.java       |   32 -
 .../qpid/amqp_1_0/codec/ProtocolHeaderHandler.java |  147 --
 .../amqp_1_0/codec/RestrictedTypeValueWriter.java  |   55 -
 .../qpid/amqp_1_0/codec/ShortTypeConstructor.java  |   57 -
 .../apache/qpid/amqp_1_0/codec/ShortWriter.java    |   55 -
 .../amqp_1_0/codec/SimpleVariableWidthWriter.java  |   68 -
 .../qpid/amqp_1_0/codec/SmallIntConstructor.java   |   57 -
 .../qpid/amqp_1_0/codec/SmallLongConstructor.java  |   57 -
 .../qpid/amqp_1_0/codec/SmallUIntConstructor.java  |   57 -
 .../qpid/amqp_1_0/codec/SmallULongConstructor.java |   58 -
 .../qpid/amqp_1_0/codec/StringTypeConstructor.java |   85 -
 .../apache/qpid/amqp_1_0/codec/StringWriter.java   |  146 --
 .../qpid/amqp_1_0/codec/SymbolArrayWriter.java     |  171 --
 .../qpid/amqp_1_0/codec/SymbolTypeConstructor.java |  102 -
 .../apache/qpid/amqp_1_0/codec/SymbolWriter.java   |  102 -
 .../amqp_1_0/codec/TimestampTypeConstructor.java   |   60 -
 .../qpid/amqp_1_0/codec/TimestampWriter.java       |   57 -
 .../qpid/amqp_1_0/codec/TypeConstructor.java       |   33 -
 .../qpid/amqp_1_0/codec/UByteTypeConstructor.java  |   58 -
 .../qpid/amqp_1_0/codec/UIntTypeConstructor.java   |   58 -
 .../qpid/amqp_1_0/codec/ULongTypeConstructor.java  |   60 -
 .../qpid/amqp_1_0/codec/UShortTypeConstructor.java |   59 -
 .../qpid/amqp_1_0/codec/UUIDTypeConstructor.java   |   62 -
 .../org/apache/qpid/amqp_1_0/codec/UUIDWriter.java |   63 -
 .../qpid/amqp_1_0/codec/UnsignedByteWriter.java    |   91 -
 .../qpid/amqp_1_0/codec/UnsignedIntegerWriter.java |  147 --
 .../qpid/amqp_1_0/codec/UnsignedLongWriter.java    |  151 --
 .../qpid/amqp_1_0/codec/UnsignedShortWriter.java   |   56 -
 .../apache/qpid/amqp_1_0/codec/ValueHandler.java   |  160 --
 .../codec/ValueProducingProtocolHandler.java       |   31 -
 .../apache/qpid/amqp_1_0/codec/ValueWriter.java    |   60 -
 .../codec/VariableWidthTypeConstructor.java        |   49 -
 .../qpid/amqp_1_0/codec/VariableWidthWriter.java   |  171 --
 .../amqp_1_0/codec/WrapperTypeValueWriter.java     |   55 -
 .../qpid/amqp_1_0/codec/ZeroListConstructor.java   |   46 -
 .../qpid/amqp_1_0/codec/ZeroUIntConstructor.java   |   44 -
 .../qpid/amqp_1_0/codec/ZeroULongConstructor.java  |   44 -
 .../org/apache/qpid/amqp_1_0/framing/AMQFrame.java |   76 -
 .../framing/AMQPProtocolHeaderHandler.java         |   89 -
 .../qpid/amqp_1_0/framing/ExceptionHandler.java    |   31 -
 .../apache/qpid/amqp_1_0/framing/FrameHandler.java |  355 ---
 .../qpid/amqp_1_0/framing/FrameParsingError.java   |   34 -
 .../qpid/amqp_1_0/framing/FrameTypeHandler.java    |   31 -
 .../amqp_1_0/framing/OversizeFrameException.java   |   42 -
 .../apache/qpid/amqp_1_0/framing/SASLFrame.java    |   42 -
 .../qpid/amqp_1_0/framing/SASLFrameHandler.java    |  341 ---
 .../framing/SASLProtocolHeaderHandler.java         |   92 -
 .../qpid/amqp_1_0/framing/TransportFrame.java      |   52 -
 .../qpid/amqp_1_0/messaging/MessageAttributes.java |   27 -
 .../qpid/amqp_1_0/messaging/SectionDecoder.java    |   36 -
 .../amqp_1_0/messaging/SectionDecoderImpl.java     |   62 -
 .../qpid/amqp_1_0/messaging/SectionEncoder.java    |   34 -
 .../amqp_1_0/messaging/SectionEncoderImpl.java     |  112 -
 .../qpid/amqp_1_0/transport/BytesProcessor.java    |   27 -
 .../qpid/amqp_1_0/transport/BytesTransport.java    |   38 -
 .../amqp_1_0/transport/CircularBytesBuffer.java    |  174 --
 .../amqp_1_0/transport/ConnectionEndpoint.java     | 1726 ---------------
 .../transport/ConnectionEventListener.java         |   51 -
 .../qpid/amqp_1_0/transport/ConnectionState.java   |   32 -
 .../apache/qpid/amqp_1_0/transport/Container.java  |   79 -
 .../apache/qpid/amqp_1_0/transport/Delivery.java   |   92 -
 .../amqp_1_0/transport/DeliveryStateHandler.java   |   28 -
 .../qpid/amqp_1_0/transport/ErrorHandler.java      |   27 -
 .../amqp_1_0/transport/FrameOutputHandler.java     |   36 -
 .../qpid/amqp_1_0/transport/FrameTransport.java    |   37 -
 .../qpid/amqp_1_0/transport/LinkEndpoint.java      |  606 -----
 .../qpid/amqp_1_0/transport/LinkEventListener.java |   31 -
 .../org/apache/qpid/amqp_1_0/transport/Node.java   |   26 -
 .../apache/qpid/amqp_1_0/transport/Predicate.java  |   26 -
 .../transport/ProtocolHeaderTransport.java         |  134 --
 .../amqp_1_0/transport/ReceivingLinkEndpoint.java  |  471 ----
 .../amqp_1_0/transport/ReceivingLinkListener.java  |   43 -
 .../transport/ReceivingSessionHalfEndpoint.java    |   26 -
 .../qpid/amqp_1_0/transport/SASLEndpoint.java      |   39 -
 .../qpid/amqp_1_0/transport/SASLEndpointImpl.java  |  291 ---
 .../amqp_1_0/transport/SASLFrameTransport.java     |   78 -
 .../qpid/amqp_1_0/transport/SASLTransport.java     |   85 -
 .../amqp_1_0/transport/SaslServerProvider.java     |   31 -
 .../amqp_1_0/transport/SendingLinkEndpoint.java    |  223 --
 .../amqp_1_0/transport/SendingLinkListener.java    |   41 -
 .../transport/SendingSessionHalfEndpoint.java      |   26 -
 .../qpid/amqp_1_0/transport/SequenceNumber.java    |  110 -
 .../qpid/amqp_1_0/transport/SessionAttachment.java |   92 -
 .../qpid/amqp_1_0/transport/SessionEndpoint.java   |  916 --------
 .../amqp_1_0/transport/SessionEventListener.java   |   47 -
 .../amqp_1_0/transport/SessionHalfEndpoint.java    |   26 -
 .../qpid/amqp_1_0/transport/SessionState.java      |   35 -
 .../amqp_1_0/transport/StateChangeListener.java    |   25 -
 .../qpid/amqp_1_0/transport/UnsettledTransfer.java |   53 -
 .../qpid/amqp_1_0/type/AmqpErrorException.java     |   54 -
 .../java/org/apache/qpid/amqp_1_0/type/Binary.java |  159 --
 .../apache/qpid/amqp_1_0/type/DeliveryState.java   |   26 -
 .../qpid/amqp_1_0/type/DistributionMode.java       |   26 -
 .../apache/qpid/amqp_1_0/type/ErrorCondition.java  |   26 -
 .../org/apache/qpid/amqp_1_0/type/FrameBody.java   |   29 -
 .../org/apache/qpid/amqp_1_0/type/GlobalTxId.java  |   26 -
 .../apache/qpid/amqp_1_0/type/LifetimePolicy.java  |   26 -
 .../org/apache/qpid/amqp_1_0/type/Outcome.java     |   26 -
 .../apache/qpid/amqp_1_0/type/RestrictedType.java  |   26 -
 .../apache/qpid/amqp_1_0/type/SaslFrameBody.java   |   27 -
 .../org/apache/qpid/amqp_1_0/type/Section.java     |   27 -
 .../java/org/apache/qpid/amqp_1_0/type/Source.java |   26 -
 .../java/org/apache/qpid/amqp_1_0/type/Symbol.java |   95 -
 .../java/org/apache/qpid/amqp_1_0/type/Target.java |   26 -
 .../apache/qpid/amqp_1_0/type/TxnCapability.java   |   26 -
 .../java/org/apache/qpid/amqp_1_0/type/TxnId.java  |   23 -
 .../apache/qpid/amqp_1_0/type/UnsignedByte.java    |  134 --
 .../apache/qpid/amqp_1_0/type/UnsignedInteger.java |  149 --
 .../apache/qpid/amqp_1_0/type/UnsignedLong.java    |  162 --
 .../apache/qpid/amqp_1_0/type/UnsignedShort.java   |  132 --
 .../org/apache/qpid/amqp_1_0/type/WrapperType.java |   27 -
 .../type/codec/AMQPDescribedTypeRegistry.java      |  374 ----
 .../qpid/amqp_1_0/type/messaging/Accepted.java     |   46 -
 .../qpid/amqp_1_0/type/messaging/AmqpSequence.java |   70 -
 .../qpid/amqp_1_0/type/messaging/AmqpValue.java    |   66 -
 .../type/messaging/ApplicationProperties.java      |   64 -
 .../apache/qpid/amqp_1_0/type/messaging/Data.java  |   68 -
 .../amqp_1_0/type/messaging/DeleteOnClose.java     |   46 -
 .../amqp_1_0/type/messaging/DeleteOnNoLinks.java   |   46 -
 .../type/messaging/DeleteOnNoLinksOrMessages.java  |   46 -
 .../type/messaging/DeleteOnNoMessages.java         |   46 -
 .../type/messaging/DeliveryAnnotations.java        |   64 -
 .../type/messaging/ExactSubjectFilter.java         |   78 -
 .../qpid/amqp_1_0/type/messaging/Filter.java       |   28 -
 .../qpid/amqp_1_0/type/messaging/Footer.java       |   70 -
 .../qpid/amqp_1_0/type/messaging/Header.java       |  161 --
 .../amqp_1_0/type/messaging/JMSSelectorFilter.java |   77 -
 .../type/messaging/MatchingSubjectFilter.java      |   77 -
 .../type/messaging/MessageAnnotations.java         |   64 -
 .../qpid/amqp_1_0/type/messaging/Modified.java     |  112 -
 .../amqp_1_0/type/messaging/NoLocalFilter.java     |   45 -
 .../qpid/amqp_1_0/type/messaging/Properties.java   |  333 ---
 .../qpid/amqp_1_0/type/messaging/Received.java     |   88 -
 .../qpid/amqp_1_0/type/messaging/Rejected.java     |   70 -
 .../qpid/amqp_1_0/type/messaging/Released.java     |   46 -
 .../qpid/amqp_1_0/type/messaging/Source.java       |  281 ---
 .../qpid/amqp_1_0/type/messaging/StdDistMode.java  |   95 -
 .../qpid/amqp_1_0/type/messaging/Target.java       |  197 --
 .../type/messaging/TerminusDurability.java         |  107 -
 .../type/messaging/TerminusExpiryPolicy.java       |  119 -
 .../type/messaging/codec/AcceptedConstructor.java  |   72 -
 .../type/messaging/codec/AcceptedWriter.java       |  151 --
 .../messaging/codec/AmqpSequenceConstructor.java   |   67 -
 .../type/messaging/codec/AmqpSequenceWriter.java   |   80 -
 .../type/messaging/codec/AmqpValueConstructor.java |   56 -
 .../type/messaging/codec/AmqpValueWriter.java      |   80 -
 .../codec/ApplicationPropertiesConstructor.java    |   67 -
 .../codec/ApplicationPropertiesWriter.java         |   80 -
 .../type/messaging/codec/DataConstructor.java      |   64 -
 .../amqp_1_0/type/messaging/codec/DataWriter.java  |   80 -
 .../messaging/codec/DeleteOnCloseConstructor.java  |   71 -
 .../type/messaging/codec/DeleteOnCloseWriter.java  |  142 --
 .../codec/DeleteOnNoLinksConstructor.java          |   71 -
 .../DeleteOnNoLinksOrMessagesConstructor.java      |   71 -
 .../codec/DeleteOnNoLinksOrMessagesWriter.java     |  142 --
 .../messaging/codec/DeleteOnNoLinksWriter.java     |  142 --
 .../codec/DeleteOnNoMessagesConstructor.java       |   71 -
 .../messaging/codec/DeleteOnNoMessagesWriter.java  |  142 --
 .../codec/DeliveryAnnotationsConstructor.java      |   67 -
 .../messaging/codec/DeliveryAnnotationsWriter.java |   80 -
 .../codec/ExactSubjectFilterConstructor.java       |   64 -
 .../messaging/codec/ExactSubjectFilterWriter.java  |   78 -
 .../type/messaging/codec/FooterConstructor.java    |   67 -
 .../type/messaging/codec/FooterWriter.java         |   80 -
 .../type/messaging/codec/HeaderConstructor.java    |  206 --
 .../type/messaging/codec/HeaderWriter.java         |  182 --
 .../codec/JMSSelectorFilterConstructor.java        |   66 -
 .../messaging/codec/JMSSelectorFilterWriter.java   |   79 -
 .../codec/MatchingSubjectFilterConstructor.java    |   65 -
 .../codec/MatchingSubjectFilterWriter.java         |   79 -
 .../codec/MessageAnnotationsConstructor.java       |   67 -
 .../messaging/codec/MessageAnnotationsWriter.java  |   80 -
 .../type/messaging/codec/ModifiedConstructor.java  |  153 --
 .../type/messaging/codec/ModifiedWriter.java       |  166 --
 .../messaging/codec/NoLocalFilterConstructor.java  |   56 -
 .../type/messaging/codec/NoLocalFilterWriter.java  |   89 -
 .../messaging/codec/PropertiesConstructor.java     |  423 ----
 .../type/messaging/codec/PropertiesWriter.java     |  246 ---
 .../type/messaging/codec/ReceivedConstructor.java  |  125 --
 .../type/messaging/codec/ReceivedWriter.java       |  158 --
 .../type/messaging/codec/RejectedConstructor.java  |   99 -
 .../type/messaging/codec/RejectedWriter.java       |  150 --
 .../type/messaging/codec/ReleasedConstructor.java  |   71 -
 .../type/messaging/codec/ReleasedWriter.java       |  142 --
 .../type/messaging/codec/SourceConstructor.java    |  384 ----
 .../type/messaging/codec/SourceWriter.java         |  230 --
 .../type/messaging/codec/TargetConstructor.java    |  269 ---
 .../type/messaging/codec/TargetWriter.java         |  198 --
 .../qpid/amqp_1_0/type/security/SaslChallenge.java |   74 -
 .../qpid/amqp_1_0/type/security/SaslCode.java      |  131 --
 .../qpid/amqp_1_0/type/security/SaslInit.java      |  116 -
 .../amqp_1_0/type/security/SaslMechanisms.java     |   74 -
 .../qpid/amqp_1_0/type/security/SaslOutcome.java   |   95 -
 .../qpid/amqp_1_0/type/security/SaslResponse.java  |   74 -
 .../security/codec/SaslChallengeConstructor.java   |   98 -
 .../type/security/codec/SaslChallengeWriter.java   |  150 --
 .../type/security/codec/SaslInitConstructor.java   |  152 --
 .../type/security/codec/SaslInitWriter.java        |  166 --
 .../security/codec/SaslMechanismsConstructor.java  |  105 -
 .../type/security/codec/SaslMechanismsWriter.java  |  150 --
 .../security/codec/SaslOutcomeConstructor.java     |  125 --
 .../type/security/codec/SaslOutcomeWriter.java     |  158 --
 .../security/codec/SaslResponseConstructor.java    |   98 -
 .../type/security/codec/SaslResponseWriter.java    |  150 --
 .../amqp_1_0/type/transaction/Coordinator.java     |   70 -
 .../qpid/amqp_1_0/type/transaction/Declare.java    |   66 -
 .../qpid/amqp_1_0/type/transaction/Declared.java   |   67 -
 .../qpid/amqp_1_0/type/transaction/Discharge.java  |   87 -
 .../type/transaction/TransactionErrors.java        |  107 -
 .../type/transaction/TransactionalState.java       |   88 -
 .../amqp_1_0/type/transaction/TxnCapabilities.java |  144 --
 .../amqp_1_0/type/transaction/TxnCapability.java   |  131 --
 .../transaction/codec/CoordinatorConstructor.java  |  116 -
 .../type/transaction/codec/CoordinatorWriter.java  |  150 --
 .../type/transaction/codec/DeclareConstructor.java |   98 -
 .../type/transaction/codec/DeclareWriter.java      |  150 --
 .../transaction/codec/DeclaredConstructor.java     |   98 -
 .../type/transaction/codec/DeclaredWriter.java     |  150 --
 .../transaction/codec/DischargeConstructor.java    |  125 --
 .../type/transaction/codec/DischargeWriter.java    |  158 --
 .../codec/TransactionalStateConstructor.java       |  125 --
 .../codec/TransactionalStateWriter.java            |  158 --
 .../qpid/amqp_1_0/type/transport/AmqpError.java    |  227 --
 .../qpid/amqp_1_0/type/transport/Attach.java       |  366 ----
 .../apache/qpid/amqp_1_0/type/transport/Begin.java |  240 --
 .../apache/qpid/amqp_1_0/type/transport/Close.java |   89 -
 .../amqp_1_0/type/transport/ConnectionError.java   |  119 -
 .../qpid/amqp_1_0/type/transport/Detach.java       |  131 --
 .../qpid/amqp_1_0/type/transport/Disposition.java  |  194 --
 .../apache/qpid/amqp_1_0/type/transport/End.java   |   89 -
 .../apache/qpid/amqp_1_0/type/transport/Error.java |  120 -
 .../apache/qpid/amqp_1_0/type/transport/Flow.java  |  302 ---
 .../qpid/amqp_1_0/type/transport/LinkError.java    |  131 --
 .../apache/qpid/amqp_1_0/type/transport/Open.java  |  282 ---
 .../type/transport/ReceiverSettleMode.java         |   95 -
 .../apache/qpid/amqp_1_0/type/transport/Role.java  |   95 -
 .../amqp_1_0/type/transport/SenderSettleMode.java  |  107 -
 .../qpid/amqp_1_0/type/transport/SessionError.java |  119 -
 .../qpid/amqp_1_0/type/transport/Transfer.java     |  307 ---
 .../type/transport/codec/AttachConstructor.java    |  464 ----
 .../type/transport/codec/AttachWriter.java         |  254 ---
 .../type/transport/codec/BeginConstructor.java     |  302 ---
 .../amqp_1_0/type/transport/codec/BeginWriter.java |  206 --
 .../type/transport/codec/CloseConstructor.java     |   98 -
 .../amqp_1_0/type/transport/codec/CloseWriter.java |  150 --
 .../type/transport/codec/DetachConstructor.java    |  152 --
 .../type/transport/codec/DetachWriter.java         |  166 --
 .../transport/codec/DispositionConstructor.java    |  233 --
 .../type/transport/codec/DispositionWriter.java    |  190 --
 .../type/transport/codec/EndConstructor.java       |   98 -
 .../amqp_1_0/type/transport/codec/EndWriter.java   |  150 --
 .../type/transport/codec/ErrorConstructor.java     |  221 --
 .../amqp_1_0/type/transport/codec/ErrorWriter.java |  166 --
 .../type/transport/codec/FlowConstructor.java      |  369 ----
 .../amqp_1_0/type/transport/codec/FlowWriter.java  |  230 --
 .../type/transport/codec/OpenConstructor.java      |  370 ----
 .../amqp_1_0/type/transport/codec/OpenWriter.java  |  222 --
 .../type/transport/codec/TransferConstructor.java  |  368 ----
 .../type/transport/codec/TransferWriter.java       |  230 --
 .../server/protocol/v1_0/AMQPConnection_1_0.java   | 1600 +++++++++++---
 .../server/protocol/v1_0/ConnectionHandler.java    |   61 +
 .../qpid/server/protocol/v1_0/ConnectionState.java |   32 +
 .../qpid/server/protocol/v1_0/Connection_1_0.java  |  570 -----
 .../server/protocol/v1_0/ConsumerTarget_1_0.java   |  249 +--
 .../qpid/server/protocol/v1_0/Container.java       |   79 +
 .../apache/qpid/server/protocol/v1_0/Delivery.java |   89 +
 .../server/protocol/v1_0/DeliveryStateHandler.java |   28 +
 .../qpid/server/protocol/v1_0/Destination.java     |    4 +-
 .../qpid/server/protocol/v1_0/ErrorHandler.java    |   27 +
 .../server/protocol/v1_0/ExchangeDestination.java  |   82 +-
 .../server/protocol/v1_0/FrameOutputHandler.java   |   36 +
 .../qpid/server/protocol/v1_0/LinkEndpoint.java    |  507 +++++
 .../server/protocol/v1_0/LinkEventListener.java    |   31 +
 .../v1_0/MessageConverter_Internal_to_v1_0.java    |   27 +-
 .../protocol/v1_0/MessageConverter_from_1_0.java   |   36 +-
 .../protocol/v1_0/MessageConverter_to_1_0.java     |   58 +-
 .../v1_0/MessageConverter_v1_0_to_Internal.java    |    6 +-
 .../server/protocol/v1_0/MessageMetaData_1_0.java  |   50 +-
 .../protocol/v1_0/MessageSourceDestination.java    |   10 +-
 .../qpid/server/protocol/v1_0/Message_1_0.java     |    8 +-
 .../org/apache/qpid/server/protocol/v1_0/Node.java |   26 +
 .../protocol/v1_0/NodeReceivingDestination.java    |   69 +-
 .../qpid/server/protocol/v1_0/Predicate.java       |   26 +
 .../protocol/v1_0/ProtocolEngineCreator_1_0_0.java |    2 +-
 .../v1_0/ProtocolEngineCreator_1_0_0_SASL.java     |    2 +-
 .../server/protocol/v1_0/QueueDestination.java     |   40 +-
 .../server/protocol/v1_0/ReceivingDestination.java |   13 +-
 .../protocol/v1_0/ReceivingLinkAttachment.java     |   10 +-
 .../protocol/v1_0/ReceivingLinkEndpoint.java       |  419 ++++
 .../protocol/v1_0/ReceivingLinkListener.java       |   43 +
 .../server/protocol/v1_0/ReceivingLink_1_0.java    |  167 +-
 .../qpid/server/protocol/v1_0/SASLEndpoint.java    |   39 +
 .../server/protocol/v1_0/SaslServerProvider.java   |   29 +
 .../protocol/v1_0/SendingLinkAttachment.java       |    8 +-
 .../server/protocol/v1_0/SendingLinkEndpoint.java  |  235 ++
 .../server/protocol/v1_0/SendingLinkListener.java  |   41 +
 .../qpid/server/protocol/v1_0/SendingLink_1_0.java |  153 +-
 .../qpid/server/protocol/v1_0/SequenceNumber.java  |  110 +
 .../qpid/server/protocol/v1_0/SessionState.java    |   35 +
 .../qpid/server/protocol/v1_0/Session_1_0.java     |  976 +++++++--
 .../server/protocol/v1_0/StateChangeListener.java  |   25 +
 .../protocol/v1_0/TxnCoordinatorLink_1_0.java      |   43 +-
 .../qpid/server/protocol/v1_0/UnsettledAction.java |    2 +-
 .../v1_0/codec/AbstractDescribedTypeWriter.java    |  188 ++
 .../protocol/v1_0/codec/AbstractListWriter.java    |   41 +
 .../protocol/v1_0/codec/AbstractMapWriter.java     |   95 +
 .../protocol/v1_0/codec/ArrayTypeConstructor.java  |  122 ++
 .../server/protocol/v1_0/codec/ArrayWriter.java    |   82 +
 .../server/protocol/v1_0/codec/BinaryString.java   |   93 +
 .../protocol/v1_0/codec/BinaryTypeConstructor.java |   62 +
 .../server/protocol/v1_0/codec/BinaryWriter.java   |   75 +
 .../protocol/v1_0/codec/BooleanConstructor.java    |   79 +
 .../server/protocol/v1_0/codec/BooleanWriter.java  |   70 +
 .../protocol/v1_0/codec/ByteArrayWriter.java       |   66 +
 .../protocol/v1_0/codec/ByteTypeConstructor.java   |   58 +
 .../server/protocol/v1_0/codec/ByteWriter.java     |   90 +
 .../protocol/v1_0/codec/CharTypeConstructor.java   |   66 +
 .../server/protocol/v1_0/codec/CharWriter.java     |   53 +
 .../protocol/v1_0/codec/CompoundTypeAssembler.java |   36 +
 .../v1_0/codec/CompoundTypeConstructor.java        |  187 ++
 .../server/protocol/v1_0/codec/CompoundWriter.java |  415 ++++
 .../protocol/v1_0/codec/DecimalConstructor.java    |  230 ++
 .../codec/DefaultDescribedTypeConstructor.java     |   37 +
 .../protocol/v1_0/codec/DelegatingValueWriter.java |   52 +
 .../server/protocol/v1_0/codec/DescribedType.java  |   85 +
 .../v1_0/codec/DescribedTypeConstructor.java       |   40 +
 .../codec/DescribedTypeConstructorRegistry.java    |   35 +
 .../protocol/v1_0/codec/DoubleTypeConstructor.java |   57 +
 .../server/protocol/v1_0/codec/DoubleWriter.java   |   54 +
 .../protocol/v1_0/codec/FixedEightWriter.java      |  108 +
 .../protocol/v1_0/codec/FixedFourWriter.java       |  122 ++
 .../server/protocol/v1_0/codec/FixedOneWriter.java |   79 +
 .../protocol/v1_0/codec/FixedSixteenWriter.java    |  150 ++
 .../server/protocol/v1_0/codec/FixedTwoWriter.java |   96 +
 .../protocol/v1_0/codec/FloatTypeConstructor.java  |   57 +
 .../server/protocol/v1_0/codec/FloatWriter.java    |   54 +
 .../server/protocol/v1_0/codec/FrameWriter.java    |   82 +
 .../protocol/v1_0/codec/IntTypeConstructor.java    |   57 +
 .../server/protocol/v1_0/codec/IntegerWriter.java  |  106 +
 .../server/protocol/v1_0/codec/ListWriter.java     |  173 ++
 .../protocol/v1_0/codec/LongTypeConstructor.java   |   57 +
 .../server/protocol/v1_0/codec/LongWriter.java     |  111 +
 .../qpid/server/protocol/v1_0/codec/MapWriter.java |  102 +
 .../protocol/v1_0/codec/NullTypeConstructor.java   |   43 +
 .../server/protocol/v1_0/codec/NullWriter.java     |   70 +
 .../protocol/v1_0/codec/ProtocolHandler.java       |   30 +
 .../v1_0/codec/RestrictedTypeValueWriter.java      |   55 +
 .../protocol/v1_0/codec/ShortTypeConstructor.java  |   57 +
 .../server/protocol/v1_0/codec/ShortWriter.java    |   55 +
 .../v1_0/codec/SimpleVariableWidthWriter.java      |   68 +
 .../protocol/v1_0/codec/SmallIntConstructor.java   |   57 +
 .../protocol/v1_0/codec/SmallLongConstructor.java  |   57 +
 .../protocol/v1_0/codec/SmallUIntConstructor.java  |   57 +
 .../protocol/v1_0/codec/SmallULongConstructor.java |   58 +
 .../protocol/v1_0/codec/StringTypeConstructor.java |   84 +
 .../server/protocol/v1_0/codec/StringWriter.java   |  146 ++
 .../protocol/v1_0/codec/SymbolArrayWriter.java     |  171 ++
 .../protocol/v1_0/codec/SymbolTypeConstructor.java |  102 +
 .../server/protocol/v1_0/codec/SymbolWriter.java   |  102 +
 .../v1_0/codec/TimestampTypeConstructor.java       |   60 +
 .../protocol/v1_0/codec/TimestampWriter.java       |   57 +
 .../protocol/v1_0/codec/TypeConstructor.java       |   31 +
 .../protocol/v1_0/codec/UByteTypeConstructor.java  |   58 +
 .../protocol/v1_0/codec/UIntTypeConstructor.java   |   58 +
 .../protocol/v1_0/codec/ULongTypeConstructor.java  |   60 +
 .../protocol/v1_0/codec/UShortTypeConstructor.java |   59 +
 .../protocol/v1_0/codec/UUIDTypeConstructor.java   |   62 +
 .../server/protocol/v1_0/codec/UUIDWriter.java     |   63 +
 .../protocol/v1_0/codec/UnsignedByteWriter.java    |   91 +
 .../protocol/v1_0/codec/UnsignedIntegerWriter.java |  147 ++
 .../protocol/v1_0/codec/UnsignedLongWriter.java    |  151 ++
 .../protocol/v1_0/codec/UnsignedShortWriter.java   |   56 +
 .../server/protocol/v1_0/codec/ValueHandler.java   |  159 ++
 .../v1_0/codec/ValueProducingProtocolHandler.java  |   31 +
 .../server/protocol/v1_0/codec/ValueWriter.java    |   59 +
 .../v1_0/codec/VariableWidthTypeConstructor.java   |   47 +
 .../protocol/v1_0/codec/VariableWidthWriter.java   |  169 ++
 .../v1_0/codec/WrapperTypeValueWriter.java         |   55 +
 .../protocol/v1_0/codec/ZeroListConstructor.java   |   46 +
 .../protocol/v1_0/codec/ZeroUIntConstructor.java   |   44 +
 .../protocol/v1_0/codec/ZeroULongConstructor.java  |   44 +
 .../server/protocol/v1_0/framing/AMQFrame.java     |   74 +
 .../server/protocol/v1_0/framing/FrameHandler.java |  214 ++
 .../v1_0/framing/OversizeFrameException.java       |   42 +
 .../server/protocol/v1_0/framing/SASLFrame.java    |   42 +
 .../protocol/v1_0/framing/TransportFrame.java      |   50 +
 .../protocol/v1_0/messaging/SectionDecoder.java    |   35 +
 .../v1_0/messaging/SectionDecoderImpl.java         |   62 +
 .../protocol/v1_0/messaging/SectionEncoder.java    |   34 +
 .../v1_0/messaging/SectionEncoderImpl.java         |  111 +
 .../protocol/v1_0/type/AmqpErrorException.java     |   54 +
 .../qpid/server/protocol/v1_0/type/Binary.java     |  159 ++
 .../server/protocol/v1_0/type/DeliveryState.java   |   26 +
 .../protocol/v1_0/type/DistributionMode.java       |   26 +
 .../server/protocol/v1_0/type/ErrorCondition.java  |   26 +
 .../qpid/server/protocol/v1_0/type/FrameBody.java  |   29 +
 .../qpid/server/protocol/v1_0/type/GlobalTxId.java |   26 +
 .../server/protocol/v1_0/type/LifetimePolicy.java  |   26 +
 .../qpid/server/protocol/v1_0/type/Outcome.java    |   26 +
 .../server/protocol/v1_0/type/RestrictedType.java  |   26 +
 .../server/protocol/v1_0/type/SaslFrameBody.java   |   27 +
 .../qpid/server/protocol/v1_0/type/Section.java    |   27 +
 .../qpid/server/protocol/v1_0/type/Source.java     |   26 +
 .../qpid/server/protocol/v1_0/type/Symbol.java     |   95 +
 .../qpid/server/protocol/v1_0/type/Target.java     |   26 +
 .../server/protocol/v1_0/type/TxnCapability.java   |   26 +
 .../qpid/server/protocol/v1_0/type/TxnId.java      |   23 +
 .../server/protocol/v1_0/type/UnsignedByte.java    |  134 ++
 .../server/protocol/v1_0/type/UnsignedInteger.java |  149 ++
 .../server/protocol/v1_0/type/UnsignedLong.java    |  162 ++
 .../server/protocol/v1_0/type/UnsignedShort.java   |  132 ++
 .../server/protocol/v1_0/type/WrapperType.java     |   27 +
 .../v1_0/type/codec/AMQPDescribedTypeRegistry.java |  374 ++++
 .../protocol/v1_0/type/messaging/Accepted.java     |   46 +
 .../protocol/v1_0/type/messaging/AmqpSequence.java |   70 +
 .../protocol/v1_0/type/messaging/AmqpValue.java    |   66 +
 .../v1_0/type/messaging/ApplicationProperties.java |   64 +
 .../server/protocol/v1_0/type/messaging/Data.java  |   68 +
 .../v1_0/type/messaging/DeleteOnClose.java         |   46 +
 .../v1_0/type/messaging/DeleteOnNoLinks.java       |   46 +
 .../type/messaging/DeleteOnNoLinksOrMessages.java  |   46 +
 .../v1_0/type/messaging/DeleteOnNoMessages.java    |   46 +
 .../v1_0/type/messaging/DeliveryAnnotations.java   |   64 +
 .../v1_0/type/messaging/ExactSubjectFilter.java    |   78 +
 .../protocol/v1_0/type/messaging/Filter.java       |   28 +
 .../protocol/v1_0/type/messaging/Footer.java       |   70 +
 .../protocol/v1_0/type/messaging/Header.java       |  161 ++
 .../v1_0/type/messaging/JMSSelectorFilter.java     |   77 +
 .../v1_0/type/messaging/MatchingSubjectFilter.java |   77 +
 .../v1_0/type/messaging/MessageAnnotations.java    |   64 +
 .../protocol/v1_0/type/messaging/Modified.java     |  112 +
 .../v1_0/type/messaging/NoLocalFilter.java         |   45 +
 .../protocol/v1_0/type/messaging/Properties.java   |  333 +++
 .../protocol/v1_0/type/messaging/Received.java     |   88 +
 .../protocol/v1_0/type/messaging/Rejected.java     |   70 +
 .../protocol/v1_0/type/messaging/Released.java     |   46 +
 .../protocol/v1_0/type/messaging/Source.java       |  281 +++
 .../protocol/v1_0/type/messaging/StdDistMode.java  |   95 +
 .../protocol/v1_0/type/messaging/Target.java       |  197 ++
 .../v1_0/type/messaging/TerminusDurability.java    |  107 +
 .../v1_0/type/messaging/TerminusExpiryPolicy.java  |  119 +
 .../type/messaging/codec/AcceptedConstructor.java  |   72 +
 .../v1_0/type/messaging/codec/AcceptedWriter.java  |  151 ++
 .../messaging/codec/AmqpSequenceConstructor.java   |   67 +
 .../type/messaging/codec/AmqpSequenceWriter.java   |   80 +
 .../type/messaging/codec/AmqpValueConstructor.java |   56 +
 .../v1_0/type/messaging/codec/AmqpValueWriter.java |   80 +
 .../codec/ApplicationPropertiesConstructor.java    |   67 +
 .../codec/ApplicationPropertiesWriter.java         |   80 +
 .../v1_0/type/messaging/codec/DataConstructor.java |   64 +
 .../v1_0/type/messaging/codec/DataWriter.java      |   80 +
 .../messaging/codec/DeleteOnCloseConstructor.java  |   71 +
 .../type/messaging/codec/DeleteOnCloseWriter.java  |  142 ++
 .../codec/DeleteOnNoLinksConstructor.java          |   71 +
 .../DeleteOnNoLinksOrMessagesConstructor.java      |   71 +
 .../codec/DeleteOnNoLinksOrMessagesWriter.java     |  142 ++
 .../messaging/codec/DeleteOnNoLinksWriter.java     |  142 ++
 .../codec/DeleteOnNoMessagesConstructor.java       |   71 +
 .../messaging/codec/DeleteOnNoMessagesWriter.java  |  142 ++
 .../codec/DeliveryAnnotationsConstructor.java      |   67 +
 .../messaging/codec/DeliveryAnnotationsWriter.java |   80 +
 .../codec/ExactSubjectFilterConstructor.java       |   64 +
 .../messaging/codec/ExactSubjectFilterWriter.java  |   78 +
 .../type/messaging/codec/FooterConstructor.java    |   67 +
 .../v1_0/type/messaging/codec/FooterWriter.java    |   80 +
 .../type/messaging/codec/HeaderConstructor.java    |  206 ++
 .../v1_0/type/messaging/codec/HeaderWriter.java    |  182 ++
 .../codec/JMSSelectorFilterConstructor.java        |   66 +
 .../messaging/codec/JMSSelectorFilterWriter.java   |   79 +
 .../codec/MatchingSubjectFilterConstructor.java    |   65 +
 .../codec/MatchingSubjectFilterWriter.java         |   79 +
 .../codec/MessageAnnotationsConstructor.java       |   67 +
 .../messaging/codec/MessageAnnotationsWriter.java  |   80 +
 .../type/messaging/codec/ModifiedConstructor.java  |  153 ++
 .../v1_0/type/messaging/codec/ModifiedWriter.java  |  166 ++
 .../messaging/codec/NoLocalFilterConstructor.java  |   56 +
 .../type/messaging/codec/NoLocalFilterWriter.java  |   89 +
 .../messaging/codec/PropertiesConstructor.java     |  423 ++++
 .../type/messaging/codec/PropertiesWriter.java     |  246 +++
 .../type/messaging/codec/ReceivedConstructor.java  |  125 ++
 .../v1_0/type/messaging/codec/ReceivedWriter.java  |  158 ++
 .../type/messaging/codec/RejectedConstructor.java  |   99 +
 .../v1_0/type/messaging/codec/RejectedWriter.java  |  150 ++
 .../type/messaging/codec/ReleasedConstructor.java  |   71 +
 .../v1_0/type/messaging/codec/ReleasedWriter.java  |  142 ++
 .../type/messaging/codec/SourceConstructor.java    |  384 ++++
 .../v1_0/type/messaging/codec/SourceWriter.java    |  230 ++
 .../type/messaging/codec/TargetConstructor.java    |  269 +++
 .../v1_0/type/messaging/codec/TargetWriter.java    |  198 ++
 .../protocol/v1_0/type/security/SaslChallenge.java |   74 +
 .../protocol/v1_0/type/security/SaslCode.java      |  131 ++
 .../protocol/v1_0/type/security/SaslInit.java      |  116 +
 .../v1_0/type/security/SaslMechanisms.java         |   74 +
 .../protocol/v1_0/type/security/SaslOutcome.java   |   95 +
 .../protocol/v1_0/type/security/SaslResponse.java  |   74 +
 .../security/codec/SaslChallengeConstructor.java   |   98 +
 .../type/security/codec/SaslChallengeWriter.java   |  150 ++
 .../type/security/codec/SaslInitConstructor.java   |  152 ++
 .../v1_0/type/security/codec/SaslInitWriter.java   |  166 ++
 .../security/codec/SaslMechanismsConstructor.java  |  105 +
 .../type/security/codec/SaslMechanismsWriter.java  |  150 ++
 .../security/codec/SaslOutcomeConstructor.java     |  125 ++
 .../type/security/codec/SaslOutcomeWriter.java     |  158 ++
 .../security/codec/SaslResponseConstructor.java    |   98 +
 .../type/security/codec/SaslResponseWriter.java    |  150 ++
 .../v1_0/type/transaction/Coordinator.java         |   70 +
 .../protocol/v1_0/type/transaction/Declare.java    |   66 +
 .../protocol/v1_0/type/transaction/Declared.java   |   67 +
 .../protocol/v1_0/type/transaction/Discharge.java  |   87 +
 .../v1_0/type/transaction/TransactionErrors.java   |  107 +
 .../v1_0/type/transaction/TransactionalState.java  |   88 +
 .../v1_0/type/transaction/TxnCapabilities.java     |  144 ++
 .../v1_0/type/transaction/TxnCapability.java       |  131 ++
 .../transaction/codec/CoordinatorConstructor.java  |  116 +
 .../type/transaction/codec/CoordinatorWriter.java  |  150 ++
 .../type/transaction/codec/DeclareConstructor.java |   98 +
 .../v1_0/type/transaction/codec/DeclareWriter.java |  150 ++
 .../transaction/codec/DeclaredConstructor.java     |   98 +
 .../type/transaction/codec/DeclaredWriter.java     |  150 ++
 .../transaction/codec/DischargeConstructor.java    |  125 ++
 .../type/transaction/codec/DischargeWriter.java    |  158 ++
 .../codec/TransactionalStateConstructor.java       |  125 ++
 .../codec/TransactionalStateWriter.java            |  158 ++
 .../protocol/v1_0/type/transport/AmqpError.java    |  227 ++
 .../protocol/v1_0/type/transport/Attach.java       |  364 +++
 .../server/protocol/v1_0/type/transport/Begin.java |  238 ++
 .../server/protocol/v1_0/type/transport/Close.java |   87 +
 .../v1_0/type/transport/ConnectionError.java       |  119 +
 .../protocol/v1_0/type/transport/Detach.java       |  129 ++
 .../protocol/v1_0/type/transport/Disposition.java  |  192 ++
 .../server/protocol/v1_0/type/transport/End.java   |   87 +
 .../server/protocol/v1_0/type/transport/Error.java |  120 +
 .../server/protocol/v1_0/type/transport/Flow.java  |  300 +++
 .../protocol/v1_0/type/transport/LinkError.java    |  131 ++
 .../server/protocol/v1_0/type/transport/Open.java  |  280 +++
 .../v1_0/type/transport/ReceiverSettleMode.java    |   95 +
 .../server/protocol/v1_0/type/transport/Role.java  |   95 +
 .../v1_0/type/transport/SenderSettleMode.java      |  107 +
 .../protocol/v1_0/type/transport/SessionError.java |  119 +
 .../protocol/v1_0/type/transport/Transfer.java     |  302 +++
 .../type/transport/codec/AttachConstructor.java    |  464 ++++
 .../v1_0/type/transport/codec/AttachWriter.java    |  254 +++
 .../type/transport/codec/BeginConstructor.java     |  302 +++
 .../v1_0/type/transport/codec/BeginWriter.java     |  206 ++
 .../type/transport/codec/CloseConstructor.java     |   98 +
 .../v1_0/type/transport/codec/CloseWriter.java     |  150 ++
 .../type/transport/codec/DetachConstructor.java    |  152 ++
 .../v1_0/type/transport/codec/DetachWriter.java    |  166 ++
 .../transport/codec/DispositionConstructor.java    |  233 ++
 .../type/transport/codec/DispositionWriter.java    |  190 ++
 .../v1_0/type/transport/codec/EndConstructor.java  |   98 +
 .../v1_0/type/transport/codec/EndWriter.java       |  150 ++
 .../type/transport/codec/ErrorConstructor.java     |  221 ++
 .../v1_0/type/transport/codec/ErrorWriter.java     |  166 ++
 .../v1_0/type/transport/codec/FlowConstructor.java |  369 ++++
 .../v1_0/type/transport/codec/FlowWriter.java      |  230 ++
 .../v1_0/type/transport/codec/OpenConstructor.java |  370 ++++
 .../v1_0/type/transport/codec/OpenWriter.java      |  222 ++
 .../type/transport/codec/TransferConstructor.java  |  368 ++++
 .../v1_0/type/transport/codec/TransferWriter.java  |  230 ++
 .../protocol/v1_0/ProtocolEngine_1_0_0Test.java    |  159 +-
 broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml   |    4 +-
 .../v0_10_v1_0/MessageConverter_0_10_to_1_0.java   |   18 +-
 .../v0_10_v1_0/MessageConverter_1_0_to_v0_10.java  |   32 +-
 broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml   |    4 +-
 .../v0_8_v0_10/MessageConverter_0_10_to_0_8.java   |   38 +-
 .../v0_8_v0_10/MessageConverter_0_8_to_0_10.java   |   15 +-
 broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml    |    4 +-
 .../v0_8_v1_0/MessageConverter_0_8_to_1_0.java     |   21 +-
 .../v0_8_v1_0/MessageConverter_1_0_to_v0_8.java    |   21 +-
 broker-plugins/derby-store/pom.xml                 |   10 +-
 .../store/derby/DerbyConfigurationStore.java       |  114 +-
 .../qpid/server/store/derby/DerbySystemConfig.java |    5 +
 .../server/store/derby/DerbySystemConfigImpl.java  |    4 +-
 .../apache/qpid/server/store/derby/DerbyUtils.java |   40 +-
 .../server/virtualhost/derby/DerbyVirtualHost.java |   10 +-
 .../virtualhost/derby/DerbyVirtualHostImpl.java    |    8 +-
 .../derby/DerbyVirtualHostNode.java                |   11 +-
 .../derby/DerbyVirtualHostNodeImpl.java            |   15 +-
 .../js/qpid/management/virtualhost/derby/add.js    |   21 +-
 .../js/qpid/management/virtualhost/derby/edit.js   |   31 +-
 .../js/qpid/management/virtualhost/derby/show.js   |   11 +-
 .../qpid/management/virtualhostnode/derby/add.js   |    8 +-
 .../qpid/management/virtualhostnode/derby/edit.js  |   28 +-
 .../qpid/management/virtualhostnode/derby/show.js  |   15 +-
 .../derby/DerbyMessageStoreQuotaEventsTest.java    |    2 +-
 .../store/derby/DerbyPreferenceStoreTest.java      |  317 +++
 .../derby/DerbyVirtualHostNodeTest.java            |   12 +-
 broker-plugins/jdbc-provider-bone/pom.xml          |    4 +-
 .../js/qpid/management/store/pool/bonecp/add.js    |    8 +-
 .../js/qpid/management/store/pool/bonecp/edit.js   |   14 +-
 .../js/qpid/management/store/pool/bonecp/show.js   |   74 +-
 broker-plugins/jdbc-store/pom.xml                  |   10 +-
 .../jdbc/GenericAbstractJDBCMessageStore.java      |    4 +-
 .../store/jdbc/GenericJDBCConfigurationStore.java  |  214 +-
 .../server/store/jdbc/GenericJDBCMessageStore.java |   24 +-
 .../apache/qpid/server/store/jdbc/JDBCDetails.java |    7 +
 .../qpid/server/store/jdbc/JDBCSettings.java       |    2 +
 .../qpid/server/store/jdbc/JDBCSystemConfig.java   |   16 +
 .../server/store/jdbc/JDBCSystemConfigImpl.java    |   12 +-
 .../server/virtualhost/jdbc/JDBCVirtualHost.java   |   25 +-
 .../virtualhost/jdbc/JDBCVirtualHostImpl.java      |   13 +-
 .../virtualhostnode/jdbc/JDBCVirtualHostNode.java  |   21 +-
 .../jdbc/JDBCVirtualHostNodeImpl.java              |   16 +
 .../js/qpid/management/store/pool/none/add.js      |    5 +-
 .../js/qpid/management/store/pool/none/edit.js     |   14 +-
 .../js/qpid/management/store/pool/none/show.js     |    7 +-
 .../js/qpid/management/virtualhost/jdbc/add.js     |  102 +-
 .../js/qpid/management/virtualhost/jdbc/edit.js    |  111 +-
 .../js/qpid/management/virtualhost/jdbc/show.js    |   80 +-
 .../js/qpid/management/virtualhostnode/jdbc/add.js |  102 +-
 .../qpid/management/virtualhostnode/jdbc/edit.js   |  119 +-
 .../qpid/management/virtualhostnode/jdbc/show.js   |   92 +-
 .../main/java/resources/virtualhost/jdbc/add.html  |   15 +-
 .../java/resources/virtualhostnode/jdbc/add.html   |   15 +-
 .../java/resources/virtualhostnode/jdbc/show.html  |    4 +
 .../jdbc/GenericJDBCConfigurationStoreTest.java    |   69 +
 .../server/store/jdbc/JDBCMessageStoreTest.java    |   27 +-
 .../server/store/jdbc/JDBCSystemConfigTest.java    |   73 +
 .../virtualhost/jdbc/JDBCVirtualHostTest.java      |  111 +
 .../jdbc/JDBCVirtualHostNodeTest.java              |  103 +
 broker-plugins/logging-logback/pom.xml             |   84 +
 .../logging/logback/AbstractBrokerLogger.java      |   63 +
 .../server/logging/logback/AbstractLogger.java     |  239 ++
 .../AbstractNameAndLevelLogInclusionRule.java      |  108 +
 .../logging/logback/AbstractVirtualHostLogger.java |   56 +
 .../qpid/server/logging/logback/AppenderUtils.java |  256 +++
 .../logging/logback/BrokerConsoleLogger.java       |   43 +
 .../logging/logback/BrokerConsoleLoggerImpl.java   |   96 +
 .../server/logging/logback/BrokerFileLogger.java   |   80 +
 .../logging/logback/BrokerFileLoggerImpl.java      |  259 +++
 .../logging/logback/BrokerLogbackSocketLogger.java |   62 +
 .../logback/BrokerLogbackSocketLoggerImpl.java     |  189 ++
 .../server/logging/logback/BrokerMemoryLogger.java |   51 +
 .../logging/logback/BrokerMemoryLoggerImpl.java    |  117 +
 .../BrokerNameAndLevelLogInclusionRule.java        |   41 +
 .../BrokerNameAndLevelLogInclusionRuleImpl.java    |   55 +
 .../server/logging/logback/BrokerSyslogLogger.java |   48 +
 .../logging/logback/BrokerSyslogLoggerImpl.java    |   95 +
 .../server/logging/logback/CompositeFilter.java    |  103 +
 .../logging/logback/EffectiveLevelFilter.java      |   31 +
 .../server/logging/logback/FileLoggerSettings.java |   46 +
 .../logging/logback/LogBackLogInclusionRule.java   |   32 +
 .../qpid/server/logging/logback/LogRecord.java     |   67 +
 .../qpid/server/logging/logback/LogRecorder.java   |   42 +
 .../logging/logback/LoggerNameAndLevelFilter.java  |  115 +
 .../server/logging/logback/NoopConfigurator.java   |    0
 .../logging/logback/PrincipalLogEventFilter.java   |   64 +
 .../logging/logback/QpidLoggerTurboFilter.java     |  207 ++
 .../logging/logback/RecordEventAppender.java       |   67 +
 .../logging/logback/RollingPolicyDecorator.java    |    0
 .../server/logging/logback/RolloverWatcher.java    |    0
 .../server/logging/logback/StartupAppender.java    |  103 +
 .../logging/logback/VirtualHostFileLogger.java     |   75 +
 .../logging/logback/VirtualHostFileLoggerImpl.java |  195 ++
 .../VirtualHostLogEventExcludingFilter.java        |   86 +
 .../VirtualHostNameAndLevelLogInclusionRule.java   |   40 +
 ...irtualHostNameAndLevelLogInclusionRuleImpl.java |   55 +
 .../logging/logback/VirtualHostSyslogLogger.java   |   47 +
 .../logback/VirtualHostSyslogLoggerImpl.java       |   96 +
 .../js/qpid/management/logger/FileBrowser.js       |  185 ++
 .../js/qpid/management/logger/LogViewer.js         |  246 +++
 .../logger/brokerlogger/brokerlogbacksocket/add.js |   38 +
 .../brokerlogger/brokerlogbacksocket/show.js       |   44 +
 .../management/logger/brokerlogger/console/add.js  |   47 +
 .../management/logger/brokerlogger/console/show.js |   40 +
 .../management/logger/brokerlogger/file/add.js     |   39 +
 .../management/logger/brokerlogger/file/show.js    |   53 +
 .../management/logger/brokerlogger/memory/add.js   |   37 +
 .../management/logger/brokerlogger/memory/show.js  |   44 +
 .../management/logger/brokerlogger/syslog/add.js   |   39 +
 .../management/logger/brokerlogger/syslog/show.js  |   43 +
 .../logger/virtualhostlogger/file/add.js           |   39 +
 .../logger/virtualhostlogger/file/show.js          |   53 +
 .../logger/virtualhostlogger/syslog/add.js         |   39 +
 .../logger/virtualhostlogger/syslog/show.js        |   43 +
 .../brokerloginclusionrule/nameandlevel/add.js     |   49 +
 .../nameandlevel/add.js                            |   49 +
 .../resources/logger/brokerlogbacksocket/add.html  |    0
 .../resources/logger/brokerlogbacksocket/show.html |    0
 .../main/java/resources/logger/console/add.html    |    0
 .../main/java/resources/logger/console/show.html   |    0
 .../src/main/java/resources/logger/file/add.html   |    0
 .../java/resources/logger/file/fileBrowser.html    |    0
 .../src/main/java/resources/logger/file/show.html  |    0
 .../src/main/java/resources/logger/memory/add.html |    0
 .../main/java/resources/logger/memory/show.html    |    0
 .../resources/logger/memory/showLogViewer.html     |    0
 .../src/main/java/resources/logger/syslog/add.html |    0
 .../main/java/resources/logger/syslog/show.html    |    0
 .../ch.qos.logback.classic.spi.Configurator        |    0
 .../server/logging/logback/AppenderUtilsTest.java  |  204 ++
 .../BrokerFileLoggerStatusListenerTest.java        |  106 +
 .../logging/logback/BrokerFileLoggerTest.java      |  132 ++
 .../server/logging/logback/BrokerLoggerTest.java   |  257 +++
 .../logging/logback/BrokerMemoryLoggerTest.java    |  151 ++
 .../BrokerNameAndLevelLogInclusionRuleTest.java    |  146 ++
 .../logging/logback/CompositeFilterTest.java       |  145 ++
 .../logback/LoggerNameAndLevelFilterTest.java      |  118 +
 .../logback/PrincipalLogEventFilterTest.java       |   96 +
 .../logging/logback/QpidLoggerTurboFilterTest.java |  117 +
 .../logback/RollingPolicyDecoratorTest.java        |    0
 .../logging/logback/RolloverWatcherTest.java       |    0
 .../logging/logback/StartupAppenderTest.java       |  172 ++
 .../VirtualHostLogEventExcludingFilterTest.java    |  118 +
 .../logging/logback/VirtualHostLoggerTest.java     |  263 +++
 ...alHostNameAndLevelLogInclusionRuleImplTest.java |  165 ++
 broker-plugins/management-amqp/pom.xml             |    6 +-
 .../management/amqp/ManagementAddressSpace.java    |  286 +++
 .../amqp/ManagementAddressSpaceCreator.java        |   42 +
 .../amqp/ManagementAddressSpacePrincipal.java      |   65 +
 .../server/management/amqp/ManagementNode.java     |  150 +-
 .../management/amqp/ManagementNodeConsumer.java    |   49 +-
 .../management/amqp/ManagementNodeCreator.java     |   11 +-
 .../server/management/amqp/ManagementResponse.java |   14 +-
 broker-plugins/management-http/pom.xml             |  103 +-
 .../main/grammar/ConfiguredObjectFilterParser.jj   |  754 +++++++
 .../qpid/server/management/plugin/DojoHelper.java  |   18 +-
 .../management/plugin/GunzipOutputStream.java      |  307 +++
 .../server/management/plugin/HttpManagement.java   |  169 +-
 .../plugin/HttpManagementConfiguration.java        |   19 +-
 .../management/plugin/HttpManagementUtil.java      |  151 +-
 .../plugin/HttpRequestPreemptiveAuthenticator.java |    1 -
 .../auth/AnonymousPreemptiveAuthenticator.java     |    2 +-
 .../auth/BasicAuthPreemptiveAuthenticator.java     |    4 +-
 .../auth/OAuth2InteractiveAuthenticator.java       |   71 +-
 .../plugin/auth/OAuth2PreemptiveAuthenticator.java |    2 -
 .../auth/SSLClientCertPreemptiveAuthenticator.java |    2 +-
 .../auth/UsernamePasswordInteractiveLogin.java     |    1 -
 .../plugin/filter/ExceptionHandlingFilter.java     |   27 +
 .../filter/ForbiddingAuthorisationFilter.java      |   18 +-
 .../management/plugin/filter/LoggingFilter.java    |   48 +-
 .../PreemptiveSessionInvalidationFilter.java       |   69 +
 .../RewriteRequestForUncompressedJavascript.java   |   80 +
 .../plugin/preferences/QueryPreferenceValue.java   |  106 +
 .../preferences/QueryPreferenceValueFactory.java   |   43 +
 .../management/plugin/report/ReportRunner.java     |   22 +-
 .../plugin/report/ReportableMessage.java           |    7 +-
 .../plugin/report/ReportableMessageHeader.java     |    5 +-
 .../servlet/query/ConfiguredObjectExpression.java  |   28 +
 .../query/ConfiguredObjectExpressionFactory.java   |  372 ++++
 .../query/ConfiguredObjectFilterParser.java        | 1504 +++++++++++++
 .../ConfiguredObjectFilterParserConstants.java     |  140 ++
 .../ConfiguredObjectFilterParserTokenManager.java  | 1130 ++++++++++
 .../servlet/query/ConfiguredObjectQuery.java       |  344 +++
 .../plugin/servlet/query/EvaluationException.java  |   35 +
 .../plugin/servlet/query/NamedExpression.java      |   28 +
 .../plugin/servlet/query/ParseException.java       |  212 ++
 .../plugin/servlet/query/SimpleCharStream.java     |  492 +++++
 .../management/plugin/servlet/query/Token.java     |  152 ++
 .../plugin/servlet/query/TokenMgrError.java        |  168 ++
 .../plugin/servlet/rest/AbstractServlet.java       |  118 +-
 .../plugin/servlet/rest/ApiDocsServlet.java        |  112 +-
 .../plugin/servlet/rest/BrokerQueryServlet.java    |  116 +
 .../rest/ConfiguredObjectToMapConverter.java       |  257 +--
 .../rest/LoggedOnUserPreferencesServlet.java       |  136 --
 .../plugin/servlet/rest/MetaDataServlet.java       |   24 +-
 .../plugin/servlet/rest/NotFoundException.java     |   33 +
 .../plugin/servlet/rest/QueryServlet.java          |  133 ++
 .../plugin/servlet/rest/QueueReportServlet.java    |   26 +-
 .../plugin/servlet/rest/RequestInfo.java           |  117 +
 .../plugin/servlet/rest/RequestInfoParser.java     |  257 +++
 .../plugin/servlet/rest/RestServlet.java           |  689 +++---
 .../servlet/rest/RestUserPreferenceHandler.java    |  407 ++++
 .../plugin/servlet/rest/SaslServlet.java           |  158 +-
 .../servlet/rest/UserPreferencesServlet.java       |  237 --
 .../servlet/rest/VirtualHostQueryServlet.java      |  180 ++
 .../accesscontrolprovider/showAclFile.html         |    5 +
 .../java/resources/addAccessControlProvider.html   |   14 +-
 .../java/resources/addAuthenticationProvider.html  |    9 +-
 .../src/main/java/resources/addGroupProvider.html  |    7 +
 .../src/main/java/resources/addPort.html           |   34 +-
 .../java/resources/addPreferencesProvider.html     |   28 -
 .../src/main/java/resources/addQueue.html          |   12 +
 .../src/main/java/resources/addStore.html          |    1 +
 .../main/java/resources/addVirtualHostAlias.html   |   85 +
 .../authenticationprovider/oauth2/add.html         |  145 ++
 .../authenticationprovider/oauth2/show.html        |   57 +
 .../authenticationprovider/simpleldap/add.html     |  186 +-
 .../authenticationprovider/simpleldap/show.html    |   69 +-
 .../resources/common/ContextVariablesEditor.html   |    2 +-
 .../java/resources/common/MessageDialogForm.html   |   44 +
 .../java/resources/common/TimeZoneSelector.html    |   59 +-
 .../src/main/java/resources/css/common.css         |  391 +++-
 .../dashboard/AddWidgetDialogContent.html          |   33 +
 .../dashboard/DashboardCreateDialogForm.html       |   55 +
 .../java/resources/dashboard/DashboardWidget.html  |   56 +
 .../resources/dashboard/QueryWidgetSettings.html   |   66 +
 .../src/main/java/resources/editBroker.html        |    8 +-
 .../src/main/java/resources/editQueue.html         |   11 +
 .../src/main/java/resources/footer.html            |    2 +-
 .../cloudfoundrydashboardmanagement/add.html       |   63 +
 .../cloudfoundrydashboardmanagement/show.html      |   33 +
 .../main/java/resources/images/notification.svg    |   88 +-
 .../src/main/java/resources/images/plus.svg        |   28 +
 .../main/java/resources/images/qpid-favicon.png    |  Bin 0 -> 9509 bytes
 .../src/main/java/resources/images/question.svg    |   31 +
 .../src/main/java/resources/index.html             |  204 +-
 .../java/resources/js/qpid/addVirtualHostAlias.js  |  236 ++
 .../resources/js/qpid/authorization/checkUser.js   |   45 -
 .../java/resources/js/qpid/authorization/sasl.js   |  332 ---
 .../js/qpid/common/CategoryTabExtension.js         |   71 +-
 .../java/resources/js/qpid/common/ConsoleHelper.js |  245 ++-
 .../js/qpid/common/ContextVariablesEditor.js       |  830 +++----
 .../resources/js/qpid/common/FormWidgetMixin.js    |   52 +-
 .../java/resources/js/qpid/common/HexDumpWidget.js |  135 ++
 .../main/java/resources/js/qpid/common/JsonRest.js |   97 +-
 .../java/resources/js/qpid/common/MessageDialog.js |  199 ++
 .../resources/js/qpid/common/ResourceWidget.js     |  351 +--
 .../java/resources/js/qpid/common/Structure.js     |  165 ++
 .../resources/js/qpid/common/TimeZoneSelector.js   |  343 ++-
 .../resources/js/qpid/common/TypeTabExtension.js   |   86 +-
 .../resources/js/qpid/common/UpdatableStore.js     |  170 +-
 .../java/resources/js/qpid/common/WarningPane.js   |   82 +-
 .../main/java/resources/js/qpid/common/footer.js   |   18 +-
 .../java/resources/js/qpid/common/formatter.js     |   39 +-
 .../js/qpid/common/grid/ColumnDefDialog.js         |  250 ++-
 .../js/qpid/common/grid/EnhancedFilter.js          |  442 ++--
 .../js/qpid/common/grid/EnhancedFilterTools.js     |  620 +++---
 .../resources/js/qpid/common/grid/FilterSummary.js |  326 +--
 .../resources/js/qpid/common/grid/GridUpdater.js   |  502 +++--
 .../js/qpid/common/grid/RowNumberLimitDialog.js    |  148 +-
 .../resources/js/qpid/common/grid/UpdatableGrid.js |   56 +-
 .../main/java/resources/js/qpid/common/metadata.js |  169 +-
 .../java/resources/js/qpid/common/properties.js    |   12 +-
 .../main/java/resources/js/qpid/common/timezone.js |   58 +-
 .../main/java/resources/js/qpid/common/updater.js  |   71 +-
 .../src/main/java/resources/js/qpid/common/util.js | 1610 ++++++++------
 .../resources/js/qpid/common/widgetconfigurer.js   |  252 +--
 .../js/qpid/management/AccessControlProvider.js    |  184 +-
 .../js/qpid/management/AuthenticationProvider.js   |  365 ++-
 .../java/resources/js/qpid/management/Broker.js    | 1586 ++++++++------
 .../resources/js/qpid/management/Connection.js     |  526 +++--
 .../js/qpid/management/DashboardBrowserTab.js      |  115 +
 .../resources/js/qpid/management/DashboardTab.js   |  202 ++
 .../java/resources/js/qpid/management/Exchange.js  |  531 ++---
 .../resources/js/qpid/management/GroupProvider.js  |  382 ++--
 .../java/resources/js/qpid/management/KeyStore.js  |  289 +--
 .../java/resources/js/qpid/management/Logger.js    |  489 +++--
 .../resources/js/qpid/management/Management.js     | 1051 +++++----
 .../java/resources/js/qpid/management/Plugin.js    |  107 +-
 .../main/java/resources/js/qpid/management/Port.js |  458 ++--
 .../resources/js/qpid/management/Preferences.js    |  285 ---
 .../js/qpid/management/PreferencesProvider.js      |  186 --
 .../js/qpid/management/QueryBrowserTab.js          |  113 +
 .../java/resources/js/qpid/management/QueryTab.js  |  196 ++
 .../java/resources/js/qpid/management/Queue.js     | 1121 +++++-----
 .../resources/js/qpid/management/TrustStore.js     |  292 +--
 .../js/qpid/management/UserPreferences.js          |  584 +++--
 .../resources/js/qpid/management/VirtualHost.js    | 1071 ++++-----
 .../js/qpid/management/VirtualHostNode.js          |  426 ++--
 .../management/accesscontrolprovider/AclFile.js    |  122 +-
 .../accesscontrolprovider/aclfile/add.js           |  188 +-
 .../js/qpid/management/addAccessControlProvider.js |  217 +-
 .../qpid/management/addAuthenticationProvider.js   |  217 +-
 .../resources/js/qpid/management/addBinding.js     |  646 +++---
 .../resources/js/qpid/management/addExchange.js    |  136 +-
 .../js/qpid/management/addGroupProvider.js         |  287 ++-
 .../js/qpid/management/addLogInclusionRule.js      |  294 +--
 .../java/resources/js/qpid/management/addLogger.js |  196 +-
 .../java/resources/js/qpid/management/addPort.js   |  717 +++---
 .../js/qpid/management/addPreferencesProvider.js   |  111 -
 .../java/resources/js/qpid/management/addQueue.js  |  202 +-
 .../java/resources/js/qpid/management/addStore.js  |  180 +-
 .../js/qpid/management/addVirtualHostAlias.js      |  239 ++
 .../management/addVirtualHostNodeAndVirtualHost.js |  671 +++---
 .../PrincipalDatabaseAuthenticationManager.js      |  317 +--
 .../authenticationprovider/anonymous/add.js        |    9 +-
 .../authenticationprovider/anonymous/show.js       |   10 +-
 .../base64md5passwordfile/add.js                   |   31 +-
 .../base64md5passwordfile/show.js                  |   11 +-
 .../authenticationprovider/external/add.js         |   33 +-
 .../authenticationprovider/external/show.js        |   11 +-
 .../authenticationprovider/kerberos/add.js         |    9 +-
 .../authenticationprovider/kerberos/show.js        |   10 +-
 .../management/authenticationprovider/md5/add.js   |    9 +-
 .../management/authenticationprovider/md5/show.js  |   10 +-
 .../authenticationprovider/oauth2/add.js           |   64 +
 .../authenticationprovider/oauth2/show.js          |   49 +
 .../management/authenticationprovider/plain/add.js |    9 +-
 .../authenticationprovider/plain/show.js           |   10 +-
 .../plainpasswordfile/add.js                       |   31 +-
 .../plainpasswordfile/show.js                      |   11 +-
 .../authenticationprovider/scram-sha-1/add.js      |    9 +-
 .../authenticationprovider/scram-sha-1/show.js     |   10 +-
 .../authenticationprovider/scram-sha-256/add.js    |    9 +-
 .../authenticationprovider/scram-sha-256/show.js   |   10 +-
 .../authenticationprovider/simpleldap/add.js       |  178 +-
 .../authenticationprovider/simpleldap/show.js      |   13 +-
 .../resources/js/qpid/management/controller.js     |  326 ++-
 .../dashboard/DashboardCreateDialogForm.js         |  116 +
 .../qpid/management/dashboard/DashboardWidget.js   |  499 +++++
 .../js/qpid/management/dashboard/widget/query.js   |  333 +++
 .../management/dashboard/widget/unavailable.js     |  116 +
 .../resources/js/qpid/management/editBroker.js     |  245 ++-
 .../java/resources/js/qpid/management/editQueue.js |  262 ++-
 .../js/qpid/management/editVirtualHost.js          |  325 +--
 .../js/qpid/management/editVirtualHostNode.js      |  265 ++-
 .../resources/js/qpid/management/group/Group.js    |  352 +--
 .../js/qpid/management/group/addGroupMember.js     |  117 +-
 .../groupprovider/GroupManagingGroupProvider.js    |  215 +-
 .../cloudfoundrydashboardmanagement/add.js         |  229 ++
 .../cloudfoundrydashboardmanagement/show.js        |   54 +
 .../qpid/management/groupprovider/groupfile/add.js |   40 +-
 .../management/groupprovider/groupfile/show.js     |   10 +-
 .../groupprovider/managedgroupprovider/add.js      |   14 +-
 .../groupprovider/managedgroupprovider/show.js     |   10 +-
 .../js/qpid/management/logger/FileBrowser.js       |  264 ++-
 .../js/qpid/management/logger/LogViewer.js         |  362 +--
 .../js/qpid/management/logger/brokerlogger/add.js  |   28 +-
 .../logger/brokerlogger/brokerlogbacksocket/add.js |   41 -
 .../brokerlogger/brokerlogbacksocket/show.js       |   40 -
 .../management/logger/brokerlogger/console/add.js  |   47 -
 .../management/logger/brokerlogger/console/show.js |   36 -
 .../management/logger/brokerlogger/file/add.js     |   42 -
 .../management/logger/brokerlogger/file/show.js    |   47 -
 .../management/logger/brokerlogger/memory/add.js   |   39 -
 .../management/logger/brokerlogger/memory/show.js  |   40 -
 .../js/qpid/management/logger/brokerlogger/show.js |   55 +-
 .../management/logger/brokerlogger/syslog/add.js   |   42 -
 .../management/logger/brokerlogger/syslog/show.js  |   41 -
 .../management/logger/virtualhostlogger/add.js     |   24 +-
 .../logger/virtualhostlogger/file/add.js           |   42 -
 .../logger/virtualhostlogger/file/show.js          |   47 -
 .../management/logger/virtualhostlogger/show.js    |   28 +-
 .../logger/virtualhostlogger/syslog/add.js         |   42 -
 .../logger/virtualhostlogger/syslog/show.js        |   41 -
 .../brokerloginclusionrule/nameandlevel/add.js     |   51 -
 .../nameandlevel/add.js                            |   51 -
 .../js/qpid/management/moveCopyMessages.js         |  169 +-
 .../js/qpid/management/plugin/managementhttp.js    |  128 +-
 .../qpid/management/plugin/managementhttp/edit.js  |  172 +-
 .../js/qpid/management/plugin/managementjmx.js     |  104 -
 .../qpid/management/plugin/managementjmx/edit.js   |  124 --
 .../resources/js/qpid/management/port/amqp/show.js |  135 ++
 .../resources/js/qpid/management/port/http/show.js |   43 +
 .../preference/PreferenceBrowserWidget.js          |  423 ++++
 .../preference/PreferenceSaveDialogContent.js      |  168 ++
 .../preferencesprovider/PreferencesProviderForm.js |  207 --
 .../filesystempreferences/add.js                   |   38 -
 .../filesystempreferences/show.js                  |   48 -
 .../js/qpid/management/query/CriteriaPane.js       |  699 ++++++
 .../js/qpid/management/query/DropDownSelect.js     |  125 ++
 .../js/qpid/management/query/OptionsPanel.js       |  395 ++++
 .../qpid/management/query/QueryCreateDialogForm.js |  137 ++
 .../js/qpid/management/query/QueryGrid.js          |  255 +++
 .../js/qpid/management/query/QueryStore.js         |  162 ++
 .../js/qpid/management/query/QueryWidget.js        |  984 +++++++++
 .../js/qpid/management/query/SearchTextBox.js      |   57 +
 .../js/qpid/management/query/StoreUpdater.js       |  238 ++
 .../js/qpid/management/query/WhereCriteria.js      |  295 +++
 .../js/qpid/management/query/WhereExpression.js    |  152 ++
 .../resources/js/qpid/management/showMessage.js    |  325 ++-
 .../store/autogeneratedselfsigned/add.js           |   92 +-
 .../store/autogeneratedselfsigned/show.js          |  113 +-
 .../js/qpid/management/store/filekeystore/add.js   |   94 +-
 .../js/qpid/management/store/filekeystore/show.js  |   12 +-
 .../js/qpid/management/store/filetruststore/add.js |   92 +-
 .../qpid/management/store/filetruststore/show.js   |   12 +-
 .../store/managedcertificatestore/show.js          |  213 +-
 .../qpid/management/store/nonjavakeystore/add.js   |   94 +-
 .../qpid/management/store/nonjavakeystore/show.js  |   46 +-
 .../qpid/management/store/nonjavatruststore/add.js |   90 +-
 .../management/store/nonjavatruststore/show.js     |  104 +-
 .../management/store/sitespecifictruststore/add.js |   94 +-
 .../store/sitespecifictruststore/show.js           |   51 +-
 .../java/resources/js/qpid/management/treeView.js  |  664 +++---
 .../userpreference/UserPreferenceForm.js           |  132 ++
 .../management/virtualhost/providedstore/add.js    |   24 +-
 .../management/virtualhost/providedstore/edit.js   |   31 +-
 .../management/virtualhost/providedstore/show.js   |   10 +-
 .../virtualhostalias/defaultalias/add.js           |   45 +
 .../virtualhostalias/hostnamealias/add.js          |   47 +
 .../management/virtualhostalias/namealias/add.js   |   45 +
 .../virtualhostalias/patternmatchingalias/add.js   |   47 +
 .../js/qpid/management/virtualhostnode/json/add.js |   10 +-
 .../qpid/management/virtualhostnode/json/edit.js   |   28 +-
 .../qpid/management/virtualhostnode/json/show.js   |   33 +-
 .../java/resources/js/qpid/sasl/Authenticator.js   |  123 ++
 .../js/qpid/sasl/CredentialBasedSaslClient.js      |  123 ++
 .../main/java/resources/js/qpid/sasl/SaslClient.js |   68 +
 .../java/resources/js/qpid/sasl/ShaSaslClient.js   |  269 +++
 .../js/qpid/sasl/UsernamePasswordProvider.js       |   41 +
 .../js/qpid/sasl/cram-md5-hex/SaslClient.js        |   46 +
 .../resources/js/qpid/sasl/cram-md5/SaslClient.js  |  120 +
 .../resources/js/qpid/sasl/plain/SaslClient.js     |   92 +
 .../js/qpid/sasl/scram-sha-1/SaslClient.js         |   36 +
 .../js/qpid/sasl/scram-sha-256/SaslClient.js       |   36 +
 .../src/main/java/resources/login.html             |  111 +-
 .../src/main/java/resources/logout.html            |   41 +-
 .../java/resources/plugin/managementhttp/edit.html |   61 +-
 .../java/resources/plugin/managementjmx/edit.html  |   58 -
 .../java/resources/plugin/showManagementHttp.html  |   19 +
 .../java/resources/plugin/showManagementJmx.html   |   32 -
 .../src/main/java/resources/port/amqp/show.html    |   29 +
 .../src/main/java/resources/port/http/show.html    |   22 +
 .../preference/PreferenceBrowserWidget.html        |   32 +
 .../preference/PreferenceSaveDialogContent.html    |   77 +
 .../filesystempreferences/add.html                 |   37 -
 .../filesystempreferences/show.html                |   21 -
 .../preferencesProviderForm.html                   |   62 -
 .../main/java/resources/query/CriteriaPane.html    |   42 +
 .../main/java/resources/query/OptionsPanel.html    |   44 +
 .../java/resources/query/QueryCloneDialogForm.html |   55 +
 .../resources/query/QueryCreateDialogForm.html     |   71 +
 .../src/main/java/resources/query/QueryWidget.html |  125 ++
 .../main/java/resources/query/WhereCriteria.html   |   75 +
 .../java/resources/showAccessControlProvider.html  |    4 +
 .../src/main/java/resources/showAuthProvider.html  |    4 +-
 .../src/main/java/resources/showBroker.html        |    6 +-
 .../java/resources/showDashboardBrowserTab.html    |   21 +
 .../src/main/java/resources/showDashboardTab.html  |   20 +
 .../src/main/java/resources/showGroupProvider.html |    2 +-
 .../src/main/java/resources/showMessage.html       |   36 +-
 .../src/main/java/resources/showPort.html          |   12 +-
 .../src/main/java/resources/showPreferences.html   |   79 -
 .../java/resources/showPreferencesProvider.html    |   38 -
 .../main/java/resources/showQueryBrowserTab.html   |   20 +
 .../src/main/java/resources/showQueryTab.html      |   22 +
 .../src/main/java/resources/showQueue.html         |    5 +
 .../src/main/java/resources/showTrustStore.html    |   50 +
 .../src/main/java/resources/showVirtualHost.html   |   13 +-
 .../src/main/java/resources/store/keystore.html    |   19 +
 .../java/resources/store/nonjavakeystore/show.html |    4 +-
 .../store/sitespecifictruststore/show.html         |    4 +-
 .../src/main/java/resources/store/truststore.html  |   30 +
 .../userpreference/UserPreferenceForm.html         |   65 +
 .../virtualhostalias/defaultalias/add.html         |   21 +
 .../virtualhostalias/hostnamealias/add.html        |   33 +
 .../resources/virtualhostalias/namealias/add.html  |   21 +
 .../virtualhostalias/patternmatchingalias/add.html |   45 +
 .../src/main/resources-maven/dojoconfig.properties |    2 +
 .../management/plugin/GunzipOutputStreamTest.java  |  108 +
 .../auth/OAuth2InteractiveAuthenticatorTest.java   |  403 ++++
 .../auth/OAuth2PreemptiveAuthenticatorTest.java    |  145 ++
 .../PreemptiveSessionInvalidationFilterTest.java   |   61 +
 .../management/plugin/report/ReportRunnerTest.java |    5 +-
 .../servlet/query/ConfiguredObjectQueryTest.java   |  708 ++++++
 .../rest/ConfiguredObjectToMapConverterTest.java   |  253 +--
 .../plugin/servlet/rest/RequestInfoParserTest.java |  339 +++
 .../rest/RestUserPreferenceHandlerTest.java        |  938 ++++++++
 .../plugin/session/LoginLogoutReporterTest.java    |    3 +-
 broker-plugins/management-jmx/pom.xml              |   76 -
 .../apache/qpid/server/jmx/AMQManagedObject.java   |   84 -
 .../qpid/server/jmx/DefaultManagedObject.java      |  185 --
 .../qpid/server/jmx/JMXManagedObjectRegistry.java  |  541 -----
 .../qpid/server/jmx/JMXManagementPlugin.java       |   35 -
 .../qpid/server/jmx/JMXManagementPluginImpl.java   |  545 -----
 .../apache/qpid/server/jmx/MBeanIntrospector.java  |  400 ----
 .../server/jmx/MBeanInvocationHandlerImpl.java     |  384 ----
 .../org/apache/qpid/server/jmx/MBeanProvider.java  |   53 -
 .../org/apache/qpid/server/jmx/ManagedObject.java  |   57 -
 .../qpid/server/jmx/ManagedObjectRegistry.java     |   48 -
 .../server/jmx/ManagementLogonLogoffReporter.java  |  140 --
 .../server/jmx/QpidRMIServerSocketFactory.java     |   59 -
 .../server/jmx/QpidSslRMIServerSocketFactory.java  |  135 --
 .../RegistryProtectingRMIServerSocketFactory.java  |   96 -
 .../apache/qpid/server/jmx/UsernameAccessor.java   |   28 -
 .../server/jmx/UsernameCachingRMIJRMPServer.java   |   97 -
 .../mbeans/AbstractStatisticsGatheringMBean.java   |  201 --
 .../qpid/server/jmx/mbeans/ConnectionMBean.java    |  205 --
 .../qpid/server/jmx/mbeans/ExchangeMBean.java      |  330 ---
 .../server/jmx/mbeans/LoggingManagementMBean.java  |  350 ---
 .../apache/qpid/server/jmx/mbeans/QueueMBean.java  |  717 ------
 .../server/jmx/mbeans/ServerInformationMBean.java  |  113 -
 .../apache/qpid/server/jmx/mbeans/Shutdown.java    |  143 --
 .../qpid/server/jmx/mbeans/ShutdownMBean.java      |   58 -
 .../server/jmx/mbeans/UserManagementMBean.java     |  193 --
 .../qpid/server/jmx/mbeans/VirtualHostMBean.java   |  298 ---
 .../server/jmx/mbeans/VirtualHostManagerMBean.java |  318 ---
 .../jmx/ManagementLogonLogoffReporterTest.java     |  124 --
 .../qpid/server/jmx/NoopManagedObjectRegistry.java |   46 -
 .../server/jmx/mbeans/ConnectionMBeanTest.java     |  233 --
 .../qpid/server/jmx/mbeans/ExchangeMBeanTest.java  |  233 --
 .../jmx/mbeans/LoggingManagementMBeanTest.java     |  324 ---
 .../qpid/server/jmx/mbeans/MBeanTestUtils.java     |   76 -
 .../qpid/server/jmx/mbeans/QueueMBeanTest.java     |  491 -----
 .../jmx/mbeans/ServerInformationMBeanTest.java     |   89 -
 .../server/jmx/mbeans/UserManagementMBeanTest.java |  156 --
 .../jmx/mbeans/VirtualHostManagerMBeanTest.java    |  268 ---
 broker-plugins/memory-store/pom.xml                |    4 +-
 .../qpid/server/store/MemorySystemConfigImpl.java  |    4 +-
 .../js/qpid/management/virtualhost/memory/add.js   |    8 +-
 .../js/qpid/management/virtualhost/memory/edit.js  |   18 +-
 .../js/qpid/management/virtualhost/memory/show.js  |   10 +-
 .../qpid/management/virtualhostnode/memory/add.js  |    8 +-
 .../qpid/management/virtualhostnode/memory/edit.js |   18 +-
 .../qpid/management/virtualhostnode/memory/show.js |   12 +-
 broker-plugins/websocket/pom.xml                   |    4 +-
 .../transport/websocket/WebSocketProvider.java     |  155 +-
 broker/bin/qpid-server                             |   20 +-
 broker/bin/qpid-server.bat                         |    2 +-
 broker/etc/broker_example.acl                      |   26 -
 broker/pom.xml                                     |   25 +-
 broker/src/main/assembly/NOTICE                    |    4 +-
 .../dependency-verification/DEPENDENCIES_REFERENCE |   53 +-
 .../main/java/org/apache/qpid/server/Broker.java   |  310 +++
 .../src/main/java/org/apache/qpid/server/Main.java |   32 +-
 .../java/org/apache/qpid/server/BrokerTest.java    |  161 ++
 .../test/java/org/apache/qpid/server/MainTest.java |   30 -
 client/example/pom.xml                             |    4 +-
 .../java/org/apache/qpid/example/hello.properties  |    1 +
 client/pom.xml                                     |    4 +-
 client/src/main/assembly/NOTICE                    |    2 +-
 .../dependency-verification/DEPENDENCIES_REFERENCE |    5 +-
 .../org/apache/qpid/client/AMQAnyDestination.java  |    1 +
 .../java/org/apache/qpid/client/AMQConnection.java |  441 ++--
 .../apache/qpid/client/AMQConnectionDelegate.java  |    2 +
 .../qpid/client/AMQConnectionDelegate_0_10.java    |   82 +-
 .../qpid/client/AMQConnectionDelegate_8_0.java     |   14 +-
 .../org/apache/qpid/client/AMQDestination.java     |   29 +-
 .../org/apache/qpid/client/AMQProtocolHandler.java |  101 +-
 .../java/org/apache/qpid/client/AMQSession.java    |   52 +-
 .../org/apache/qpid/client/AMQSession_0_10.java    |   11 +-
 .../org/apache/qpid/client/AMQSession_0_8.java     |   67 +-
 .../main/java/org/apache/qpid/client/AMQTopic.java |   35 +-
 .../apache/qpid/client/BasicMessageConsumer.java   |    4 +
 .../qpid/client/BasicMessageConsumer_0_10.java     |    2 +-
 .../qpid/client/BasicMessageConsumer_0_8.java      |   12 +-
 .../qpid/client/BasicMessageProducer_0_10.java     |    4 +-
 .../qpid/client/BasicMessageProducer_0_8.java      |    6 +-
 .../java/org/apache/qpid/client/BrokerDetails.java |    1 +
 .../org/apache/qpid/client/FailoverHandler.java    |    5 +-
 .../qpid/client/filter/JMSSelectorFilter.java      |    5 +-
 .../handler/ConnectionStartMethodHandler.java      |    2 +-
 .../client/message/Encrypted091MessageFactory.java |    5 +-
 .../client/message/UnprocessedMessage_0_8.java     |    5 +
 .../client/messaging/address/AddressHelper.java    |    5 +
 .../apache/qpid/client/messaging/address/Link.java |   17 +-
 .../security/scram/AbstractScramSaslClient.java    |    6 +-
 .../java/org/apache/qpid/jms/ConnectionURL.java    |    1 +
 .../apache/qpid/client/AMQConnectionUnitTest.java  |    1 -
 .../message/Encrypted010MessageFactoryTest.java    |    2 +-
 .../message/Encrypted091MessageFactoryTest.java    |    8 +-
 .../security/oauth2/OAuth2SaslClientTest.java      |    3 -
 .../apache/qpid/client/transport/MockSender.java   |   46 -
 .../client/transport/TestNetworkConnection.java    |    6 +-
 common/pom.xml                                     |   17 +-
 common/readme.txt                                  |    6 +-
 common/src/main/grammar/SelectorParser.jj          |   25 +-
 .../org/apache/qpid/bytebuffer/BufferPool.java     |   17 +-
 .../qpid/bytebuffer/PooledByteBufferRef.java       |    8 +
 .../org/apache/qpid/bytebuffer/QpidByteBuffer.java |  729 +++---
 .../qpid/bytebuffer/QpidByteBufferInputStream.java |  109 +
 .../bytebuffer/QpidByteBufferOutputStream.java     |    5 +
 .../java/org/apache/qpid/codec/AMQDecoder.java     |   84 +-
 .../java/org/apache/qpid/codec/ClientDecoder.java  |   69 +-
 .../org/apache/qpid/codec/MarkableDataInput.java   |   45 -
 .../java/org/apache/qpid/codec/ServerDecoder.java  |    8 +-
 .../qpid/configuration/ClientProperties.java       |    8 +-
 .../qpid/configuration/CommonProperties.java       |    9 +-
 .../apache/qpid/filter/ArithmeticExpression.java   |   26 +-
 .../org/apache/qpid/filter/BinaryExpression.java   |   12 +-
 .../org/apache/qpid/filter/BooleanExpression.java  |    6 +-
 .../apache/qpid/filter/ComparisonExpression.java   |  118 +-
 .../org/apache/qpid/filter/ConstantExpression.java |   41 +-
 .../java/org/apache/qpid/filter/Expression.java    |    6 +-
 .../qpid/filter/JMSMessagePropertyExpression.java  |  241 ++
 .../org/apache/qpid/filter/LogicExpression.java    |   28 +-
 .../org/apache/qpid/filter/OrderByExpression.java  |   61 +
 .../org/apache/qpid/filter/PropertyExpression.java |  207 +-
 .../qpid/filter/PropertyExpressionFactory.java     |   26 +
 .../org/apache/qpid/filter/UnaryExpression.java    |  129 +-
 .../qpid/filter/selector/SelectorParser.java       |   69 +-
 .../selector/SelectorParserTokenManager.java       |   48 +-
 .../main/java/org/apache/qpid/framing/AMQBody.java |   11 +-
 .../java/org/apache/qpid/framing/AMQDataBlock.java |   12 +-
 .../java/org/apache/qpid/framing/AMQFrame.java     |   69 +-
 .../org/apache/qpid/framing/AMQMethodBody.java     |   46 +-
 .../org/apache/qpid/framing/AMQMethodBodyImpl.java |  113 +-
 .../org/apache/qpid/framing/AMQShortString.java    |   62 +-
 .../main/java/org/apache/qpid/framing/AMQType.java |  155 +-
 .../org/apache/qpid/framing/AMQTypedValue.java     |   34 +-
 .../org/apache/qpid/framing/AccessRequestBody.java |   22 +-
 .../apache/qpid/framing/AccessRequestOkBody.java   |   18 +-
 .../java/org/apache/qpid/framing/BasicAckBody.java |   22 +-
 .../org/apache/qpid/framing/BasicCancelBody.java   |   22 +-
 .../org/apache/qpid/framing/BasicCancelOkBody.java |   18 +-
 .../org/apache/qpid/framing/BasicConsumeBody.java  |   29 +-
 .../apache/qpid/framing/BasicConsumeOkBody.java    |   18 +-
 .../qpid/framing/BasicContentHeaderProperties.java |  132 +-
 .../org/apache/qpid/framing/BasicDeliverBody.java  |   31 +-
 .../java/org/apache/qpid/framing/BasicGetBody.java |   24 +-
 .../org/apache/qpid/framing/BasicGetEmptyBody.java |   19 +-
 .../org/apache/qpid/framing/BasicGetOkBody.java    |   31 +-
 .../org/apache/qpid/framing/BasicNackBody.java     |   22 +-
 .../org/apache/qpid/framing/BasicPublishBody.java  |   28 +-
 .../java/org/apache/qpid/framing/BasicQosBody.java |   25 +-
 .../org/apache/qpid/framing/BasicQosOkBody.java    |   12 +-
 .../org/apache/qpid/framing/BasicRecoverBody.java  |   19 +-
 .../apache/qpid/framing/BasicRecoverSyncBody.java  |   20 +-
 .../qpid/framing/BasicRecoverSyncOkBody.java       |    6 +-
 .../org/apache/qpid/framing/BasicRejectBody.java   |   22 +-
 .../org/apache/qpid/framing/BasicReturnBody.java   |   28 +-
 .../apache/qpid/framing/ByteArrayDataInput.java    |  203 --
 .../apache/qpid/framing/ByteBufferDataInput.java   |  172 --
 .../qpid/framing/ByteBufferListDataInput.java      |  309 ---
 .../org/apache/qpid/framing/ChannelAlertBody.java  |   23 +-
 .../org/apache/qpid/framing/ChannelCloseBody.java  |   28 +-
 .../apache/qpid/framing/ChannelCloseOkBody.java    |   12 +-
 .../org/apache/qpid/framing/ChannelFlowBody.java   |   19 +-
 .../org/apache/qpid/framing/ChannelFlowOkBody.java |   18 +-
 .../org/apache/qpid/framing/ChannelOpenBody.java   |   20 +-
 .../org/apache/qpid/framing/ChannelOpenOkBody.java |   13 +-
 .../apache/qpid/framing/CompositeAMQDataBlock.java |   13 +-
 .../org/apache/qpid/framing/ConfirmSelectBody.java |   18 +-
 .../apache/qpid/framing/ConfirmSelectOkBody.java   |    6 +-
 .../apache/qpid/framing/ConnectionCloseBody.java   |   27 +-
 .../apache/qpid/framing/ConnectionCloseOkBody.java |    6 +-
 .../apache/qpid/framing/ConnectionOpenBody.java    |   23 +-
 .../apache/qpid/framing/ConnectionOpenOkBody.java  |   16 +-
 .../qpid/framing/ConnectionRedirectBody.java       |   20 +-
 .../apache/qpid/framing/ConnectionSecureBody.java  |   16 +-
 .../qpid/framing/ConnectionSecureOkBody.java       |   15 +-
 .../apache/qpid/framing/ConnectionStartBody.java   |   15 +-
 .../apache/qpid/framing/ConnectionStartOkBody.java |   15 +-
 .../apache/qpid/framing/ConnectionTuneBody.java    |   23 +-
 .../apache/qpid/framing/ConnectionTuneOkBody.java  |   23 +-
 .../java/org/apache/qpid/framing/ContentBody.java  |   29 +-
 .../org/apache/qpid/framing/ContentHeaderBody.java |   58 +-
 .../framing/ContentHeaderPropertiesFactory.java    |    9 +-
 .../org/apache/qpid/framing/EncodingUtils.java     |  730 +-----
 .../org/apache/qpid/framing/ExchangeBoundBody.java |   24 +-
 .../apache/qpid/framing/ExchangeBoundOkBody.java   |   21 +-
 .../apache/qpid/framing/ExchangeDeclareBody.java   |   29 +-
 .../apache/qpid/framing/ExchangeDeclareOkBody.java |   12 +-
 .../apache/qpid/framing/ExchangeDeleteBody.java    |   24 +-
 .../apache/qpid/framing/ExchangeDeleteOkBody.java  |   12 +-
 .../java/org/apache/qpid/framing/FieldArray.java   |   21 +-
 .../java/org/apache/qpid/framing/FieldTable.java   |   53 +-
 .../org/apache/qpid/framing/FieldTableFactory.java |    3 -
 .../org/apache/qpid/framing/HeartbeatBody.java     |   15 +-
 .../apache/qpid/framing/ProtocolInitiation.java    |   48 +-
 .../org/apache/qpid/framing/QueueBindBody.java     |   32 +-
 .../org/apache/qpid/framing/QueueBindOkBody.java   |   12 +-
 .../org/apache/qpid/framing/QueueDeclareBody.java  |   26 +-
 .../apache/qpid/framing/QueueDeclareOkBody.java    |   25 +-
 .../org/apache/qpid/framing/QueueDeleteBody.java   |   25 +-
 .../org/apache/qpid/framing/QueueDeleteOkBody.java |   19 +-
 .../org/apache/qpid/framing/QueuePurgeBody.java    |   25 +-
 .../org/apache/qpid/framing/QueuePurgeOkBody.java  |   19 +-
 .../org/apache/qpid/framing/QueueUnbindBody.java   |   29 +-
 .../org/apache/qpid/framing/QueueUnbindOkBody.java |   12 +-
 .../java/org/apache/qpid/framing/TxCommitBody.java |    6 +-
 .../org/apache/qpid/framing/TxCommitOkBody.java    |    6 +-
 .../org/apache/qpid/framing/TxRollbackBody.java    |    6 +-
 .../org/apache/qpid/framing/TxRollbackOkBody.java  |    6 +-
 .../java/org/apache/qpid/framing/TxSelectBody.java |    6 +-
 .../org/apache/qpid/framing/TxSelectOkBody.java    |    6 +-
 .../qpid/properties/ConnectionStartProperties.java |    2 +
 .../apache/qpid/transport/ByteBufferSender.java    |    1 +
 .../org/apache/qpid/transport/ClientDelegate.java  |    2 +-
 .../java/org/apache/qpid/transport/Connection.java |   10 +-
 .../apache/qpid/transport/ConnectionSettings.java  |   10 +-
 .../org/apache/qpid/transport/MessageTransfer.java |    1 -
 .../java/org/apache/qpid/transport/Method.java     |    2 -
 .../org/apache/qpid/transport/ProtocolHeader.java  |    2 -
 .../org/apache/qpid/transport/codec/Encoder.java   |    1 -
 .../qpid/transport/network/AggregateTicker.java    |   66 -
 .../qpid/transport/network/Disassembler.java       |  210 +-
 .../transport/network/io/IoNetworkTransport.java   |   88 +-
 .../apache/qpid/transport/network/io/IoSender.java |    6 +
 .../network/security/SecurityLayerFactory.java     |   57 +-
 .../network/security/sasl/SASLSender.java          |    6 +
 .../transport/network/security/ssl/SSLSender.java  |   59 +-
 .../transport/network/security/ssl/SSLUtil.java    |   43 +-
 .../org/apache/qpid/transport/util/Functions.java  |    1 -
 .../main/java/org/apache/qpid/url/BindingURL.java  |    4 +-
 .../org/apache/qpid/util/ByteBufferDataOutput.java |  145 --
 .../java/org/apache/qpid/util/BytesDataOutput.java |  178 --
 .../main/java/org/apache/qpid/util/Strings.java    |   24 +
 .../apache/qpid/bytebuffer/QpidByteBufferTest.java |  738 ++++++-
 .../java/org/apache/qpid/codec/AMQDecoderTest.java |   99 +-
 .../framing/BasicContentHeaderPropertiesTest.java  |   14 +-
 .../org/apache/qpid/framing/FieldTableTest.java    |   19 +-
 .../org/apache/qpid/ssl/SSLContextFactoryTest.java |   35 +-
 .../java/org/apache/qpid/ssl/TrustManagerTest.java |   60 +-
 .../network/security/ssl/SSLUtilTest.java          | 2314 ++++++++++++--------
 doc/docbook4to5.sh                                 |   21 +-
 doc/java-broker/pom.xml                            |    6 +-
 .../src/docbkx/AMQP-Messaging-Broker-Java-Book.xml |    2 +-
 .../Java-Broker-Appendix-Environment-Variables.xml |    2 +-
 ...roker-Appendix-Operational-Logging-Messages.xml |   59 +-
 .../src/docbkx/Java-Broker-Backup-And-Recovery.xml |   31 +-
 .../src/docbkx/Java-Broker-Getting-Started.xml     |    6 +-
 .../src/docbkx/Java-Broker-High-Availability.xml   |   24 +-
 .../docbkx/Java-Broker-Initial-Configuration.xml   |   11 +-
 .../src/docbkx/Java-Broker-Installation.xml        |   17 +-
 .../src/docbkx/Java-Broker-Introduction.xml        |   10 +-
 doc/java-broker/src/docbkx/Java-Broker-Runtime.xml |    1 +
 .../concepts/Java-Broker-Concepts-Exchanges.xml    |    8 +-
 .../Java-Broker-Management-Channel-REST-API.xml    |   25 +-
 ...va-Broker-Management-Channel-REST-Query-API.xml |  285 +++
 ...anagement-Managing-Authentication-Providers.xml |    5 +-
 .../Java-Broker-Management-Managing-Broker.xml     |    5 +-
 .../Java-Broker-Management-Managing-Keystores.xml  |    4 +-
 ...ava-Broker-Management-Managing-Plugins-HTTP.xml |   12 +
 ...Java-Broker-Management-Managing-Truststores.xml |   34 +-
 ...Broker-Management-Managing-VirtualhostNodes.xml |    2 +-
 .../Java-Broker-Runtime-Close-On-No-Route.xml      |    6 +-
 .../runtime/Java-Broker-Runtime-Consumers.xml      |   91 +
 ...Disk-Space-Management-Producer-Flow-Control.xml |    2 +-
 .../runtime/Java-Broker-Runtime-Flow-To-Disk.xml   |   10 +-
 .../runtime/Java-Broker-Runtime-Log-Files.xml      |    2 +-
 .../docbkx/runtime/Java-Broker-Runtime-Memory.xml  |   33 +-
 .../Java-Broker-Runtime-Message-Compression.xml    |    2 +-
 .../docbkx/security/Java-Broker-Security-ACLs.xml  |    2 +-
 ...oker-Security-Authentication-Providers-LDAP.xml |   27 +-
 ...er-Security-Authentication-Providers-OAuth2.xml |   46 +
 ...va-Broker-Security-Authentication-Providers.xml |    5 +-
 .../Java-Broker-Security-Group-Providers.xml       |   19 +-
 doc/java-perftests/pom.xml                         |    6 +-
 .../src/docbkx/JMS-Performance-Test-Framework.xml  |    2 +-
 doc/jms-client-0-10/pom.xml                        |    6 +-
 .../src/docbkx/JMS-Client-0-10-Book.xml            |   81 +-
 doc/jms-client-0-8/pom.xml                         |    6 +-
 .../src/docbkx/JMS-Client-Appendix-Exceptions.xml  |   11 +-
 .../src/docbkx/JMS-Client-Binding-URL.xml          |   16 +-
 doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml  |    3 +-
 .../src/docbkx/JMS-Client-Connection-URL.xml       |   56 +
 ...Client-Document-Scope-And-Intended-Audience.xml |   18 +-
 .../src/docbkx/JMS-Client-Examples.xml             |    4 +-
 .../docbkx/JMS-Client-Getting-And-Dependencies.xml |    8 +-
 .../src/docbkx/JMS-Client-Introduction.xml         |   18 +-
 .../docbkx/JMS-Client-JNDI-Properties-Format.xml   |    2 +-
 .../src/docbkx/JMS-Client-Logging.xml              |    6 +-
 .../src/docbkx/JMS-Client-Message-Encryption.xml   |  393 ++++
 .../src/docbkx/JMS-Client-System-Properties.xml    |   21 +-
 .../src/docbkx/JMS-Client-Understanding.xml        |   47 +-
 doc/pom.xml                                        |    4 +-
 etc/IntelliJ_Copyright_ApacheLicense.xml           |   28 +
 etc/IntelliJ_Qpid_Style.xml                        |   39 +-
 jca/README-JBOSS.txt                               |    7 +-
 jca/README.txt                                     |    8 +-
 jca/example/README-EXAMPLE.txt                     |    2 +-
 jca/pom.xml                                        |   15 +-
 jca/rar/pom.xml                                    |    4 +-
 joramtests/pom.xml                                 |    6 +-
 management/common/pom.xml                          |   45 -
 .../common/src/main/java/management-common.bnd     |   27 -
 .../management/common/JMXConnnectionFactory.java   |  289 ---
 .../common/mbeans/LoggingManagement.java           |  163 --
 .../management/common/mbeans/ManagedBroker.java    |  266 ---
 .../common/mbeans/ManagedConnection.java           |  249 ---
 .../management/common/mbeans/ManagedExchange.java  |  149 --
 .../management/common/mbeans/ManagedQueue.java     |  535 -----
 .../common/mbeans/ServerInformation.java           |  202 --
 .../management/common/mbeans/UserManagement.java   |  129 --
 .../common/mbeans/annotations/MBeanAttribute.java  |   41 -
 .../mbeans/annotations/MBeanConstructor.java       |   39 -
 .../mbeans/annotations/MBeanDescription.java       |   38 -
 .../common/mbeans/annotations/MBeanOperation.java  |   42 -
 .../annotations/MBeanOperationParameter.java       |   37 -
 .../sasl/CRAMMD5HashedSaslClientFactory.java       |   59 -
 .../management/common/sasl/ClientSaslFactory.java  |   53 -
 .../qpid/management/common/sasl/Constants.java     |   33 -
 .../qpid/management/common/sasl/JCAProvider.java   |   55 -
 .../management/common/sasl/PlainSaslClient.java    |  212 --
 .../qpid/management/common/sasl/SaslProvider.java  |   35 -
 .../common/sasl/UserPasswordCallbackHandler.java   |   79 -
 .../UsernameHashedPasswordCallbackHandler.java     |  109 -
 .../management/common/mbeans/ManagedQueueTest.java |   78 -
 management/example/pom.xml                         |   53 -
 .../apache/qpid/example/jmxexample/AddQueue.java   |  152 --
 .../jmxexample/DeleteMessagesFromTopOfTmp.java     |  119 -
 .../qpid/example/jmxexample/QueueInformation.java  |  370 ----
 .../combined_persistent_transaction.chartdef       |   47 -
 .../combined_persistent_transaction_plain.chartdef |   43 +
 .../combined_persistent_transaction_ssl.chartdef   |   43 +
 .../timeseries/combined_transient_autoack.chartdef |   47 -
 .../combined_transient_autoack_plain.chartdef      |   43 +
 .../combined_transient_autoack_ssl.chartdef        |   43 +
 .../combined_transient_transaction_plain.chartdef  |   43 +
 .../combined_transient_transaction_ssl.chartdef    |   43 +
 perftests/etc/json_config_tool.py                  |    4 +-
 .../etc/perftests-jndi-qpid-jms-client.properties  |   30 +
 perftests/etc/perftests-jndi.properties            |    8 +-
 perftests/etc/testdefs/defaultTests.js             |  160 +-
 perftests/pom.xml                                  |   86 +-
 perftests/src/main/assembly/NOTICE                 |    4 +-
 .../dependency-verification/DEPENDENCIES_REFERENCE |   19 +-
 perftests/src/main/java/json2.js                   |  529 ++---
 .../org/apache/qpid/disttest/AbstractRunner.java   |    7 +-
 .../org/apache/qpid/disttest/ControllerRunner.java |    4 +
 .../qpid/disttest/client/ConsumerParticipant.java  |    7 +-
 .../qpid/disttest/controller/HillClimber.java      |  172 +-
 .../controller/HillClimbingTestRunner.java         |    4 +-
 .../disttest/controller/config/SessionConfig.java  |    2 -
 .../qpid/disttest/jms/ClientJmsDelegate.java       |   13 +
 .../qpid/disttest/jms/ControllerJmsDelegate.java   |   23 +-
 .../qpid/disttest/jms/QpidRestAPIQueueCreator.java |  238 ++
 .../disttest/results/CompositeResultsWriter.java   |    2 +-
 .../qpid/disttest/results/ResultsCsvWriter.java    |    1 -
 .../disttest/results/formatting/CSVFormatter.java  |    2 +-
 perftests/src/main/java/test-utils.js              |   36 +-
 .../disttest/client/ParticipantExecutorTest.java   |    2 -
 .../qpid/disttest/controller/HillClimberTest.java  |   95 +
 .../controller/OrdinaryTestRunnerTest.java         |    2 -
 .../config/ConfigReaderTest-test-config.js         |   45 +-
 .../JavaScriptConfigEvaluatorTest-test-config.js   |   29 +-
 .../disttest/results/ResultsCsvWriterTest.java     |    2 -
 .../disttest/results/ResultsXmlWriterTest.java     |    4 -
 perftests/visualisation-jfc/pom.xml                |    4 +-
 .../visualisation-jfc/src/main/assembly/NOTICE     |    2 +-
 .../charting/chartbuilder/BaseChartBuilder.java    |   19 +
 .../chartbuilder/XYDataSetBasedChartBuilder.java   |    1 -
 .../charting/definition/ChartingDefinition.java    |   19 +-
 .../definition/ChartingDefinitionCreator.java      |   10 +-
 .../charting/chartbuilder/ChartProductionTest.java |    9 +
 pom.xml                                            |   99 +-
 qpid-perftests-systests/pom.xml                    |    4 +-
 .../disttest/DistributedTestSystemTestBase.java    |   67 -
 .../systest/disttest/QpidQueueCreatorTest.java     |    5 +-
 .../systest/disttest/endtoend/EndToEndTest.java    |   14 +-
 .../qpid/systest/disttest/endtoend/hillclimbing.js |   97 +-
 .../systest/disttest/perftests.systests.properties |    2 +-
 qpid-systests-parent/pom.xml                       |    9 +-
 qpid-test-utils/pom.xml                            |    4 +-
 .../utils/LogbackPropertyValueDiscriminator.java   |   63 +
 .../org/apache/qpid/test/utils/PortHelper.java     |    5 +-
 .../org/apache/qpid/test/utils/QpidTestCase.java   |   79 +-
 .../org/apache/qpid/test/utils/TCPTunneler.java    |   14 +-
 .../apache/qpid/test/utils/TestSSLConstants.java   |    6 +-
 qpid-test-utils/src/main/resources/logback.xml     |    2 +-
 specs/LICENSE                                      |  202 --
 specs/NOTICE                                       |    7 -
 systests/etc/config-systests.json                  |   19 +-
 systests/pom.xml                                   |   16 +-
 .../java/org/apache/qpid/systest/rest/Asserts.java |    4 +-
 .../apache/qpid/systest/rest/QpidRestTestCase.java |   42 +-
 .../apache/qpid/systest/rest/RestTestHelper.java   |  174 +-
 .../qpid/test/utils/AbstractBrokerHolder.java      |  276 +++
 .../qpid/test/utils/BrokerCommandHelper.java       |    3 +-
 .../org/apache/qpid/test/utils/BrokerHolder.java   |   16 +-
 .../qpid/test/utils/InternalBrokerHolder.java      |   84 +-
 .../org/apache/qpid/test/utils/JMXTestUtils.java   |  452 ----
 .../apache/qpid/test/utils/QpidBrokerTestCase.java | 1428 ++++--------
 .../qpid/test/utils/SpawnedBrokerHolder.java       |  171 +-
 .../qpid/test/utils/TestBrokerConfiguration.java   |  296 +--
 systests/src/main/resources/logback-test.xml       |    4 +-
 .../qpid/client/AMQQueueDeferredOrderingTest.java  |   72 +-
 .../java/org/apache/qpid/client/HeartbeatTest.java |   10 +-
 .../qpid/client/connection/ExistingSocketTest.java |   73 +
 .../client/failover/FailoverBehaviourTest.java     |  247 +--
 .../failover/MultipleBrokersFailoverTest.java      |   87 +-
 .../java/org/apache/qpid/client/ssl/SSLTest.java   |   99 +-
 .../org/apache/qpid/jms/xa/XAResourceTest.java     |   77 +-
 .../org/apache/qpid/ra/QpidRAConnectionTest.java   |   13 +-
 .../org/apache/qpid/ra/QpidRAXAResourceTest.java   |    9 +-
 .../ra/admin/QpidConnectionFactoryProxyTest.java   |   15 +-
 .../qpid/server/AbruptClientDisconnectTest.java    |    4 +-
 .../org/apache/qpid/server/BrokerStartupTest.java  |   57 +-
 .../ReturnUnroutableMandatoryMessageTest.java      |   11 -
 .../qpid/server/failover/FailoverMethodTest.java   |   27 +-
 .../apache/qpid/server/logging/AlertingTest.java   |   49 +-
 .../qpid/server/logging/BindingLoggingTest.java    |    8 +-
 .../qpid/server/logging/BrokerLoggingTest.java     |  101 +-
 .../qpid/server/logging/ChannelLoggingTest.java    |    4 +-
 .../qpid/server/logging/QueueLoggingTest.java      |  112 +-
 .../server/logging/VirtualHostLoggingTest.java     |    7 +-
 .../persistent/NoLocalAfterRecoveryTest.java       |    4 +-
 .../qpid/server/queue/ConsumerPriorityTest.java    |  182 ++
 .../qpid/server/queue/LastValueQueueTest.java      |    4 +
 .../qpid/server/queue/LiveQueueOperationsTest.java |   25 +-
 .../org/apache/qpid/server/queue/ModelTest.java    |  252 +--
 .../queue/MultipleTransactedBatchProducerTest.java |    2 -
 .../server/queue/NodeAutoCreationPolicyTest.java   |  256 +++
 .../qpid/server/queue/ProducerFlowControlTest.java |  243 +-
 .../server/queue/QueueMessageDurabilityTest.java   |    6 +-
 .../apache/qpid/server/queue/TimeToLiveTest.java   |   26 +-
 .../server/security/acl/AbstractACLTestCase.java   |   36 +-
 .../server/security/acl/ExternalACLJMXTest.java    |  320 ---
 .../qpid/server/security/acl/ExternalACLTest.java  |   75 +-
 .../manager/AbstractAuthenticationManagerTest.java |  102 +
 .../auth/manager/ExternalAuthenticationTest.java   |   92 +-
 .../auth/manager/MD5AuthenticationManagerTest.java |   45 +
 .../MultipleAuthenticationManagersTest.java        |   12 +-
 .../ScramSha1AuthenticationManagerTest.java        |   44 +
 .../ScramSha256AuthenticationManagerTest.java      |   45 +
 .../qpid/server/stats/StatisticsReportingTest.java |   14 +-
 .../qpid/server/store/PersistentStoreTest.java     |   20 +-
 .../apache/qpid/server/store/SplitStoreTest.java   |   12 +-
 .../server/store/VirtualHostMessageStoreTest.java  |  138 +-
 .../qpid/systest/MessageCompressionTest.java       |  329 ++-
 .../management/jmx/BrokerManagementTest.java       |  118 -
 .../management/jmx/ConnectionManagementTest.java   |  320 ---
 .../management/jmx/ExchangeManagementTest.java     |  164 --
 .../systest/management/jmx/MBeanLifeCycleTest.java |  133 --
 .../management/jmx/ManagementActorLoggingTest.java |  482 ----
 .../management/jmx/ManagementLoggingTest.java      |  283 ---
 .../management/jmx/QueueManagementTest.java        |  867 --------
 .../systest/management/jmx/StatisticsTest.java     |  215 --
 .../systest/management/jmx/UserManagementTest.java |  245 ---
 .../UserManagementWithBase64MD5PasswordsTest.java  |   62 -
 .../messageencryption/MessageEncryptionTest.java   |   99 +-
 .../rest/AccessControlProviderRestTest.java        |   47 +-
 .../qpid/systest/rest/AnonymousAccessRestTest.java |   22 +-
 .../rest/AuthenticationProviderRestTest.java       |   92 +-
 .../qpid/systest/rest/BasicAuthRestTest.java       |  122 --
 .../apache/qpid/systest/rest/BindingRestTest.java  |    4 +-
 .../systest/rest/BrokerRestHttpAndHttpsTest.java   |   20 +-
 .../rest/BrokerRestHttpsClientCertAuthTest.java    |   25 +-
 .../qpid/systest/rest/BrokerRestHttpsTest.java     |   14 +-
 .../apache/qpid/systest/rest/BrokerRestTest.java   |  119 +-
 .../systest/rest/CompressedResponsesRestTest.java  |   11 +-
 .../systest/rest/ExportImportMessagesRestTest.java |  187 ++
 .../qpid/systest/rest/GroupProviderRestTest.java   |   10 +-
 .../apache/qpid/systest/rest/GroupRestTest.java    |    5 +-
 .../qpid/systest/rest/HttpManagementRestTest.java  |    6 +-
 .../apache/qpid/systest/rest/MessagesRestTest.java |  258 ++-
 .../org/apache/qpid/systest/rest/PortRestTest.java |  131 +-
 .../qpid/systest/rest/PreemtiveAuthRestTest.java   |  192 ++
 .../systest/rest/PreferencesProviderRestTest.java  |  200 --
 .../qpid/systest/rest/PreferencesRestTest.java     |  114 -
 .../qpid/systest/rest/PublishMessageRestTest.java  |  216 ++
 .../apache/qpid/systest/rest/QueryRestTest.java    |   48 +
 .../org/apache/qpid/systest/rest/SaslRestTest.java |    7 +-
 .../qpid/systest/rest/UserPreferencesRestTest.java |  553 ++++-
 .../org/apache/qpid/systest/rest/UserRestTest.java |   15 +-
 .../systest/rest/VirtualHostLoggerRestTest.java    |    4 +-
 .../qpid/systest/rest/VirtualHostNodeRestTest.java |   25 +-
 .../qpid/systest/rest/VirtualHostRestTest.java     |  171 +-
 .../qpid/systest/rest/acl/BrokerACLTest.java       |   68 +-
 .../qpid/systest/rest/acl/ExchangeRestACLTest.java |  116 +-
 .../qpid/systest/rest/acl/GroupRestACLTest.java    |    6 +-
 .../qpid/systest/rest/acl/QueueRestACLTest.java    |   10 +-
 .../rest/acl/UserPreferencesRestACLTest.java       |  197 --
 .../qpid/systest/rest/acl/UserRestACLTest.java     |   27 +-
 .../qpid/systest/rest/acl/VirtualHostACLTest.java  |   15 +-
 .../VirtualHostAccessControlProviderRestTest.java  |  252 +++
 .../systest/rest/acl/VirtualHostNodeACLTest.java   |   14 +-
 .../CloseOnNoRouteForMandatoryMessageTest.java     |  107 +-
 .../apache/qpid/test/client/FlowControlTest.java   |   90 +-
 .../ImmediateAndMandatoryPublishingTest.java       |   14 +-
 .../UnroutableMessageTestExceptionListener.java    |   64 +-
 .../destination/AddressBasedDestinationTest.java   |   63 +-
 .../qpid/test/client/failover/FailoverTest.java    |  106 +-
 .../test/client/message/JMSDestinationTest.java    |   87 -
 .../qpid/test/client/message/JMSXUserIDTest.java   |    2 +-
 .../qpid/test/unit/ack/ClientAcknowledgeTest.java  |    6 +-
 .../test/unit/basic/FieldTableMessageTest.java     |    4 +-
 .../qpid/test/unit/basic/PropertyValueTest.java    |    1 -
 .../qpid/test/unit/basic/SessionStartTest.java     |   17 +-
 .../client/DynamicQueueExchangeCreateTest.java     |  176 +-
 .../test/unit/client/MaxDeliveryCountTest.java     |   13 +-
 .../BrokerClosesClientConnectionTest.java          |   36 +-
 .../client/connection/ConnectionFactoryTest.java   |    4 +-
 .../unit/client/connection/ConnectionTest.java     |   56 +-
 .../client/connection/ExceptionListenerTest.java   |   11 +-
 .../client/temporaryqueue/TemporaryQueueTest.java  |  129 +-
 .../qpid/test/unit/ct/DurableSubscriberTest.java   |   22 +-
 .../test/unit/topic/DurableSubscriptionTest.java   |   98 +-
 .../qpid/test/unit/topic/TemporaryTopicTest.java   |   11 +-
 .../test/unit/transacted/CommitRollbackTest.java   |  190 +-
 .../qpid/test/unit/transacted/TransactedTest.java  |   18 +-
 .../transacted/TransactionTimeoutDisabledTest.java |    5 +-
 .../unit/transacted/TransactionTimeoutTest.java    |    9 +-
 .../transacted/TransactionTimeoutTestCase.java     |    1 -
 .../org/apache/qpid/test/unit/xa/QueueTest.java    |   12 +-
 .../org/apache/qpid/test/unit/xa/TopicTest.java    |   22 +-
 .../qpid/test/utils/BrokerCommandHelperTest.java   |    4 +-
 .../apache/qpid/test/utils/FailoverBaseCase.java   |   88 +-
 .../qpid/test/utils/SpawnedBrokerHolderTest.java   |   32 +
 .../transport/ConnectionEstablishmentTest.java     |  322 +++
 .../apache/qpid/transport/MaxFrameSizeTest.java    |   62 +-
 .../qpid/transport/ProtocolNegotiationTest.java    |  179 +-
 .../java/org/apache/qpid/transport/TestSender.java |   90 +
 tck/pom.xml                                        |  443 ++++
 .../apache/qpid/tck/ManageQpidJMSResources.java    |  255 +++
 tck/src/test/resources/jms-client/jndi.properties  |   40 +
 tck/src/test/resources/jms-client/ts.jtx           |   22 +
 .../test/resources/qpid-jms-client/jndi.properties |   41 +
 tck/src/test/resources/qpid-jms-client/ts.jtx      |   37 +
 tck/src/test/resources/resources.json              |   64 +
 tck/src/test/resources/ts.jte                      |   40 +
 test-profiles/CPPExcludes                          |   63 +-
 test-profiles/Java010Excludes                      |   14 +-
 test-profiles/JavaExcludes                         |   10 +-
 test-profiles/JavaPre010Excludes                   |   13 +-
 test-profiles/JavaTransientExcludes                |    5 -
 test-profiles/apache-ci.test.overridden.properties |   44 +
 test-profiles/cpp.excludes                         |    2 +-
 test-profiles/python_tests/Java010PythonExcludes   |   19 +-
 test-profiles/python_tests/Java10PythonExcludes    |   39 +
 .../python_tests/JavaPre010PythonExcludes          |    5 +-
 test-profiles/test-provider.properties             |   15 +-
 .../test_resources/ssl/generate-java-keystores.sh  |    6 +-
 tools/README.txt                                   |    2 +-
 tools/bin/memory-test                              |    2 +-
 tools/bin/testkit.py                               |    2 +-
 tools/pom.xml                                      |    4 +-
 .../org/apache/qpid/tools/JMXStressTestClient.java |  329 ---
 .../apache/qpid/tools/RestStressTestClient.java    |   11 +-
 2418 files changed, 135346 insertions(+), 110135 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/qpid-java.git



More information about the pkg-java-commits mailing list