[qpid-java] 08/09: Update upstream source from tag 'upstream/7.0.0'

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Thu Dec 21 23:23:46 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 acb7cdacf467043985d6cb63e7b26a16ce4d5750
Merge: 9e6978e 5b6c2c1
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Tue Nov 21 23:30:02 2017 +0000

    Update upstream source from tag 'upstream/7.0.0'
    
    Update to upstream version '7.0.0'
    with Debian dir 162535522fc8101575721ec3fa3e73283a8bf1da

 .travis.yml                                        |   10 +
 DEPENDENCIES                                       |  120 +-
 LICENSE                                            |  382 ++
 NOTICE                                             |    2 +-
 README.md                                          |   78 +
 README.txt                                         |   44 -
 apache-qpid-broker-j/pom.xml                       |   91 +
 .../src/main/assembly/LICENSE                      |    0
 apache-qpid-broker-j/src/main/assembly/NOTICE      |  116 +
 .../src/main/assembly/README.txt                   |    0
 apache-qpid-broker-j/src/main/assembly/bin.xml     |   69 +
 .../dependency-verification/DEPENDENCIES_REFERENCE |  147 +
 apache-qpid-broker-j/src/main/assembly/src.xml     |   86 +
 bdbstore/pom.xml                                   |   18 +-
 .../store/berkeleydb/AMQShortStringEncoding.java   |    2 +-
 .../store/berkeleydb/AbstractBDBMessageStore.java  |  401 +-
 .../berkeleydb/AbstractBDBPreferenceStore.java     |   45 +-
 .../qpid/server/store/berkeleydb/BDBBackup.java    |    5 +-
 .../store/berkeleydb/BDBCacheSizeSetter.java       |   29 +-
 .../store/berkeleydb/BDBConfigurationStore.java    |    2 +-
 .../berkeleydb/BDBConfiguredObjectRecord.java      |    3 +
 .../store/berkeleydb/BDBEnvironmentContainer.java  |    4 +-
 .../server/store/berkeleydb/BDBMessageStore.java   |    2 +-
 .../store/berkeleydb/BDBPreferenceStore.java       |    2 +-
 .../server/store/berkeleydb/BDBSystemConfig.java   |    6 +-
 .../store/berkeleydb/CoalescingCommiter.java       |    3 +
 .../server/store/berkeleydb/EnvHomeRegistry.java   |    2 +-
 .../server/store/berkeleydb/EnvironmentFacade.java |    8 +-
 .../store/berkeleydb/FieldTableEncoding.java       |    4 +-
 .../berkeleydb/StandardEnvironmentFacade.java      |   15 +-
 .../replication/ReplicatedEnvironmentFacade.java   |  187 +-
 .../store/berkeleydb/tuple/ByteBufferBinding.java  |   17 +-
 .../berkeleydb/tuple/ConfiguredObjectBinding.java  |   10 +-
 .../berkeleydb/tuple/HierarchyKeyBinding.java      |    2 +
 .../server/store/berkeleydb/tuple/MapBinding.java  |    4 +-
 .../berkeleydb/tuple/MessageMetaDataBinding.java   |   55 +-
 .../tuple/PreparedTransactionBinding.java          |    5 +
 .../store/berkeleydb/tuple/StringMapBinding.java   |    2 +
 .../store/berkeleydb/tuple/UUIDTupleBinding.java   |    2 +
 .../server/store/berkeleydb/tuple/XidBinding.java  |    2 +-
 .../berkeleydb/upgrade/AbstractStoreUpgrade.java   |   16 +-
 .../store/berkeleydb/upgrade/CursorOperation.java  |    4 +-
 .../store/berkeleydb/upgrade/DatabaseTemplate.java |    4 +-
 .../store/berkeleydb/upgrade/UpgradeFrom4To5.java  |   61 +-
 .../store/berkeleydb/upgrade/UpgradeFrom5To6.java  |   61 +-
 .../store/berkeleydb/upgrade/UpgradeFrom7To8.java  |    5 +-
 .../upgrade/UpgradeInteractionHandler.java         |    1 +
 .../berkeleydb/BDBHAReplicaVirtualHostImpl.java    |  463 +--
 .../virtualhost/berkeleydb/BDBHAVirtualHost.java   |    9 +-
 .../virtualhost/berkeleydb/BDBVirtualHost.java     |   14 +-
 .../virtualhost/berkeleydb/BDBVirtualHostImpl.java |   11 +
 .../berkeleydb/BDBHARemoteReplicationNodeImpl.java |   13 +-
 .../berkeleydb/BDBHAVirtualHostNode.java           |    7 +
 .../berkeleydb/BDBHAVirtualHostNodeImpl.java       |   69 +-
 .../berkeleydb/BDBVirtualHostNode.java             |    2 +
 .../berkeleydb/BDBVirtualHostNodeImpl.java         |   11 +
 .../js/qpid/management/virtualhost/bdb/add.js      |    1 +
 .../js/qpid/management/virtualhost/bdb_ha/add.js   |    8 +-
 .../js/qpid/management/virtualhostnode/bdb/add.js  |    8 +-
 .../qpid/management/virtualhostnode/bdb_ha/add.js  |   14 +-
 .../bdb_ha/add/existinggroup/add.js                |    1 +
 .../virtualhostnode/bdb_ha/add/newgroup/add.js     |    1 +
 .../berkeleydb/AMQShortStringEncodingTest.java     |    2 +-
 .../store/berkeleydb/BDBHAVirtualHostNodeTest.java |   17 +-
 .../store/berkeleydb/BDBMessageStoreTest.java      |  257 +-
 .../store/berkeleydb/BDBPreferenceStoreTest.java   |   24 +-
 .../berkeleydb/BDBStoreUpgradeTestPreparer.java    |   11 +-
 .../NoopConfigurationChangeListener.java           |   65 -
 .../StandardEnvironmentFacadeFactoryTest.java      |    1 +
 .../berkeleydb/StandardEnvironmentFacadeTest.java  |    4 +-
 .../ReplicatedEnvironmentFacadeTest.java           |  288 +-
 .../replication/TestStateChangeListener.java       |   59 +-
 .../upgrade/AbstractUpgradeTestCase.java           |    2 +-
 .../berkeleydb/upgrade/MapJsonSerializerTest.java  |    1 +
 .../berkeleydb/upgrade/UpgradeFrom4to5Test.java    |    6 +-
 .../berkeleydb/upgrade/UpgradeFrom5To6Test.java    |   14 +-
 .../berkeleydb/upgrade/UpgradeFrom7To8Test.java    |   17 +-
 .../store/berkeleydb/upgrade/UpgraderTest.java     |    2 +-
 .../berkeleydb/BDBVirtualHostImplTest.java         |    4 +-
 .../berkeleydb/BDBHARemoteReplicationNodeTest.java |    2 +-
 ...BDBHAVirtualHostNodeOperationalLoggingTest.java |   19 +-
 .../berkeleydb/BDBHAVirtualHostNodeTestHelper.java |   23 +-
 .../berkeleydb/BDBVirtualHostNodeTest.java         |    2 +-
 .../bdbstore-v9-amqp10v0/test-store/00000000.jdb   |  Bin 0 -> 535122 bytes
 bdbstore/systests/pom.xml                          |   55 +-
 .../store/berkeleydb/BDBAMQP10V0UpgradeTest.java   |  127 +
 .../server/store/berkeleydb/BDBBackupTest.java     |    8 +-
 .../server/store/berkeleydb/BDBUpgradeTest.java    |   21 +-
 .../replication/BDBHAVirtualHostNodeRestTest.java  |   43 +-
 .../replication/BDBHAVirtualHostRestTest.java      |    6 +-
 .../store/berkeleydb/replication/GroupCreator.java |   27 +-
 .../berkeleydb/replication/MultiNodeTest.java      |   11 +-
 .../store/berkeleydb/replication/TwoNodeTest.java  |    5 +-
 broker-codegen/pom.xml                             |    7 +-
 .../model/ConfiguredObjectFactoryGenerator.java    |  150 +-
 .../ConfiguredObjectRegistrationGenerator.java     |  118 +-
 .../validation/AttributeAnnotationValidator.java   |   47 +-
 .../ManagedAttributeValueTypeValidator.java        |    2 +-
 .../validation/OperationAnnotationValidator.java   |   17 +-
 .../qpid/server/protocol/v1_0/CompositeType.java   |   34 +
 .../v1_0/CompositeTypeConstructorGenerator.java    |  443 +++
 .../server/protocol/v1_0/CompositeTypeField.java   |   35 +
 .../services/javax.annotation.processing.Processor |    1 +
 broker-core/build-generate-sources.xml             |    1 -
 broker-core/pom.xml                                |   77 +-
 broker-core/src/main/grammar/SelectorParser.jj     |  619 ++++
 broker-core/src/main/java/broker.bnd               |   26 -
 .../java/org/apache/qpid/server/AMQException.java  |  150 +
 .../java/org/apache/qpid/server/BrokerOptions.java |  371 --
 .../org/apache/qpid/server/BrokerPrincipal.java    |    5 +-
 .../java/org/apache/qpid/server/QpidException.java |   78 +
 .../org/apache/qpid/server/SystemLauncher.java     |  352 ++
 .../apache/qpid/server/SystemLauncherListener.java |  153 +
 .../apache/qpid/server/binding/BindingFactory.java |   48 -
 .../apache/qpid/server/binding/BindingImpl.java    |  233 +-
 .../apache/qpid/server/bytebuffer/BufferPool.java  |   67 +
 .../qpid/server/bytebuffer/ByteBufferRef.java      |   34 +
 .../server/bytebuffer/MultiQpidByteBuffer.java     | 1020 ++++++
 .../server/bytebuffer/NonPooledByteBufferRef.java  |   61 +
 .../server/bytebuffer/PooledByteBufferRef.java     |   97 +
 .../qpid/server/bytebuffer/QpidByteBuffer.java     |  308 ++
 .../server/bytebuffer/QpidByteBufferFactory.java   |  524 +++
 .../bytebuffer/QpidByteBufferInputStream.java      |   99 +
 .../bytebuffer/QpidByteBufferOutputStream.java     |  115 +
 .../server/bytebuffer/SingleQpidByteBuffer.java    |  598 +++
 .../qpid/server/common/ServerPropertyNames.java    |   60 +
 .../server/configuration/BrokerProperties.java     |   69 -
 .../server/configuration/CommonProperties.java     |  256 ++
 .../store/StoreConfigurationChangeListener.java    |    6 +-
 .../configuration/updater/TaskExecutorImpl.java    |   40 +-
 .../server/connection/AmqpConnectionMetaData.java  |   37 +
 .../server/connection/ConnectionPrincipal.java     |   78 +
 .../connection/ConnectionVersionValidator.java     |    3 +-
 .../qpid/server/connection/SessionPrincipal.java   |   15 +-
 .../StandardConnectionPropertyEnricher.java        |  115 +
 .../SuppliedMapConnectionPropertyEnricher.java     |   67 +
 .../server/consumer/AbstractConsumerTarget.java    |  434 +--
 .../apache/qpid/server/consumer/ConsumerImpl.java  |   86 -
 .../consumer/ConsumerMessageInstancePair.java      |   60 -
 .../qpid/server/consumer/ConsumerOption.java       |   31 +
 .../qpid/server/consumer/ConsumerTarget.java       |   51 +-
 .../consumer/ScheduledConsumerTargetSet.java       |  189 +
 .../qpid/server/exchange/AbstractExchange.java     | 1036 +++---
 .../qpid/server/exchange/DefaultDestination.java   |   94 +-
 .../qpid/server/exchange/DestinationReferrer.java  |   26 +
 .../qpid/server/exchange/DirectExchange.java       |  219 +-
 .../qpid/server/exchange/DirectExchangeImpl.java   |  273 ++
 .../qpid/server/exchange/ExchangeDefaults.java     |   63 +
 .../qpid/server/exchange/ExchangeReferrer.java     |   26 -
 .../qpid/server/exchange/FanoutExchange.java       |  277 +-
 .../qpid/server/exchange/FanoutExchangeImpl.java   |  251 ++
 .../FilterManagerReplacementRoutingKeyTuple.java   |   46 +
 .../qpid/server/exchange/HeadersBinding.java       |   44 +-
 .../qpid/server/exchange/HeadersExchange.java      |  161 +-
 .../qpid/server/exchange/HeadersExchangeImpl.java  |  126 +
 .../apache/qpid/server/exchange/TopicExchange.java |  317 +-
 .../qpid/server/exchange/TopicExchangeImpl.java    |  282 ++
 .../server/exchange/topic/TopicExchangeResult.java |  136 +-
 .../exchange/topic/TopicMatcherDFAState.java       |    2 +
 .../qpid/server/exchange/topic/TopicParser.java    |   48 +-
 .../qpid/server/exchange/topic/TopicWord.java      |    1 +
 .../apache/qpid/server/filter/AMQPFilterTypes.java |   62 +
 .../qpid/server/filter/ArithmeticExpression.java   |  274 ++
 .../qpid/server/filter/ArrivalTimeFilter.java      |    2 -
 .../server/filter/ArrivalTimeFilterFactory.java    |    1 -
 .../qpid/server/filter/BinaryExpression.java       |   93 +
 .../qpid/server/filter/BooleanExpression.java      |   36 +
 .../qpid/server/filter/ComparisonExpression.java   |  629 ++++
 .../qpid/server/filter/ConstantExpression.java     |  229 ++
 .../org/apache/qpid/server/filter/Expression.java  |   35 +
 .../qpid/server/filter/FilterManagerFactory.java   |   12 +-
 .../apache/qpid/server/filter/FilterSupport.java   |   27 +-
 .../org/apache/qpid/server/filter/Filterable.java  |    4 +-
 .../qpid/server/filter/FilterableMessage.java      |   41 +
 .../filter/JMSMessagePropertyExpression.java       |  255 ++
 .../qpid/server/filter/JMSSelectorFilter.java      |   18 +-
 .../server/filter/JMSSelectorFilterFactory.java    |    7 +-
 .../apache/qpid/server/filter/LogicExpression.java |  120 +
 .../qpid/server/filter/OrderByExpression.java      |   61 +
 .../qpid/server/filter/PropertyExpression.java     |   29 +
 .../server/filter/PropertyExpressionFactory.java   |   26 +
 .../server/filter/SelectorParsingException.java    |   36 +
 .../apache/qpid/server/filter/UnaryExpression.java |  402 ++
 .../server/filter/selector/ParseException.java     |  208 ++
 .../server/filter/selector/SelectorParser.java     | 1232 +++++++
 .../filter/selector/SelectorParserConstants.java   |  125 +
 .../selector/SelectorParserTokenManager.java       | 1056 ++++++
 .../server/filter/selector/SimpleCharStream.java   |  492 +++
 .../apache/qpid/server/filter/selector/Token.java  |  153 +
 .../qpid/server/filter/selector/TokenMgrError.java |  169 +
 .../server/flow/AbstractFlowCreditManager.java     |   76 -
 .../apache/qpid/server/flow/FlowCreditManager.java |   15 +-
 .../qpid/server/logging/AbstractMessageLogger.java |   41 +-
 .../org/apache/qpid/server/logging/LogMessage.java |    1 +
 .../org/apache/qpid/server/logging/LogSubject.java |    2 +-
 .../qpid/server/logging/NullMessageLogger.java     |    2 +
 .../qpid/server/logging/OperationLogMessage.java   |   50 +
 .../server/logging/SystemOutMessageLogger.java     |    2 +
 .../logging/messages/AccessControlMessages.java    |  176 +-
 .../messages/AccessControl_logmessages.properties  |    2 +
 .../messages/AuthenticationProviderMessages.java   |  210 +-
 .../AuthenticationProvider_logmessages.properties  |    4 +
 .../server/logging/messages/BindingMessages.java   |  125 +-
 .../messages/Binding_logmessages.properties        |    6 +-
 .../server/logging/messages/BrokerMessages.java    |  241 +-
 .../logging/messages/Broker_logmessages.properties |    7 -
 .../server/logging/messages/ChannelMessages.java   |  265 +-
 .../messages/Channel_logmessages.properties        |    8 +-
 .../logging/messages/ConfigStoreMessages.java      |  103 +-
 .../logging/messages/ConnectionMessages.java       |  361 +-
 .../messages/Connection_logmessages.properties     |    4 +
 .../server/logging/messages/ExchangeMessages.java  |  159 +-
 .../messages/Exchange_logmessages.properties       |    2 +
 .../logging/messages/HighAvailabilityMessages.java |  243 +-
 .../server/logging/messages/KeyStoreMessages.java  |  159 +-
 .../messages/KeyStore_logmessages.properties       |    2 +
 .../messages/ManagementConsoleMessages.java        |   93 +-
 .../logging/messages/MessageStoreMessages.java     |  105 +-
 .../qpid/server/logging/messages/PortMessages.java |  213 +-
 .../logging/messages/Port_logmessages.properties   |    3 +
 .../server/logging/messages/QueueMessages.java     |  294 +-
 .../logging/messages/Queue_logmessages.properties  |    8 +-
 .../logging/messages/SubscriptionMessages.java     |  137 +-
 .../messages/Subscription_logmessages.properties   |    3 +
 .../logging/messages/TransactionLogMessages.java   |  233 +-
 .../logging/messages/TrustStoreMessages.java       |  187 +-
 .../messages/TrustStore_logmessages.properties     |    4 +
 .../logging/messages/VirtualHostMessages.java      |  112 +-
 .../messages/VirtualHost_logmessages.properties    |    7 +-
 .../logging/subjects/AbstractLogSubject.java       |   11 +-
 .../server/logging/subjects/ChannelLogSubject.java |   20 +-
 .../logging/subjects/ConnectionLogSubject.java     |    1 +
 .../server/logging/subjects/LogSubjectFormat.java  |    7 +-
 .../qpid/server/message/AMQMessageHeader.java      |    2 +
 .../server/message/AbstractServerMessageImpl.java  |   42 +-
 .../qpid/server/message/MessageContainer.java      |   49 +
 .../qpid/server/message/MessageContentSource.java  |    7 +-
 .../qpid/server/message/MessageDestination.java    |   31 +-
 .../apache/qpid/server/message/MessageInfo.java    |    4 +
 .../qpid/server/message/MessageInfoImpl.java       |   29 +-
 .../qpid/server/message/MessageInstance.java       |   37 +-
 .../server/message/MessageInstanceConsumer.java    |   44 +
 .../qpid/server/message/MessageReference.java      |    1 +
 .../apache/qpid/server/message/MessageSender.java  |   32 +
 .../apache/qpid/server/message/MessageSource.java  |   40 +-
 .../qpid/server/message/MessageSourceConsumer.java |   28 -
 .../org/apache/qpid/server/message/RejectType.java |   28 +
 .../apache/qpid/server/message/RoutingResult.java  |  212 ++
 .../apache/qpid/server/message/ServerMessage.java  |   11 +
 .../server/message/internal/InternalMessage.java   |  139 +-
 .../message/internal/InternalMessageHeader.java    |   73 +-
 .../message/internal/InternalMessageMetaData.java  |   61 +-
 .../internal/InternalMessageMetaDataType.java      |    8 +-
 .../ByteArrayToOctetStream.java                    |   67 +
 .../mimecontentconverter/ConversionUtils.java      |   34 +
 .../mimecontentconverter/IdentityConverter.java    |   62 +
 .../MimeContentConverterRegistry.java              |  143 +
 .../MimeContentToObjectConverter.java              |   32 +
 .../ObjectToMimeContentConverter.java              |   37 +
 .../SerializableToJavaObjectStream.java            |   77 +
 .../mimecontentconverter/StringToTextPlain.java    |   72 +
 .../mimecontentconverter/TextPlainToString.java    |   53 +
 .../mimecontentconverter/TextXmlToString.java      |   53 +
 .../model/AbstractConfigurationChangeListener.java |   63 +
 .../server/model/AbstractConfiguredObject.java     |  550 +--
 .../model/AbstractConfiguredObjectTypeFactory.java |   33 +-
 .../qpid/server/model/AbstractContainer.java       |   18 +-
 .../qpid/server/model/AbstractSystemConfig.java    |  136 +-
 .../server/model/AbstractUnresolvedObject.java     |   15 +-
 .../qpid/server/model/AccessControlProvider.java   |    1 +
 .../apache/qpid/server/model/AlternateBinding.java |   33 +
 .../server/model/AncestorAttributeResolver.java    |   12 +-
 .../qpid/server/model/AttributeValueConverter.java |  229 +-
 .../qpid/server/model/AuthenticationProvider.java  |   47 +-
 .../java/org/apache/qpid/server/model/Binding.java |   31 +-
 .../java/org/apache/qpid/server/model/Broker.java  |  146 +-
 .../qpid/server/model/BrokerAttributeInjector.java |    7 +-
 .../org/apache/qpid/server/model/BrokerImpl.java   |  525 +--
 .../org/apache/qpid/server/model/BrokerModel.java  |   38 +-
 .../server/model/CommonAccessControlProvider.java  |    3 +-
 .../qpid/server/model/ConfigurationExtractor.java  |   33 +-
 .../server/model/ConfiguredAutomatedAttribute.java |    6 +
 .../model/ConfiguredDerivedInjectedAttribute.java  |    5 +
 .../model/ConfiguredDerivedMethodAttribute.java    |   12 +
 .../apache/qpid/server/model/ConfiguredObject.java |   29 +-
 .../model/ConfiguredObjectCustomSerialization.java |  307 ++
 .../qpid/server/model/ConfiguredObjectFactory.java |   11 +-
 .../server/model/ConfiguredObjectFactoryImpl.java  |   45 +-
 .../qpid/server/model/ConfiguredObjectFinder.java  |  470 +++
 .../model/ConfiguredObjectInjectedOperation.java   |   16 +-
 .../model/ConfiguredObjectInjectedStatistic.java   |    1 +
 .../model/ConfiguredObjectJacksonModule.java       |  143 +-
 .../model/ConfiguredObjectMethodOperation.java     |   19 +-
 .../server/model/ConfiguredObjectOperation.java    |    4 +-
 .../server/model/ConfiguredObjectTypeRegistry.java |  112 +-
 .../model/ConfiguredSettableInjectedAttribute.java |   12 +
 .../org/apache/qpid/server/model/Connection.java   |   81 +-
 .../org/apache/qpid/server/model/Consumer.java     |   36 +-
 .../qpid/server/model/DefaultVirtualHostAlias.java |    1 +
 .../qpid/server/model/DestinationAddress.java      |   79 +
 .../apache/qpid/server/model/DoOnConfigThread.java |   32 +
 .../org/apache/qpid/server/model/Exchange.java     |  134 +-
 .../qpid/server/model/ExclusivityPolicy.java       |    3 +-
 .../apache/qpid/server/model/HostNameAlias.java    |    1 +
 .../apache/qpid/server/model/JsonSystemConfig.java |    3 +-
 .../qpid/server/model/JsonSystemConfigImpl.java    |    2 +
 .../org/apache/qpid/server/model/KeyStore.java     |   12 +-
 .../apache/qpid/server/model/LifetimePolicy.java   |    1 +
 .../server/model/ManagedAttributeValueType.java    |    1 +
 .../ManagedAttributeValueTypeDerivedMethod.java    |   32 +
 .../apache/qpid/server/model/ManagedObject.java    |    1 +
 .../apache/qpid/server/model/ManagedOperation.java |    3 +
 .../qpid/server/model/MemorySystemConfig.java      |   31 +
 .../java/org/apache/qpid/server/model/Model.java   |   26 +-
 .../qpid/server/model/NamedAddressSpace.java       |   19 +-
 .../model/NoopConfigurationChangeListener.java     |   60 -
 .../qpid/server/model/NotFoundException.java       |   33 +
 .../qpid/server/model/OperationParameter.java      |    2 +
 .../model/OperationParameterFromAnnotation.java    |    5 +
 .../model/OperationParameterFromInjection.java     |   10 +-
 .../apache/qpid/server/model/OverflowPolicy.java   |   30 +
 .../qpid/server/model/OwnAttributeResolver.java    |    4 +-
 .../java/org/apache/qpid/server/model/Param.java   |    1 +
 .../qpid/server/model/PatternMatchingAlias.java    |    3 +-
 .../java/org/apache/qpid/server/model/Port.java    |   42 +-
 .../org/apache/qpid/server/model/Publisher.java    |   26 -
 .../apache/qpid/server/model/PublishingLink.java   |   29 +
 .../java/org/apache/qpid/server/model/Queue.java   |  349 +-
 .../java/org/apache/qpid/server/model/Session.java |   33 +-
 .../apache/qpid/server/model/StatisticUnit.java    |    3 +-
 .../qpid/server/model/SystemAddressSpaceAlias.java |    4 +-
 .../org/apache/qpid/server/model/SystemConfig.java |   49 +-
 .../server/model/SystemConfigBootstrapModel.java   |    7 +-
 .../org/apache/qpid/server/model/TrustStore.java   |   36 +
 .../apache/qpid/server/model/UUIDGenerator.java    |    4 +-
 .../org/apache/qpid/server/model/VirtualHost.java  |  256 +-
 .../model/VirtualHostAccessControlProvider.java    |    3 +-
 .../apache/qpid/server/model/VirtualHostAlias.java |   27 +-
 .../server/model/VirtualHostLogInclusionRule.java  |    2 +-
 .../qpid/server/model/VirtualHostLogger.java       |    2 +-
 .../apache/qpid/server/model/VirtualHostNode.java  |    4 +-
 .../model/adapter/AbstractPluginAdapter.java       |    3 +-
 .../model/adapter/FileBasedGroupProviderImpl.java  |   36 +-
 .../qpid/server/model/adapter/SessionAdapter.java  |  320 --
 ...tractClientAuthCapablePortWithAuthProvider.java |  130 -
 .../qpid/server/model/port/AbstractPort.java       |  234 +-
 .../model/port/AbstractPortWithAuthProvider.java   |  112 -
 .../apache/qpid/server/model/port/AmqpPort.java    |   91 +-
 .../qpid/server/model/port/AmqpPortImpl.java       |  232 +-
 .../server/model/port/ClientAuthCapablePort.java   |   32 -
 .../apache/qpid/server/model/port/HttpPort.java    |   91 +-
 .../qpid/server/model/port/HttpPortImpl.java       |  103 +-
 .../apache/qpid/server/model/port/PortFactory.java |   12 +-
 .../apache/qpid/server/model/port/PortManager.java |    6 +
 .../server/model/port/PortWithAuthProvider.java    |   29 -
 .../server/model/preferences/GenericPrincipal.java |    5 +-
 .../server/plugin/AMQPProtocolVersionWrapper.java  |    2 +-
 .../server/plugin/ConfiguredObjectTypeFactory.java |    6 +-
 .../server/plugin/ConnectionPropertyEnricher.java  |   27 +
 .../qpid/server/plugin/ConnectionValidator.java    |    4 +-
 .../plugin/JDBCConnectionProviderFactory.java      |   58 -
 .../qpid/server/plugin/MessageConverter.java       |    1 +
 .../apache/qpid/server/plugin/MessageFormat.java   |   33 +
 .../qpid/server/plugin/MessageMetaDataType.java    |    2 +-
 .../qpid/server/plugin/QpidServiceLoader.java      |    4 +-
 .../QpidByteBufferDisposingThreadPoolExecutor.java |   81 -
 ...InheritedAccessControlContextThreadFactory.java |   66 +
 .../properties/ConnectionStartProperties.java      |   58 +
 .../qpid/server/protocol/AMQSessionModel.java      |  111 -
 .../qpid/server/protocol/CapacityChecker.java      |   26 -
 .../server/protocol/ConnectionClosingTicker.java   |    2 +-
 .../qpid/server/protocol/ConsumerListener.java     |   30 -
 .../apache/qpid/server/protocol/ErrorCodes.java    |  135 +
 .../org/apache/qpid/server/protocol/LinkModel.java |    4 +-
 .../apache/qpid/server/protocol/LinkRegistry.java  |   34 -
 .../qpid/server/protocol/LinkRegistryImpl.java     |   84 -
 .../server/protocol/MessageFormatRegistry.java     |   61 +
 .../qpid/server/protocol/ProtocolVersion.java      |  207 ++
 .../converter/MessageConversionException.java      |   34 +
 .../protocol/v0_8/AMQFrameDecodingException.java   |   48 +
 .../protocol/v0_8/AMQPInvalidClassException.java   |   36 +
 .../qpid/server/protocol/v0_8/AMQShortString.java  |  452 +++
 .../apache/qpid/server/protocol/v0_8/AMQType.java  |  990 +++++
 .../qpid/server/protocol/v0_8/AMQTypeMap.java      |   52 +
 .../qpid/server/protocol/v0_8/AMQTypedValue.java   |  335 ++
 .../qpid/server/protocol/v0_8/EncodingUtils.java   |  454 +++
 .../qpid/server/protocol/v0_8/FieldArray.java      |  130 +
 .../qpid/server/protocol/v0_8/FieldTable.java      | 1225 +++++++
 .../server/protocol/v0_8/FieldTableFactory.java    |   35 +
 .../apache/qpid/server/queue/AbstractQueue.java    | 2325 +++++-------
 .../qpid/server/queue/AbstractQueueEntryList.java  |  103 +
 .../queue/AssignedConsumerMessageGroupManager.java |   53 +-
 .../org/apache/qpid/server/queue/BaseQueue.java    |    4 -
 .../org/apache/qpid/server/queue/ConsumerNode.java |  110 -
 .../qpid/server/queue/ConsumerNodeIterator.java    |   43 -
 .../qpid/server/queue/CopyMessagesTransaction.java |   28 +-
 .../apache/qpid/server/queue/CreatingLinkInfo.java |   34 +
 .../qpid/server/queue/CreatingLinkInfoImpl.java    |   55 +
 .../queue/DefinedGroupMessageGroupManager.java     |   65 +-
 .../server/queue/DeleteMessagesTransaction.java    |    5 +-
 .../queue/FlowToDiskOverflowPolicyHandler.java     |  143 +
 .../apache/qpid/server/queue/LastValueQueue.java   |    3 +-
 .../qpid/server/queue/LastValueQueueImpl.java      |    6 +-
 .../qpid/server/queue/LastValueQueueList.java      |   14 +-
 .../qpid/server/queue/MessageGroupManager.java     |    8 +-
 .../apache/qpid/server/queue/MessageGroupType.java |   28 +
 .../server/queue/MessageUnacceptableException.java |   29 +
 .../qpid/server/queue/MoveMessagesTransaction.java |   31 +-
 .../server/queue/NoneOverflowPolicyHandler.java    |   29 +
 .../qpid/server/queue/NotificationCheck.java       |    6 +-
 .../qpid/server/queue/OrderedQueueEntryList.java   |   24 +-
 .../apache/qpid/server/queue/OutOfOrderQueue.java  |   13 +-
 .../qpid/server/queue/OverflowPolicyHandler.java   |   26 +
 ...rflowPolicyMaximumQueueDepthChangeListener.java |   76 +
 .../apache/qpid/server/queue/PriorityQueue.java    |    3 +-
 .../qpid/server/queue/PriorityQueueImpl.java       |    5 +-
 .../qpid/server/queue/PriorityQueueList.java       |   23 +-
 .../ProducerFlowControlOverflowPolicyHandler.java  |  216 ++
 .../qpid/server/queue/QueueArgumentsConverter.java |  156 +-
 .../apache/qpid/server/queue/QueueConsumer.java    |   24 +-
 .../qpid/server/queue/QueueConsumerImpl.java       |  354 +-
 .../qpid/server/queue/QueueConsumerList.java       |  170 -
 .../qpid/server/queue/QueueConsumerManager.java    |   38 +
 .../server/queue/QueueConsumerManagerImpl.java     |  389 ++
 .../qpid/server/queue/QueueConsumerNode.java       |   77 +
 .../server/queue/QueueConsumerNodeIterator.java    |   75 +
 .../qpid/server/queue/QueueConsumerNodeList.java   |  127 +
 .../server/queue/QueueConsumerNodeListEntry.java   |  131 +
 .../org/apache/qpid/server/queue/QueueEntry.java   |    4 +-
 .../apache/qpid/server/queue/QueueEntryImpl.java   |  200 +-
 .../apache/qpid/server/queue/QueueEntryList.java   |    6 +-
 .../qpid/server/queue/QueueEntryListBase.java      |   25 -
 .../qpid/server/queue/QueueEntryTransaction.java   |   15 +-
 .../org/apache/qpid/server/queue/QueueFactory.java |   12 +-
 .../org/apache/qpid/server/queue/QueueRunner.java  |  125 -
 .../queue/QueueSizeLimitRespectingTransaction.java |   77 +
 .../apache/qpid/server/queue/QueueStatistics.java  |  244 ++
 .../qpid/server/queue/RejectPolicyHandler.java     |  158 +
 .../server/queue/RingOverflowPolicyHandler.java    |  114 +
 .../org/apache/qpid/server/queue/SortedQueue.java  |    3 +-
 .../apache/qpid/server/queue/SortedQueueEntry.java |    1 +
 .../qpid/server/queue/SortedQueueEntryList.java    |   24 +-
 .../apache/qpid/server/queue/SortedQueueImpl.java  |    6 +-
 .../apache/qpid/server/queue/StandardQueue.java    |    2 +-
 .../qpid/server/queue/StandardQueueEntryList.java  |   11 +-
 .../qpid/server/queue/StandardQueueImpl.java       |    6 +-
 .../queue/SuspendedConsumerLoggingTicker.java      |    2 +-
 .../qpid/server/security/AbstractKeyStore.java     |   93 +-
 .../qpid/server/security/AbstractTrustStore.java   |  388 ++
 .../AllowAllAccessControlProviderImpl.java         |   11 +-
 .../AutoGeneratedSelfSignedKeyStoreImpl.java       |   63 +-
 .../server/security/CertificateDetailsImpl.java    |  111 +
 .../apache/qpid/server/security/FileKeyStore.java  |    1 +
 .../qpid/server/security/FileKeyStoreImpl.java     |   10 +-
 .../qpid/server/security/FileTrustStore.java       |    7 +-
 .../qpid/server/security/FileTrustStoreImpl.java   |  287 +-
 .../security/ManagedPeerCertificateTrustStore.java |   15 +-
 .../ManagedPeerCertificateTrustStoreImpl.java      |  224 +-
 .../security/MutableCertificateTrustStore.java     |   29 +
 .../qpid/server/security/NonJavaKeyStore.java      |    1 +
 .../qpid/server/security/NonJavaKeyStoreImpl.java  |   15 +-
 .../qpid/server/security/NonJavaTrustStore.java    |   19 +-
 .../server/security/NonJavaTrustStoreImpl.java     |  189 +-
 .../apache/qpid/server/security/QpidPrincipal.java |    3 +-
 .../server/security/SiteSpecificTrustStore.java    |   31 +-
 .../security/SiteSpecificTrustStoreImpl.java       |  347 +-
 .../qpid/server/security/SubjectCreator.java       |   66 +-
 .../TrustAnchorValidatingTrustManager.java         |  154 +
 .../server/security/TrustStoreMessageSource.java   |   44 +-
 .../security/TrustStoreMessageSourceCreator.java   |   61 +-
 .../access/AbstractAccessControlProvider.java      |   12 +-
 .../qpid/server/security/access/Operation.java     |    8 +-
 .../qpid/server/security/access/OperationType.java |    4 +-
 .../security/auth/AuthenticatedPrincipal.java      |    2 +
 .../auth/ManagementConnectionPrincipal.java        |    4 +-
 .../security/auth/SocketConnectionMetaData.java    |   35 +
 .../security/auth/SocketConnectionPrincipal.java   |    5 +-
 .../qpid/server/security/auth/TaskPrincipal.java   |    5 +-
 .../server/security/auth/UsernamePrincipal.java    |    4 +
 .../AbstractPasswordFilePrincipalDatabase.java     |   29 +-
 .../Base64MD5PasswordFilePrincipalDatabase.java    |   87 +-
 .../server/security/auth/database/HashedUser.java  |   14 +-
 .../security/auth/database/PasswordPrincipal.java  |    3 +-
 .../PlainPasswordFilePrincipalDatabase.java        |  101 +-
 .../server/security/auth/database/PlainUser.java   |   12 +
 .../security/auth/database/PrincipalDatabase.java  |   11 +-
 .../manager/AbstractAuthenticationManager.java     |   45 +-
 .../AbstractScramAuthenticationManager.java        |   29 +-
 .../manager/AnonymousAuthenticationManager.java    |   39 +-
 .../auth/manager/AuthenticationResultCacher.java   |    8 +-
 ...odelPasswordManagingAuthenticationProvider.java |   66 +-
 .../manager/ExternalAuthenticationManagerImpl.java |   45 +-
 .../manager/KerberosAuthenticationManager.java     |   72 +-
 .../auth/manager/MD5AuthenticationProvider.java    |  148 +-
 .../server/security/auth/manager/ManagedUser.java  |   25 +-
 .../auth/manager/PlainAuthenticationProvider.java  |  167 +-
 .../PrincipalDatabaseAuthenticationManager.java    |   78 +-
 .../manager/ScramSHA1AuthenticationManager.java    |   10 +-
 .../manager/ScramSHA256AuthenticationManager.java  |   10 +-
 .../auth/manager/SimpleAuthenticationManager.java  |  164 +-
 .../SimpleLDAPAuthenticationManagerImpl.java       |  134 +-
 .../oauth2/OAuth2AuthenticationProvider.java       |   14 +-
 .../oauth2/OAuth2AuthenticationProviderImpl.java   |  140 +-
 .../oauth2/OAuth2IdentityResolverService.java      |    3 +-
 .../auth/manager/oauth2/OAuth2SaslServer.java      |  140 -
 .../auth/manager/oauth2/OAuth2UserPrincipal.java   |    2 +
 .../CloudFoundryOAuth2IdentityResolverService.java |   18 +-
 .../facebook/FacebookIdentityResolverService.java  |    6 +-
 .../GitHubOAuth2IdentityResolverService.java       |    6 +-
 .../GoogleOAuth2IdentityResolverService.java       |    6 +-
 .../KeycloakOAuth2IdentityResolverService.java     |  215 ++
 ...MicrosoftLiveOAuth2IdentityResolverService.java |    6 +-
 .../auth/sasl/AbstractSaslServerNegotiator.java    |   90 +
 .../sasl/AuthenticationProviderInitialiser.java    |   39 -
 .../server/security/auth/sasl/PasswordSource.java  |   26 +
 .../server/security/auth/sasl/SaslNegotiator.java  |   32 +
 .../server/security/auth/sasl/SaslSettings.java    |   31 +
 .../auth/sasl/UsernamePasswordInitialiser.java     |  105 -
 .../auth/sasl/anonymous/AnonymousNegotiator.java   |   63 +
 .../auth/sasl/anonymous/AnonymousSaslServer.java   |   78 -
 .../sasl/anonymous/AnonymousSaslServerFactory.java |   61 -
 .../sasl/crammd5/AbstractCramMd5Negotiator.java    |  185 +
 .../sasl/crammd5/CRAMMD5HashedInitialiser.java     |   37 -
 .../auth/sasl/crammd5/CRAMMD5HashedSaslServer.java |  107 -
 .../sasl/crammd5/CRAMMD5HashedServerFactory.java   |   60 -
 .../auth/sasl/crammd5/CRAMMD5HexInitialiser.java   |  156 -
 .../auth/sasl/crammd5/CRAMMD5HexSaslServer.java    |  107 -
 .../auth/sasl/crammd5/CRAMMD5HexServerFactory.java |   60 -
 .../auth/sasl/crammd5/CRAMMD5Initialiser.java      |   33 -
 .../crammd5/CramMd5Base64HashedNegotiator.java     |   52 +
 .../sasl/crammd5/CramMd5Base64HexNegotiator.java   |   57 +
 .../auth/sasl/crammd5/CramMd5HashedNegotiator.java |   36 +
 .../auth/sasl/crammd5/CramMd5HexNegotiator.java    |   63 +
 .../auth/sasl/crammd5/CramMd5Negotiator.java       |   36 +
 .../auth/sasl/external/ExternalNegotiator.java     |  115 +
 .../auth/sasl/external/ExternalSaslServer.java     |  122 -
 .../auth/sasl/kerberos/KerberosNegotiator.java     |  110 +
 .../auth/sasl/oauth2/OAuth2Negotiator.java         |  110 +
 .../auth/sasl/plain/PlainAdapterSaslServer.java    |  167 -
 .../security/auth/sasl/plain/PlainInitialiser.java |   31 -
 .../security/auth/sasl/plain/PlainNegotiator.java  |  112 +
 .../auth/sasl/plain/PlainPasswordCallback.java     |   80 -
 .../security/auth/sasl/plain/PlainSaslServer.java  |  192 -
 .../auth/sasl/plain/PlainSaslServerFactory.java    |   60 -
 .../security/auth/sasl/scram/ScramNegotiator.java  |   63 +
 .../security/auth/sasl/scram/ScramSaslServer.java  |   51 +-
 .../auth/sasl/scram/ScramSaslServerSource.java     |    4 +
 .../sasl/scram/ScramSaslServerSourceAdapter.java   |   19 +-
 .../security/encryption/AESKeyFileEncrypter.java   |    2 +-
 .../encryption/AESKeyFileEncrypterFactory.java     |    4 +-
 .../qpid/server/security/group/GroupImpl.java      |   19 +-
 .../server/security/group/GroupMemberImpl.java     |    6 +-
 .../qpid/server/security/group/GroupPrincipal.java |    3 +
 .../server/security/group/GroupProviderImpl.java   |    9 +-
 ...oundryDashboardManagementGroupProviderImpl.java |   13 +-
 .../apache/qpid/server/session/AMQPSession.java    |   97 +
 .../qpid/server/session/AbstractAMQPSession.java   |  416 +++
 .../server/stats/FormattingStatisticsResolver.java |   97 +
 .../qpid/server/stats/StatisticsCounter.java       |  215 --
 .../qpid/server/stats/StatisticsGatherer.java      |   60 +-
 .../qpid/server/stats/StatisticsReportingTask.java |  130 +
 ...ractConfigurationStoreUpgraderAndRecoverer.java |  129 +
 .../store/AbstractJDBCConfigurationStore.java      |  951 -----
 .../server/store/AbstractJDBCMessageStore.java     | 2132 -----------
 .../qpid/server/store/AbstractJsonFileStore.java   |    2 +-
 .../store/BrokerStoreUpgraderAndRecoverer.java     |  242 +-
 .../store/ConfiguredObjectRecordConverter.java     |   28 -
 .../store/DurableConfigurationStoreUpgrader.java   |    2 -
 .../org/apache/qpid/server/store/EventManager.java |    6 +-
 .../apache/qpid/server/store/GenericRecoverer.java |   16 +-
 .../qpid/server/store/GenericStoreUpgrader.java    |   65 +-
 .../org/apache/qpid/server/store/JdbcUtils.java    |   85 -
 .../qpid/server/store/JsonFileConfigStore.java     |   33 +-
 .../qpid/server/store/MemoryMessageStore.java      |   56 +-
 .../apache/qpid/server/store/MessageHandle.java    |    2 +-
 .../org/apache/qpid/server/store/MessageStore.java |   11 +
 .../apache/qpid/server/store/NonNullUpgrader.java  |   36 +-
 .../apache/qpid/server/store/NullMessageStore.java |   18 +
 .../org/apache/qpid/server/store/NullUpgrader.java |   57 -
 .../qpid/server/store/StorableMessageMetaData.java |    5 +-
 .../qpid/server/store/StoredMemoryMessage.java     |   96 +-
 .../apache/qpid/server/store/StoredMessage.java    |   16 +-
 .../qpid/server/store/TransactionLogResource.java  |    4 +-
 .../server/store/UnresolvedConfiguredObject.java   |    2 +-
 .../VirtualHostStoreUpgraderAndRecoverer.java      |  738 +++-
 .../java/org/apache/qpid/server/store/Xid.java     |  102 -
 .../preferences/AbstractJDBCPreferenceStore.java   |  448 ---
 .../store/preferences/JsonFilePreferenceStore.java |    2 +-
 .../JsonFilePreferenceStoreFactoryService.java     |    4 +-
 .../server/store/serializer/v1/Deserializer.java   |   29 +-
 .../server/store/serializer/v1/MessageRecord.java  |   25 +-
 .../serializer/v1/MessageStoreSerializer_v1.java   |   38 +-
 .../qpid/server/streams/CompositeInputStream.java  |  189 +
 .../qpid/server/transport/AMQPConnection.java      |   70 +-
 .../server/transport/AbstractAMQPConnection.java   |  332 +-
 .../qpid/server/transport/AggregateTicker.java     |    2 +-
 .../qpid/server/transport/ByteBufferSender.java    |   34 +
 .../transport/MultiVersionProtocolEngine.java      |   93 +-
 .../MultiVersionProtocolEngineFactory.java         |    5 +-
 .../transport/NetworkConnectionScheduler.java      |   20 +-
 .../server/transport/NonBlockingConnection.java    |  128 +-
 .../transport/NonBlockingConnectionDelegate.java   |   26 +-
 .../NonBlockingConnectionPlainDelegate.java        |   65 +-
 .../NonBlockingConnectionTLSDelegate.java          |  115 +-
 .../NonBlockingConnectionUndecidedDelegate.java    |   49 +-
 .../transport/NonBlockingNetworkTransport.java     |    8 +-
 .../qpid/server/transport/ProtocolEngine.java      |    8 +-
 .../qpid/server/transport/SelectorThread.java      |   15 +-
 .../transport/ServerIdleReadTimeoutTicker.java     |    4 +-
 .../transport/ServerIdleWriteTimeoutTicker.java    |    4 +-
 .../server/transport/ServerNetworkConnection.java  |    6 +-
 .../qpid/server/transport/TCPandSSLTransport.java  |   12 +-
 .../server/transport/TransactionTimeoutTicker.java |    2 +-
 .../qpid/server/transport/TransportException.java  |   51 +
 .../qpid/server/transport/TransportProvider.java   |    1 +
 .../transport/network/NetworkConnection.java       |   59 +
 .../qpid/server/transport/network/Ticker.java      |   29 +
 .../transport/network/TransportActivity.java       |   33 +
 .../transport/network/TransportEncryption.java     |   26 +
 .../security/ssl/QpidClientX509KeyManager.java     |  125 +
 .../security/ssl/QpidMultipleTrustManager.java     |  108 +
 .../security/ssl/QpidPeersOnlyTrustManager.java    |   86 +
 .../transport/network/security/ssl/SSLUtil.java    |  821 +++++
 .../qpid/server/transport/util/Functions.java      |  174 +
 .../qpid/server/txn/AlreadyKnownDtxException.java  |    2 -
 .../server/txn/AsyncAutoCommitTransaction.java     |   23 +-
 .../qpid/server/txn/AutoCommitTransaction.java     |   21 +-
 .../qpid/server/txn/DistributedTransaction.java    |   25 +-
 .../java/org/apache/qpid/server/txn/DtxBranch.java |   46 +-
 .../org/apache/qpid/server/txn/DtxRegistry.java    |   16 +-
 .../server/txn/FlowToDiskTransactionObserver.java  |  144 +
 .../server/txn/IncorrectDtxStateException.java     |    2 -
 .../qpid/server/txn/JoinAndResumeDtxException.java |    2 -
 .../apache/qpid/server/txn/LocalTransaction.java   |   98 +-
 .../qpid/server/txn/NotAssociatedDtxException.java |    2 -
 .../qpid/server/txn/RollbackOnlyDtxException.java  |    2 -
 .../apache/qpid/server/txn/ServerTransaction.java  |    3 +-
 .../server/txn/SuspendAndFailDtxException.java     |   10 +-
 .../qpid/server/txn/TimeoutDtxException.java       |    2 -
 .../qpid/server/txn/TransactionObserver.java       |   63 +
 .../qpid/server/txn/UnknownDtxBranchException.java |    2 -
 .../main/java/org/apache/qpid/server/txn/Xid.java  |  101 +
 .../qpid/server/typedmessage/TypedBytesCodes.java  |   46 +
 .../typedmessage/TypedBytesContentReader.java      |  670 ++++
 .../typedmessage/TypedBytesContentWriter.java      |  366 ++
 .../typedmessage/TypedBytesFormatException.java    |   29 +
 .../mimecontentconverter/JmsMapMessageToMap.java   |   84 +
 .../JmsStreamMessageToList.java                    |   80 +
 .../ListToJmsStreamMessage.java                    |  112 +
 .../mimecontentconverter/MapToJmsMapMessage.java   |  121 +
 .../java/org/apache/qpid/server/util/Action.java   |    1 +
 .../qpid/server/util/ByteBufferInputStream.java    |  100 +
 .../qpid/server/util/CachingUUIDFactory.java       |   12 +-
 ...uiteAndProtocolRestrictingSSLSocketFactory.java |    2 +-
 .../apache/qpid/server/util/CommandLineParser.java |  680 ++++
 .../apache/qpid/server/util/ConnectionBuilder.java |    4 +-
 .../org/apache/qpid/server/util/DataUrlUtils.java  |   32 +
 .../apache/qpid/server/util/DeleteDeleteTask.java  |   41 +
 .../org/apache/qpid/server/util/FileUtils.java     |  412 +++
 .../org/apache/qpid/server/util/GZIPUtils.java     |  119 +
 .../qpid/server/util/HousekeepingExecutor.java     |   30 +-
 .../org/apache/qpid/server/util/NameUUIDGen.java   |   60 +
 .../org/apache/qpid/server/util/RandomUUIDGen.java |   40 +
 .../java/org/apache/qpid/server/util/Serial.java   |  110 +
 .../java/org/apache/qpid/server/util/Strings.java  |  437 +++
 .../org/apache/qpid/server/util/SystemUtils.java   |  127 +
 .../java/org/apache/qpid/server/util/UUIDGen.java  |   36 +
 .../java/org/apache/qpid/server/util/UUIDs.java    |   62 +
 .../util/urlstreamhandler/classpath/Handler.java   |   74 +
 .../server/util/urlstreamhandler/data/Handler.java |   28 +-
 .../AbstractNonConnectionAcceptingVirtualHost.java |  227 ++
 .../virtualhost/AbstractSystemMessageSource.java   |  289 +-
 .../server/virtualhost/AbstractVirtualHost.java    | 1307 ++++---
 .../AsynchronousMessageStoreRecoverer.java         |  124 +-
 .../virtualhost/ConnectionEstablishmentPolicy.java |   28 +
 .../virtualhost/ExchangeExistsException.java       |   46 -
 .../virtualhost/ExchangeIsAlternateException.java  |   31 -
 .../qpid/server/virtualhost/HouseKeepingTask.java  |   16 +
 .../server/virtualhost/LinkRegistryFactory.java    |   28 +
 .../qpid/server/virtualhost/LinkRegistryModel.java |   42 +
 .../MessageDestinationIsAlternateException.java    |   31 +
 .../server/virtualhost/MessageStoreRecoverer.java  |    4 +-
 .../NoopConnectionEstablishmentPolicy.java         |   33 +
 .../virtualhost/ProvidedStoreVirtualHost.java      |    9 +-
 .../virtualhost/ProvidedStoreVirtualHostImpl.java  |    4 +-
 .../server/virtualhost/QueueExistsException.java   |   45 -
 .../virtualhost/QueueManagingVirtualHost.java      |  366 ++
 .../SynchronousMessageStoreRecoverer.java          |  141 +-
 .../server/virtualhost/VirtualHostPrincipal.java   |    5 +-
 .../virtualhost/VirtualHostPropertiesNode.java     |   20 +-
 .../AbstractFixedVirtualHostNodeAlias.java         |    2 +-
 .../virtualhostalias/AbstractVirtualHostAlias.java |    6 +-
 .../DefaultVirtualHostAliasImpl.java               |    2 +-
 .../server/virtualhostalias/HostNameAliasImpl.java |    2 +
 .../SystemAddressSpaceAliasImpl.java               |    2 +-
 .../virtualhostalias/VirtualHostNameAliasImpl.java |    2 +-
 .../AbstractStandardVirtualHostNode.java           |   30 +-
 .../virtualhostnode/AbstractVirtualHostNode.java   |   38 +-
 .../virtualhostnode/JsonVirtualHostNode.java       |    6 +
 .../virtualhostnode/JsonVirtualHostNodeImpl.java   |    2 -
 .../RedirectingVirtualHostImpl.java                |  463 +--
 .../RedirectingVirtualHostNodeImpl.java            |   15 +-
 broker-core/src/main/resources/initial-config.json |   12 +-
 .../main/resources/qpidbrokerversion.properties    |    0
 .../org/apache/qpid/server/BrokerOptionsTest.java  |  263 --
 .../org/apache/qpid/server/QpidExceptionTest.java  |  121 +
 .../org/apache/qpid/server/SelectorParserTest.java |    4 +-
 .../org/apache/qpid/server/SystemLauncherTest.java |  156 +
 .../qpid/server/binding/BindingImplTest.java       |   81 -
 .../bytebuffer/QpidByteBufferOutputStreamTest.java |  113 +
 .../qpid/server/bytebuffer/QpidByteBufferTest.java | 1007 +++++
 .../server/configuration/BrokerPropertiesTest.java |   51 -
 .../startup/VirtualHostCreationTest.java           |    4 +-
 .../store/ManagementModeStoreHandlerTest.java      |   36 +-
 .../StoreConfigurationChangeListenerTest.java      |    7 +-
 .../configuration/updater/TaskExecutorTest.java    |    2 +
 .../connection/ConnectionVersionValidatorTest.java |    7 +-
 .../consumer/AbstractConsumerTargetTest.java       |  288 ++
 .../apache/qpid/server/consumer/MockConsumer.java  |  515 ---
 .../qpid/server/consumer/TestConsumerTarget.java   |  243 ++
 .../qpid/server/exchange/DirectExchangeTest.java   |  322 +-
 .../qpid/server/exchange/FanoutExchangeTest.java   |  393 +-
 .../qpid/server/exchange/HeadersBindingTest.java   |  131 +-
 .../qpid/server/exchange/HeadersExchangeTest.java  |  317 +-
 .../qpid/server/exchange/TopicExchangeTest.java    |  685 ++--
 .../qpid/server/logging/UnitTestMessageLogger.java |    2 +
 .../logging/actors/AMQPConnectionActorTest.java    |    3 +
 .../server/logging/actors/BaseActorTestCase.java   |    3 +
 .../actors/BaseConnectionActorTestCase.java        |    5 +-
 .../logging/actors/HttpManagementActorTest.java    |   45 +-
 .../logging/messages/BindingMessagesTest.java      |   64 -
 .../logging/subjects/AbstractTestLogSubject.java   |    2 +
 .../logging/subjects/BindingLogSubjectTest.java    |    3 +-
 .../logging/subjects/ChannelLogSubjectTest.java    |    7 +-
 .../logging/subjects/ConnectionLogSubjectTest.java |    1 +
 .../logging/subjects/QueueLogSubjectTest.java      |    3 +-
 .../server/message/AbstractServerMessageTest.java  |   18 +-
 .../server/model/AttributeValueConverterTest.java  |   18 +-
 .../apache/qpid/server/model/BrokerTestHelper.java |   40 +-
 .../model/ConfiguredObjectJacksonModuleTest.java   |    4 +-
 .../apache/qpid/server/model/VirtualHostTest.java  |  142 +-
 .../qpid/server/model/adapter/BrokerImplTest.java  |   13 +-
 .../qpid/server/model/adapter/PortFactoryTest.java |    5 +-
 .../qpid/server/model/port/AmqpPortImplTest.java   |    6 +-
 .../qpid/server/model/port/HttpPortImplTest.java   |    4 +-
 .../hierarchy/AbstractConfiguredObjectTest.java    |  126 +-
 .../hierarchy/AncestorAttributeResolverTest.java   |    6 +-
 .../ConfiguredObjectTypeRegistryTest.java          |   44 +-
 .../hierarchy/InjectedAttributeTest.java           |  150 +-
 .../hierarchy/TestAbstractEngineImpl.java          |   10 +-
 .../server/model/testmodels/hierarchy/TestCar.java |   13 +-
 .../testmodels/hierarchy/TestElecEngineImpl.java   |    2 +-
 .../testmodels/hierarchy/TestHybridEngineImpl.java |    2 +-
 .../model/testmodels/hierarchy/TestKitCar.java     |    1 +
 .../model/testmodels/hierarchy/TestKitCarImpl.java |   16 +-
 .../model/testmodels/hierarchy/TestModel.java      |    6 +-
 .../testmodels/hierarchy/TestPetrolEngineImpl.java |    2 +-
 .../testmodels/hierarchy/TestStandardCar.java      |    1 +
 .../testmodels/hierarchy/TestStandardCarImpl.java  |   15 +-
 .../lifecycle/AbstractConfiguredObjectTest.java    |   37 +-
 .../testmodels/lifecycle/TestConfiguredObject.java |   50 +-
 .../singleton/AbstractConfiguredObjectTest.java    |  195 +-
 .../testmodels/singleton/PreferencesTest.java      |    2 +-
 .../model/testmodels/singleton/TestModel.java      |    4 +-
 .../model/testmodels/singleton/TestSingleton.java  |    2 +-
 .../testmodels/singleton/TestSingletonImpl.java    |   31 +-
 ...ritedAccessControlContextThreadFactoryTest.java |   97 +
 .../server/protocol/v0_8/AMQShortStringTest.java   |  161 +
 .../qpid/server/protocol/v0_8/AMQTypeTest.java     |   52 +
 .../server/protocol/v0_8/EncodingUtilsTest.java    |   84 +
 .../qpid/server/protocol/v0_8/FieldTableTest.java  |  949 +++++
 .../qpid/server/queue/AbstractQueueTestBase.java   |  634 ++--
 .../apache/qpid/server/queue/ConsumerListTest.java |  447 ---
 .../queue/FlowToDiskOverflowPolicyHandlerTest.java |  137 +
 .../qpid/server/queue/LastValueQueueListTest.java  |   29 +-
 .../qpid/server/queue/LastValueQueueTest.java      |    1 +
 .../qpid/server/queue/MockMessageInstance.java     |   43 +-
 .../qpid/server/queue/NotificationCheckTest.java   |    2 +-
 .../qpid/server/queue/PriorityQueueListTest.java   |   31 +-
 .../qpid/server/queue/PriorityQueueTest.java       |    8 +-
 ...oducerFlowControlOverflowPolicyHandlerTest.java |  217 ++
 .../qpid/server/queue/QueueEntryImplTestBase.java  |   14 +-
 .../server/queue/QueueMessageRecoveryTest.java     |   11 +-
 .../qpid/server/queue/RejectPolicyHandlerTest.java |  144 +
 .../queue/RingOverflowPolicyHandlerTest.java       |  132 +
 .../queue/SelfValidatingSortedQueueEntryList.java  |    2 +-
 .../server/queue/SimpleQueueEntryImplTest.java     |    8 +-
 .../server/queue/SortedQueueEntryListTest.java     |   25 +-
 .../qpid/server/queue/SortedQueueEntryTest.java    |    8 +-
 .../server/queue/StandardQueueEntryListTest.java   |   85 +-
 .../qpid/server/queue/StandardQueueTest.java       |  140 +-
 .../qpid/server/security/FileKeyStoreTest.java     |    6 +-
 .../qpid/server/security/FileTrustStoreTest.java   |  102 +-
 .../server/security/NonJavaTrustStoreTest.java     |   61 +-
 .../security/SiteSpecificTrustStoreTest.java       |  292 ++
 .../qpid/server/security/SubjectCreatorTest.java   |   78 +-
 .../security/TrustStoreMessageSourceTest.java      |   40 +-
 .../security/auth/AuthenticatedPrincipalTest.java  |    1 +
 .../security/auth/AuthenticationProviderTest.java  |  189 -
 ...Base64MD5PasswordFilePrincipalDatabaseTest.java |   56 +-
 .../PlainPasswordFilePrincipalDatabaseTest.java    |    7 +-
 .../AnonymousAuthenticationManagerTest.java        |   29 +-
 .../manager/AuthenticationResultCacherTest.java    |   30 -
 .../manager/ExternalAuthenticationManagerTest.java |  107 +-
 .../auth/manager/MD5AuthenticationManagerTest.java |   64 -
 .../ManagedAuthenticationManagerTestBase.java      |   76 +-
 ...PrincipalDatabaseAuthenticationManagerTest.java |  144 +-
 .../manager/SimpleAuthenticationManagerTest.java   |   45 +-
 ...SimpleLDAPAuthenticationManagerFactoryTest.java |    1 +
 .../OAuth2AuthenticationProviderImplTest.java      |   37 +-
 .../manager/oauth2/OAuth2MockEndpointHolder.java   |   30 +-
 .../auth/manager/oauth2/OAuth2SaslServerTest.java  |   90 -
 .../auth/sasl/CRAMMD5HexInitialiserTest.java       |  150 -
 .../security/auth/sasl/CRAMMD5HexServerTest.java   |  227 --
 .../security/auth/sasl/SaslServerTestCase.java     |   65 -
 .../qpid/server/security/auth/sasl/SaslUtil.java   |   46 +
 .../security/auth/sasl/TestPrincipalDatabase.java  |  113 -
 .../sasl/anonymous/AnonymousNegotiatorTest.java    |   40 +
 .../auth/sasl/crammd5/CramMd5NegotiatorTest.java   |  274 ++
 .../auth/sasl/external/ExternalNegotiatorTest.java |  150 +
 .../auth/sasl/oauth2/OAuth2NegotiatorTest.java     |   97 +
 .../auth/sasl/plain/PlainNegotiatorTest.java       |   75 +
 .../auth/sasl/plain/PlainSaslServerTest.java       |   39 -
 .../auth/sasl/scram/ScramNegotiatorTest.java       |  442 +++
 .../encryption/AESKeyFileEncrypterFactoryTest.java |    4 +-
 .../apache/qpid/server/ssl/TrustManagerTest.java   |  346 ++
 .../stats/FormattingStatisticsResolverTest.java    |  100 +
 .../qpid/server/stats/StatisticsCounterTest.java   |  116 -
 ...ConfigurationStoreUpgraderAndRecovererTest.java |  123 +
 .../AbstractDurableConfigurationStoreTestCase.java |  211 +-
 .../qpid/server/store/BrokerRecovererTest.java     |   20 +-
 .../store/BrokerStoreUpgraderAndRecovererTest.java |   70 +-
 .../store/ConfiguredObjectRecordConverterTest.java |  142 -
 .../qpid/server/store/JsonFileConfigStoreTest.java |   26 +-
 .../store/MessageStoreQuotaEventsTestBase.java     |   11 +-
 .../qpid/server/store/MessageStoreTestCase.java    |   46 +-
 .../qpid/server/store/TestMessageMetaData.java     |   13 +-
 .../server/store/TestMessageMetaDataFactory.java   |    3 +-
 .../qpid/server/store/TestMessageMetaDataType.java |   38 +-
 .../VirtualHostStoreUpgraderAndRecovererTest.java  |  484 +--
 .../preferences/JsonFilePreferenceStoreTest.java   |    2 +-
 .../preferences/PreferencesRecovererTest.java      |    2 +-
 .../server/streams/CompositeInputStreamTest.java   |  132 +
 .../server/transport/TCPandSSLTransportTest.java   |   23 +-
 .../network/security/ssl/SSLUtilTest.java          | 1682 +++++++++
 .../server/txn/AsyncAutoCommitTransactionTest.java |    1 -
 .../qpid/server/txn/AutoCommitTransactionTest.java |    1 -
 .../txn/FlowToDiskTransactionObserverTest.java     |  150 +
 .../qpid/server/txn/LocalTransactionTest.java      |   24 +-
 .../org/apache/qpid/server/txn/MockAction.java     |    2 +
 .../apache/qpid/server/txn/MockServerMessage.java  |   36 +-
 .../qpid/server/txn/MockStoreTransaction.java      |    7 +
 .../server/util/ByteBufferInputStreamTest.java     |  113 +
 .../qpid/server/util/CommandLineParserTest.java    |  550 +++
 .../apache/qpid/server/util/FileHelperTest.java    |    2 +-
 .../org/apache/qpid/server/util/FileUtilsTest.java |  694 ++++
 .../org/apache/qpid/server/util/GZIPUtilsTest.java |  103 +
 .../org/apache/qpid/server/util/SerialTest.java    |   78 +
 .../org/apache/qpid/server/util/StringsTest.java   |   72 +
 .../apache/qpid/server}/util/default.properties    |    0
 .../apache/qpid/server}/util/mydefaults.properties |    0
 .../virtualhost/AbstractVirtualHostTest.java       |    6 +-
 .../AsynchronousMessageStoreRecovererTest.java     |    7 +-
 .../SynchronousMessageStoreRecovererTest.java      |   11 +-
 .../virtualhost/VirtualHostPropertiesNodeTest.java |   18 +-
 .../virtualhost/VirtualHostQueueCreationTest.java  |  326 +-
 .../virtualhostalias/VirtualHostAliasTest.java     |    8 +-
 .../AbstractStandardVirtualHostNodeTest.java       |    8 +-
 .../RedirectingVirtualHostNodeTest.java            |    2 +-
 .../TestVirtualHostNodeFactory.java                |    4 +-
 .../qpid/server/logging/GenerateLogMessages.java   |    9 +-
 .../qpid/server/logging/messages/LogMessages.vm    |   34 +-
 broker-core/src/xsl/qmf.xsl                        |  908 -----
 broker-plugins/access-control/pom.xml              |   12 +-
 .../security/access/config/AclFileParser.java      |   17 +-
 .../security/access/config/AclRulePredicates.java  |    9 +-
 .../qpid/server/security/access/config/Action.java |    9 +-
 .../access/config/LegacyAccessControlAdapter.java  |  272 +-
 .../security/access/config/LegacyOperation.java    |    4 +-
 .../security/access/config/ObjectProperties.java   |   68 +-
 .../server/security/access/config/ObjectType.java  |   16 +-
 .../access/config/RuleBasedAccessControl.java      |   10 +-
 .../server/security/access/config/RuleSet.java     |   37 +-
 .../access/firewall/HostnameFirewallRule.java      |   13 +-
 .../security/access/firewall/InetNetwork.java      |    2 +-
 .../access/firewall/NetworkFirewallRule.java       |   10 +-
 ...stractCommonRuleBasedAccessControlProvider.java |   20 +-
 .../AbstractLegacyAccessControlProvider.java       |    5 +-
 .../plugins/AclFileAccessControlProviderImpl.java  |    1 +
 .../plugins/RuleBasedAccessControlProvider.java    |    4 +-
 .../RuleBasedVirtualHostAccessControlProvider.java |    4 +-
 ...eBasedVirtualHostAccessControlProviderImpl.java |    6 +-
 .../security/access/config/AclFileParserTest.java  |   24 +-
 .../access/config/AclRulePredicatesTest.java       |   33 +-
 .../server/security/access/config/ActionTest.java  |   34 +-
 .../config/LegacyAccessControlAdapterTest.java     |  528 ++-
 .../access/config/RuleBasedAccessControlTest.java  |    1 +
 .../server/security/access/config/RuleSetTest.java |   22 +
 .../access/firewall/HostnameFirewallRuleTest.java  |    1 +
 .../access/firewall/NetworkFirewallRuleTest.java   |    1 +
 .../AclFileAccessControlProviderImplTest.java      |    1 +
 broker-plugins/amqp-0-10-protocol/pom.xml          |   13 +-
 .../server/protocol/v0_10/AMQPConnection_0_10.java |  329 +-
 .../protocol/v0_10/AMQPConnection_0_10Impl.java    |  398 ++
 .../server/protocol/v0_10/ConnectionInvoker.java   |   94 +
 .../qpid/server/protocol/v0_10/Constant.java       |   30 +
 .../server/protocol/v0_10/ConsumerTarget_0_10.java |  296 +-
 .../server/protocol/v0_10/CreditCreditManager.java |   37 +-
 .../ExplicitAcceptDispositionChangeListener.java   |   14 +-
 .../protocol/v0_10/FlowCreditManager_0_10.java     |    2 +-
 .../server/protocol/v0_10/FrameSizeObserver.java   |   27 +
 .../apache/qpid/server/protocol/v0_10/Future.java  |   36 +
 .../ImplicitAcceptDispositionChangeListener.java   |   14 +-
 .../v0_10/MessageAcceptCompletionListener.java     |   11 +-
 .../v0_10/MessageConverter_Internal_to_v0_10.java  |  236 +-
 .../protocol/v0_10/MessageConverter_v0_10.java     |  145 +-
 .../v0_10/MessageConverter_v0_10_to_Internal.java  |  186 +-
 .../server/protocol/v0_10/MessageFormat_0_10.java  |  129 +
 .../protocol/v0_10/MessageMetaDataType_0_10.java   |    4 +-
 .../protocol/v0_10/MessageMetaData_0_10.java       |   94 +-
 .../protocol/v0_10/MessageTransferHeader.java      |   71 +-
 .../protocol/v0_10/MessageTransferMessage.java     |   43 +-
 .../protocol/v0_10/ProtocolEngineCreator_0_10.java |    7 +-
 .../server/protocol/v0_10/ProtocolEventSender.java |   31 +
 .../server/protocol/v0_10/SenderException.java     |   54 +
 .../server/protocol/v0_10/ServerAssembler.java     |  230 +-
 .../server/protocol/v0_10/ServerConnection.java    |  621 +++-
 .../protocol/v0_10/ServerConnectionDelegate.java   |  330 +-
 .../qpid/server/protocol/v0_10/ServerDecoder.java  |  155 +-
 .../server/protocol/v0_10/ServerDisassembler.java  |  146 +-
 .../qpid/server/protocol/v0_10/ServerEncoder.java  |   42 +-
 .../qpid/server/protocol/v0_10/ServerFrame.java    |    7 +-
 .../server/protocol/v0_10/ServerInputHandler.java  |  178 +-
 .../qpid/server/protocol/v0_10/ServerSession.java  | 1414 ++++---
 .../protocol/v0_10/ServerSessionDelegate.java      |  553 ++-
 .../qpid/server/protocol/v0_10/SessionInvoker.java |  238 ++
 .../qpid/server/protocol/v0_10/Session_0_10.java   |  168 +
 .../apache/qpid/server/protocol/v0_10/Waiter.java  |   62 +
 .../server/protocol/v0_10/WindowCreditManager.java |   45 +-
 .../protocol/v0_10/transport/AbstractDecoder.java  |  481 +++
 .../protocol/v0_10/transport/AbstractEncoder.java  |  573 +++
 .../server/protocol/v0_10/transport/Acquired.java  |  148 +
 .../server/protocol/v0_10/transport/BBDecoder.java |  164 +
 .../server/protocol/v0_10/transport/BBEncoder.java |  385 ++
 .../server/protocol/v0_10/transport/Binary.java    |  157 +
 .../protocol/v0_10/transport/ConnectionClose.java  |  202 +
 .../v0_10/transport/ConnectionCloseCode.java       |   55 +
 .../v0_10/transport/ConnectionCloseOk.java         |  117 +
 .../v0_10/transport/ConnectionException.java       |   72 +
 .../v0_10/transport/ConnectionHeartbeat.java       |  117 +
 .../protocol/v0_10/transport/ConnectionOpen.java   |  241 ++
 .../protocol/v0_10/transport/ConnectionOpenOk.java |  160 +
 .../v0_10/transport/ConnectionRedirect.java        |  202 +
 .../protocol/v0_10/transport/ConnectionSecure.java |  160 +
 .../v0_10/transport/ConnectionSecureOk.java        |  160 +
 .../protocol/v0_10/transport/ConnectionStart.java  |  244 ++
 .../v0_10/transport/ConnectionStartOk.java         |  286 ++
 .../protocol/v0_10/transport/ConnectionTune.java   |  278 ++
 .../protocol/v0_10/transport/ConnectionTuneOk.java |  238 ++
 .../server/protocol/v0_10/transport/Decoder.java   |  283 ++
 .../v0_10/transport/DeliveryProperties.java        |  604 +++
 .../server/protocol/v0_10/transport/DtxCommit.java |  199 +
 .../server/protocol/v0_10/transport/DtxEnd.java    |  238 ++
 .../server/protocol/v0_10/transport/DtxForget.java |  160 +
 .../protocol/v0_10/transport/DtxGetTimeout.java    |  160 +
 .../protocol/v0_10/transport/DtxPrepare.java       |  160 +
 .../protocol/v0_10/transport/DtxRecover.java       |  117 +
 .../protocol/v0_10/transport/DtxRollback.java      |  160 +
 .../server/protocol/v0_10/transport/DtxSelect.java |  117 +
 .../protocol/v0_10/transport/DtxSetTimeout.java    |  200 +
 .../server/protocol/v0_10/transport/DtxStart.java  |  238 ++
 .../protocol/v0_10/transport/DtxXaStatus.java      |   63 +
 .../server/protocol/v0_10/transport/Encodable.java |   44 +
 .../server/protocol/v0_10/transport/Encoder.java   |  278 ++
 .../protocol/v0_10/transport/EncoderUtils.java     |  390 ++
 .../protocol/v0_10/transport/ExchangeBind.java     |  286 ++
 .../protocol/v0_10/transport/ExchangeBound.java    |  286 ++
 .../v0_10/transport/ExchangeBoundResult.java       |  309 ++
 .../protocol/v0_10/transport/ExchangeDeclare.java  |  403 ++
 .../protocol/v0_10/transport/ExchangeDelete.java   |  199 +
 .../protocol/v0_10/transport/ExchangeQuery.java    |  160 +
 .../v0_10/transport/ExchangeQueryResult.java       |  276 ++
 .../protocol/v0_10/transport/ExchangeUnbind.java   |  244 ++
 .../v0_10/transport/ExecutionErrorCode.java        |   73 +
 .../v0_10/transport/ExecutionException.java        |  404 ++
 .../protocol/v0_10/transport/ExecutionResult.java  |  200 +
 .../protocol/v0_10/transport/ExecutionSync.java    |  117 +
 .../server/protocol/v0_10/transport/Field.java     |   80 +
 .../protocol/v0_10/transport/FileReturnCode.java   |   53 +
 .../v0_10/transport/FragmentProperties.java        |  233 ++
 .../server/protocol/v0_10/transport/Frame.java     |  146 +
 .../protocol/v0_10/transport/GetTimeoutResult.java |  148 +
 .../server/protocol/v0_10/transport/Header.java    |  144 +
 .../protocol/v0_10/transport/MessageAccept.java    |  160 +
 .../v0_10/transport/MessageAcceptMode.java         |   51 +
 .../protocol/v0_10/transport/MessageAcquire.java   |  160 +
 .../v0_10/transport/MessageAcquireMode.java        |   51 +
 .../protocol/v0_10/transport/MessageCancel.java    |  160 +
 .../v0_10/transport/MessageCreditUnit.java         |   51 +
 .../v0_10/transport/MessageDeliveryMode.java       |   51 +
 .../v0_10/transport/MessageDeliveryPriority.java   |   67 +
 .../protocol/v0_10/transport/MessageFlow.java      |  242 ++
 .../protocol/v0_10/transport/MessageFlowMode.java  |   51 +
 .../protocol/v0_10/transport/MessageFlush.java     |  160 +
 .../v0_10/transport/MessageProperties.java         |  533 +++
 .../protocol/v0_10/transport/MessageReject.java    |  244 ++
 .../v0_10/transport/MessageRejectCode.java         |   53 +
 .../protocol/v0_10/transport/MessageRelease.java   |  199 +
 .../protocol/v0_10/transport/MessageResume.java    |  202 +
 .../v0_10/transport/MessageResumeResult.java       |  147 +
 .../v0_10/transport/MessageSetFlowMode.java        |  202 +
 .../protocol/v0_10/transport/MessageStop.java      |  160 +
 .../protocol/v0_10/transport/MessageSubscribe.java |  449 +++
 .../protocol/v0_10/transport/MessageTransfer.java  |  312 ++
 .../server/protocol/v0_10/transport/Method.java    |  237 ++
 .../protocol/v0_10/transport/MethodDelegate.java   |  218 ++
 .../protocol/v0_10/transport/NetworkDelegate.java  |   39 +
 .../protocol/v0_10/transport/NetworkEvent.java     |   34 +
 .../server/protocol/v0_10/transport/Option.java    |   61 +
 .../protocol/v0_10/transport/ProtocolDelegate.java |   40 +
 .../protocol/v0_10/transport/ProtocolError.java    |   92 +
 .../protocol/v0_10/transport/ProtocolEvent.java    |   41 +
 .../protocol/v0_10/transport/ProtocolHeader.java   |  126 +
 .../protocol/v0_10/transport/QueueDeclare.java     |  399 ++
 .../protocol/v0_10/transport/QueueDelete.java      |  237 ++
 .../protocol/v0_10/transport/QueuePurge.java       |  159 +
 .../protocol/v0_10/transport/QueueQuery.java       |  159 +
 .../protocol/v0_10/transport/QueueQueryResult.java |  437 +++
 .../server/protocol/v0_10/transport/Range.java     |  338 ++
 .../server/protocol/v0_10/transport/RangeSet.java  |   58 +
 .../protocol/v0_10/transport/RangeSetFactory.java  |   38 +
 .../protocol/v0_10/transport/RangeSetImpl.java     |  253 ++
 .../protocol/v0_10/transport/RecoverResult.java    |  150 +
 .../server/protocol/v0_10/transport/ReplyTo.java   |  224 ++
 .../protocol/v0_10/transport/SegmentType.java      |   55 +
 .../protocol/v0_10/transport/SessionAttach.java    |  199 +
 .../protocol/v0_10/transport/SessionAttached.java  |  160 +
 .../v0_10/transport/SessionClosedException.java    |   46 +
 .../v0_10/transport/SessionCommandFragment.java    |  146 +
 .../v0_10/transport/SessionCommandPoint.java       |  198 +
 .../protocol/v0_10/transport/SessionCompleted.java |  199 +
 .../protocol/v0_10/transport/SessionConfirmed.java |  202 +
 .../protocol/v0_10/transport/SessionDetach.java    |  160 +
 .../v0_10/transport/SessionDetachCode.java         |   57 +
 .../protocol/v0_10/transport/SessionDetached.java  |  202 +
 .../protocol/v0_10/transport/SessionException.java |   61 +
 .../protocol/v0_10/transport/SessionExpected.java  |  202 +
 .../protocol/v0_10/transport/SessionFlush.java     |  235 ++
 .../protocol/v0_10/transport/SessionGap.java       |  160 +
 .../protocol/v0_10/transport/SessionHeader.java    |  154 +
 .../v0_10/transport/SessionKnownCompleted.java     |  160 +
 .../v0_10/transport/SessionRequestTimeout.java     |  158 +
 .../protocol/v0_10/transport/SessionTimeout.java   |  158 +
 .../server/protocol/v0_10/transport/Struct.java    |  158 +
 .../protocol/v0_10/transport/StructFactory.java    |  201 +
 .../server/protocol/v0_10/transport/Track.java     |   51 +
 .../server/protocol/v0_10/transport/TxCommit.java  |  117 +
 .../protocol/v0_10/transport/TxRollback.java       |  117 +
 .../server/protocol/v0_10/transport/TxSelect.java  |  117 +
 .../qpid/server/protocol/v0_10/transport/Type.java |  149 +
 .../server/protocol/v0_10/transport/XaResult.java  |  151 +
 .../qpid/server/protocol/v0_10/transport/Xid.java  |  231 ++
 .../AmqpListToListConverter.java                   |   64 +
 .../AmqpMapToMapConverter.java                     |   64 +
 .../ListToAmqpListConverter.java                   |   75 +
 .../MapToAmqpMapConverter.java                     |   75 +
 .../MessageConverter_0_10_to_InternalTest.java     |  407 +++
 .../MessageConverter_Internal_to_0_10Test.java     |  270 ++
 .../PropertyConverter_0_10_to_InternalTest.java    |  407 +++
 .../PropertyConverter_Internal_to_v0_10Test.java   |  661 ++++
 .../protocol/v0_10/ServerSessionDelegateTest.java  |    9 +-
 .../server/protocol/v0_10/ServerSessionTest.java   |   52 +-
 .../protocol/v0_10/WindowCreditManagerTest.java    |    3 +-
 .../protocol/v0_10/transport/BBEncoderTest.java    |  110 +
 .../server/protocol/v0_10/transport/GenTest.java   |   45 +
 .../protocol/v0_10/transport/RangeSetTest.java     |  354 ++
 broker-plugins/amqp-0-8-protocol/pom.xml           |   18 +-
 .../qpid/server/protocol/v0_8/AMQChannel.java      | 1742 ++++-----
 .../protocol/v0_8/AMQConnectionException.java      |   64 +
 .../qpid/server/protocol/v0_8/AMQDecoder.java      |  240 ++
 .../qpid/server/protocol/v0_8/AMQMessage.java      |   34 +-
 .../protocol/v0_8/AMQNoMethodHandlerException.java |   42 -
 .../server/protocol/v0_8/AMQPConnection_0_8.java   |   43 +-
 .../protocol/v0_8/AMQPConnection_0_8Impl.java      |  549 +--
 .../qpid/server/protocol/v0_8/BrokerDecoder.java   |   12 +-
 .../qpid/server/protocol/v0_8/CachedFrame.java     |   20 +-
 .../server/protocol/v0_8/ClientDeliveryMethod.java |    4 +-
 .../server/protocol/v0_8/ConsumerTarget_0_8.java   |  323 +-
 .../qpid/server/protocol/v0_8/CreditRestorer.java  |   29 +
 .../protocol/v0_8/ExtractResendAndRequeue.java     |   75 -
 .../protocol/v0_8/FlowCreditManager_0_8.java       |   32 +
 .../qpid/server/protocol/v0_8/IncomingMessage.java |    7 +-
 .../protocol/v0_8/InfiniteCreditCreditManager.java |   65 +
 .../protocol/v0_8/MessageConsumerAssociation.java  |   33 +
 .../v0_8/MessageConverter_Internal_to_v0_8.java    |  283 +-
 .../v0_8/MessageConverter_v0_8_to_Internal.java    |  189 +-
 .../server/protocol/v0_8/MessageFormat_0_9_1.java  |  170 +
 .../qpid/server/protocol/v0_8/MessageMetaData.java |   58 +-
 .../protocol/v0_8/MessageMetaDataType_0_8.java     |    4 +-
 .../protocol/v0_8/MessageOnlyCreditManager.java    |   73 -
 .../server/protocol/v0_8/NoAckCreditManager.java   |   56 -
 .../server/protocol/v0_8/Pre0_10CreditManager.java |   72 +-
 .../protocol/v0_8/ProtocolEngineCreator_0_8.java   |    3 +
 .../protocol/v0_8/ProtocolEngineCreator_0_9.java   |    3 +
 .../protocol/v0_8/ProtocolEngineCreator_0_9_1.java |    3 +
 .../protocol/v0_8/ProtocolOutputConverter.java     |   12 +-
 .../protocol/v0_8/ProtocolOutputConverterImpl.java |  176 +-
 .../server/protocol/v0_8/RecordDeliveryMethod.java |   29 -
 .../qpid/server/protocol/v0_8/ServerDecoder.java   |  253 ++
 .../protocol/v0_8/UnacknowledgedMessageMap.java    |   29 +-
 .../v0_8/UnacknowledgedMessageMapImpl.java         |  181 +-
 .../server/protocol/v0_8/transport/AMQBody.java    |   39 +
 .../protocol/v0_8/transport/AMQDataBlock.java      |   41 +
 .../server/protocol/v0_8/transport/AMQFrame.java   |   95 +
 .../protocol/v0_8/transport/AMQMethodBody.java     |   44 +
 .../protocol/v0_8/transport/AMQMethodBodyImpl.java |  170 +
 .../protocol/v0_8/transport/AMQMethodEvent.java    |   90 +
 .../protocol/v0_8/transport/AMQMethodListener.java |   64 +
 .../v0_8/transport/AMQProtocolClassException.java  |   34 +
 .../v0_8/transport/AMQProtocolHeaderException.java |   31 +
 .../transport/AMQProtocolInstanceException.java    |   34 +
 .../transport/AMQProtocolVersionException.java     |   33 +
 .../protocol/v0_8/transport/AMQProtocolWriter.java |   37 +
 .../transport/AMQVersionAwareProtocolSession.java  |   55 +
 .../protocol/v0_8/transport/AccessRequestBody.java |  180 +
 .../v0_8/transport/AccessRequestOkBody.java        |  104 +
 .../protocol/v0_8/transport/BasicAckBody.java      |  122 +
 .../protocol/v0_8/transport/BasicCancelBody.java   |  124 +
 .../protocol/v0_8/transport/BasicCancelOkBody.java |  106 +
 .../protocol/v0_8/transport/BasicConsumeBody.java  |  215 ++
 .../v0_8/transport/BasicConsumeOkBody.java         |  106 +
 .../transport/BasicContentHeaderProperties.java    |  996 +++++
 .../protocol/v0_8/transport/BasicDeliverBody.java  |  163 +
 .../protocol/v0_8/transport/BasicGetBody.java      |  136 +
 .../protocol/v0_8/transport/BasicGetEmptyBody.java |  106 +
 .../protocol/v0_8/transport/BasicGetOkBody.java    |  161 +
 .../protocol/v0_8/transport/BasicNackBody.java     |  139 +
 .../protocol/v0_8/transport/BasicPublishBody.java  |  165 +
 .../protocol/v0_8/transport/BasicQosBody.java      |  134 +
 .../protocol/v0_8/transport/BasicQosOkBody.java    |   85 +
 .../protocol/v0_8/transport/BasicRecoverBody.java  |  113 +
 .../v0_8/transport/BasicRecoverSyncBody.java       |  112 +
 .../v0_8/transport/BasicRecoverSyncOkBody.java     |   92 +
 .../protocol/v0_8/transport/BasicRejectBody.java   |  122 +
 .../protocol/v0_8/transport/BasicReturnBody.java   |  145 +
 .../protocol/v0_8/transport/ChannelAlertBody.java  |  140 +
 .../protocol/v0_8/transport/ChannelCloseBody.java  |  143 +
 .../v0_8/transport/ChannelCloseOkBody.java         |   83 +
 .../protocol/v0_8/transport/ChannelFlowBody.java   |  101 +
 .../protocol/v0_8/transport/ChannelFlowOkBody.java |  102 +
 .../v0_8/transport/ChannelMethodProcessor.java     |   45 +
 .../protocol/v0_8/transport/ChannelOpenBody.java   |   92 +
 .../protocol/v0_8/transport/ChannelOpenOkBody.java |  120 +
 .../transport/ClientChannelMethodProcessor.java    |   82 +
 .../v0_8/transport/ClientMethodDispatcher.java     |   78 +
 .../v0_8/transport/ClientMethodProcessor.java      |   42 +
 .../v0_8/transport/CompositeAMQDataBlock.java      |   83 +
 .../protocol/v0_8/transport/ConfirmSelectBody.java |  101 +
 .../v0_8/transport/ConfirmSelectOkBody.java        |   81 +
 .../v0_8/transport/ConnectionCloseBody.java        |  140 +
 .../v0_8/transport/ConnectionCloseOkBody.java      |   85 +
 .../v0_8/transport/ConnectionOpenBody.java         |  130 +
 .../v0_8/transport/ConnectionOpenOkBody.java       |  107 +
 .../v0_8/transport/ConnectionRedirectBody.java     |  118 +
 .../v0_8/transport/ConnectionSecureBody.java       |  109 +
 .../v0_8/transport/ConnectionSecureOkBody.java     |  105 +
 .../v0_8/transport/ConnectionStartBody.java        |  162 +
 .../v0_8/transport/ConnectionStartOkBody.java      |  153 +
 .../v0_8/transport/ConnectionTuneBody.java         |  128 +
 .../v0_8/transport/ConnectionTuneOkBody.java       |  128 +
 .../protocol/v0_8/transport/ContentBody.java       |  114 +
 .../protocol/v0_8/transport/ContentHeaderBody.java |  209 ++
 .../transport/ContentHeaderPropertiesFactory.java  |   55 +
 .../v0_8/transport/EncodableAMQDataBlock.java      |   34 +
 .../protocol/v0_8/transport/ExchangeBoundBody.java |  133 +
 .../v0_8/transport/ExchangeBoundOkBody.java        |  126 +
 .../v0_8/transport/ExchangeDeclareBody.java        |  234 ++
 .../v0_8/transport/ExchangeDeclareOkBody.java      |   85 +
 .../v0_8/transport/ExchangeDeleteBody.java         |  151 +
 .../v0_8/transport/ExchangeDeleteOkBody.java       |   85 +
 .../transport/FrameCreatingMethodProcessor.java    |  634 ++++
 .../protocol/v0_8/transport/HeartbeatBody.java     |  101 +
 .../v0_8/transport/MessagePublishInfo.java         |   85 +
 .../protocol/v0_8/transport/MethodDispatcher.java  |   37 +
 .../protocol/v0_8/transport/MethodProcessor.java   |   43 +
 .../protocol/v0_8/transport/MethodRegistry.java    |  569 +++
 .../v0_8/transport/ProtocolInitiation.java         |  248 ++
 .../v0_8/transport/ProtocolVersionAware.java       |   32 +
 .../protocol/v0_8/transport/QueueBindBody.java     |  183 +
 .../protocol/v0_8/transport/QueueBindOkBody.java   |   85 +
 .../protocol/v0_8/transport/QueueDeclareBody.java  |  215 ++
 .../v0_8/transport/QueueDeclareOkBody.java         |  130 +
 .../protocol/v0_8/transport/QueueDeleteBody.java   |  166 +
 .../protocol/v0_8/transport/QueueDeleteOkBody.java |  104 +
 .../protocol/v0_8/transport/QueuePurgeBody.java    |  136 +
 .../protocol/v0_8/transport/QueuePurgeOkBody.java  |  104 +
 .../protocol/v0_8/transport/QueueUnbindBody.java   |  166 +
 .../protocol/v0_8/transport/QueueUnbindOkBody.java |   85 +
 .../transport/ServerChannelMethodProcessor.java    |   97 +
 .../v0_8/transport/ServerMethodDispatcher.java     |   73 +
 .../v0_8/transport/ServerMethodProcessor.java      |   42 +
 .../protocol/v0_8/transport/TxCommitBody.java      |   84 +
 .../protocol/v0_8/transport/TxCommitOkBody.java    |   82 +
 .../protocol/v0_8/transport/TxRollbackBody.java    |   82 +
 .../protocol/v0_8/transport/TxRollbackOkBody.java  |   83 +
 .../protocol/v0_8/transport/TxSelectBody.java      |   85 +
 .../protocol/v0_8/transport/TxSelectOkBody.java    |   81 +
 .../org/apache/qpid/server/url/AMQBindingURL.java  |  250 ++
 .../org/apache/qpid/server/url/BindingURL.java     |   99 +
 .../apache/qpid/server/url/BindingURLParser.java   |  434 +++
 .../java/org/apache/qpid/server/url/URLHelper.java |  173 +
 .../apache/qpid/server/url/URLSyntaxException.java |   98 +
 .../qpid/server/protocol/v0_8/AMQChannelTest.java  |   56 +-
 .../qpid/server/protocol/v0_8/AMQDecoderTest.java  |  310 ++
 .../protocol/v0_8/AMQPConnection_0_8Test.java      |   49 +-
 .../qpid/server/protocol/v0_8/ClientDecoder.java   |  321 ++
 .../protocol/v0_8/ExtractResendAndRequeueTest.java |  183 -
 .../v0_8/MessageConverter_0_8_to_InternalTest.java |  405 ++
 .../v0_8/MessageConverter_Internal_to_0_8Test.java |  269 ++
 .../protocol/v0_8/MessageMetaDataFactoryTest.java  |   83 +
 .../protocol/v0_8/Pre0_10CreditManagerTest.java    |   62 +-
 .../PropertyConverter_Internal_to_v0_8Test.java    |  583 +++
 .../PropertyConverter_v0_8_to_InternalTest.java    |  325 ++
 .../protocol/v0_8/ReferenceCountingTest.java       |   10 +-
 .../v0_8/UnacknowledgedMessageMapTest.java         |   35 +-
 .../BasicContentHeaderPropertiesTest.java          |  188 +
 .../v0_8/transport/MessagePublishInfoImplTest.java |  100 +
 broker-plugins/amqp-1-0-bdb-store/pom.xml          |   71 +
 .../protocol/v1_0/store/bdb/BDBLinkStore.java      |  278 ++
 .../v1_0/store/bdb/BDBLinkStoreFactory.java        |   82 +
 .../v1_0/store/bdb/LinkKeyEntryBinding.java        |   73 +
 .../server/protocol/v1_0/store/bdb/LinkValue.java  |   59 +
 .../v1_0/store/bdb/LinkValueEntryBinding.java      |   92 +
 .../protocol/v1_0/store/bdb/BDBLinkStoreTest.java  |   67 +
 broker-plugins/amqp-1-0-jdbc-store/pom.xml         |   76 +
 .../protocol/v1_0/store/jdbc/JDBCLinkStore.java    |  536 +++
 .../v1_0/store/jdbc/JDBCLinkStoreFactory.java      |   79 +
 .../v1_0/store/jdbc/JDBCLinkStoreTest.java         |   92 +
 broker-plugins/amqp-1-0-protocol/pom.xml           |   26 +-
 .../server/protocol/v1_0/AMQPConnection_1_0.java   | 1596 +-------
 .../protocol/v1_0/AMQPConnection_1_0Impl.java      | 1961 ++++++++++
 .../server/protocol/v1_0/AbstractLinkEndpoint.java |  611 ++++
 .../v1_0/AbstractReceivingLinkEndpoint.java        |  407 +++
 .../protocol/v1_0/AnonymousRelayDestination.java   |  138 +
 .../server/protocol/v1_0/ConnectionHandler.java    |   25 +-
 .../qpid/server/protocol/v1_0/ConnectionState.java |    9 +-
 .../server/protocol/v1_0/ConsumerTarget_1_0.java   |  570 +--
 .../qpid/server/protocol/v1_0/Container.java       |    2 +-
 .../apache/qpid/server/protocol/v1_0/Delivery.java |  163 +-
 .../server/protocol/v1_0/DeliveryStateHandler.java |   28 -
 .../protocol/v1_0/DeserializationFactories.java    |  332 ++
 .../qpid/server/protocol/v1_0/Destination.java     |   30 -
 .../server/protocol/v1_0/ErrantLinkEndpoint.java   |  183 +
 .../qpid/server/protocol/v1_0/ErrorHandler.java    |   27 -
 .../server/protocol/v1_0/ExchangeDestination.java  |  206 --
 .../protocol/v1_0/ExchangeSendingDestination.java  |  436 +++
 .../server/protocol/v1_0/FrameOutputHandler.java   |    7 +-
 .../protocol/v1_0/IdentifiedTransaction.java       |   46 +
 .../protocol/v1_0/JmsMessageTypeAnnotation.java    |   69 +
 .../qpid/server/protocol/v1_0/LinkDefinition.java  |   39 +
 .../server/protocol/v1_0/LinkDefinitionImpl.java   |   91 +
 .../qpid/server/protocol/v1_0/LinkEndpoint.java    |  480 +--
 .../server/protocol/v1_0/LinkEventListener.java    |   31 -
 .../apache/qpid/server/protocol/v1_0/LinkImpl.java |  357 ++
 .../apache/qpid/server/protocol/v1_0/LinkKey.java  |   99 +
 .../qpid/server/protocol/v1_0/LinkRegistry.java    |   35 +
 .../protocol/v1_0/LinkRegistryFactoryImpl.java     |   40 +
 .../server/protocol/v1_0/LinkRegistryImpl.java     |  290 ++
 .../apache/qpid/server/protocol/v1_0/Link_1_0.java |   23 +-
 .../v1_0/MessageConverter_Internal_to_v1_0.java    |  235 +-
 .../protocol/v1_0/MessageConverter_from_1_0.java   |  570 ++-
 .../protocol/v1_0/MessageConverter_to_1_0.java     |  462 ++-
 .../v1_0/MessageConverter_v1_0_to_Internal.java    |  146 +-
 .../server/protocol/v1_0/MessageFormat_1_0.java    |  218 ++
 .../protocol/v1_0/MessageMetaDataType_1_0.java     |    4 +-
 .../server/protocol/v1_0/MessageMetaData_1_0.java  |  723 ++--
 .../protocol/v1_0/MessageSourceDestination.java    |   62 -
 .../qpid/server/protocol/v1_0/Message_1_0.java     |  170 +-
 .../protocol/v1_0/NodeReceivingDestination.java    |  152 +-
 .../server/protocol/v1_0/NullLinkStoreFactory.java |   96 +
 .../qpid/server/protocol/v1_0/Predicate.java       |   26 -
 .../protocol/v1_0/ProtocolEngineCreator_1_0_0.java |    9 +-
 .../v1_0/ProtocolEngineCreator_1_0_0_SASL.java     |    9 +-
 .../server/protocol/v1_0/QueueDestination.java     |  115 -
 .../server/protocol/v1_0/ReceivingDestination.java |   13 +-
 .../protocol/v1_0/ReceivingLinkAttachment.java     |   68 -
 .../protocol/v1_0/ReceivingLinkEndpoint.java       |  419 ---
 .../protocol/v1_0/ReceivingLinkListener.java       |   43 -
 .../server/protocol/v1_0/ReceivingLink_1_0.java    |  341 --
 .../server/protocol/v1_0/SaslServerProvider.java   |   29 -
 .../server/protocol/v1_0/SendingDestination.java   |    7 +-
 .../protocol/v1_0/SendingLinkAttachment.java       |   62 -
 .../server/protocol/v1_0/SendingLinkEndpoint.java  |  834 ++++-
 .../server/protocol/v1_0/SendingLinkListener.java  |   41 -
 .../qpid/server/protocol/v1_0/SendingLink_1_0.java |  712 ----
 .../qpid/server/protocol/v1_0/SequenceNumber.java  |   42 +-
 .../qpid/server/protocol/v1_0/SessionState.java    |    2 +-
 .../qpid/server/protocol/v1_0/Session_1_0.java     | 1790 ++++-----
 .../v1_0/StandardReceivingLinkEndpoint.java        |  525 +++
 .../protocol/v1_0/StandardSendingDestination.java  |   79 +
 .../server/protocol/v1_0/StateChangeListener.java  |   25 -
 .../protocol/v1_0/TxnCoordinatorLink_1_0.java      |  214 --
 .../v1_0/TxnCoordinatorReceivingLinkEndpoint.java  |  261 ++
 .../protocol/v1_0/UnknownTransactionException.java |   34 +
 .../codec/AbstractCompositeTypeConstructor.java    |  317 ++
 .../codec/AbstractDescribedTypeConstructor.java    |   58 +
 .../v1_0/codec/AbstractDescribedTypeWriter.java    |  166 +-
 .../protocol/v1_0/codec/AbstractListWriter.java    |    5 +
 .../protocol/v1_0/codec/AbstractMapWriter.java     |   21 +-
 .../protocol/v1_0/codec/ArrayTypeConstructor.java  |   63 +-
 .../server/protocol/v1_0/codec/ArrayWriter.java    |   82 -
 .../server/protocol/v1_0/codec/BinaryString.java   |    8 +
 .../protocol/v1_0/codec/BinaryTypeConstructor.java |   29 +-
 .../server/protocol/v1_0/codec/BinaryWriter.java   |   33 +-
 .../protocol/v1_0/codec/BooleanConstructor.java    |   22 +-
 .../server/protocol/v1_0/codec/BooleanWriter.java  |   39 +-
 .../protocol/v1_0/codec/ByteArrayWriter.java       |   26 +-
 .../protocol/v1_0/codec/ByteTypeConstructor.java   |   21 +-
 .../server/protocol/v1_0/codec/ByteWriter.java     |   59 +-
 .../protocol/v1_0/codec/CharTypeConstructor.java   |   31 +-
 .../server/protocol/v1_0/codec/CharWriter.java     |   17 +-
 .../protocol/v1_0/codec/CompoundTypeAssembler.java |   36 -
 .../v1_0/codec/CompoundTypeConstructor.java        |  187 -
 .../server/protocol/v1_0/codec/CompoundWriter.java |  386 +-
 .../protocol/v1_0/codec/DecimalConstructor.java    |   36 +-
 .../codec/DefaultDescribedTypeConstructor.java     |    5 +-
 .../protocol/v1_0/codec/DelegatingValueWriter.java |   26 +-
 .../v1_0/codec/DescribedTypeConstructor.java       |   20 +-
 .../codec/DescribedTypeConstructorRegistry.java    |    4 +-
 .../protocol/v1_0/codec/DoubleTypeConstructor.java |   18 +-
 .../server/protocol/v1_0/codec/DoubleWriter.java   |   18 +-
 .../protocol/v1_0/codec/FixedEightWriter.java      |   85 +-
 .../protocol/v1_0/codec/FixedFourWriter.java       |   98 +-
 .../server/protocol/v1_0/codec/FixedOneWriter.java |   55 +-
 .../protocol/v1_0/codec/FixedSixteenWriter.java    |  122 +-
 .../server/protocol/v1_0/codec/FixedTwoWriter.java |   68 +-
 .../protocol/v1_0/codec/FloatTypeConstructor.java  |   20 +-
 .../server/protocol/v1_0/codec/FloatWriter.java    |   17 +-
 .../server/protocol/v1_0/codec/FrameWriter.java    |   38 +-
 .../protocol/v1_0/codec/IntTypeConstructor.java    |   20 +-
 .../server/protocol/v1_0/codec/IntegerWriter.java  |   95 +-
 .../protocol/v1_0/codec/ListConstructor.java       |   94 +
 .../server/protocol/v1_0/codec/ListWriter.java     |  119 +-
 .../protocol/v1_0/codec/LongTypeConstructor.java   |   20 +-
 .../server/protocol/v1_0/codec/LongWriter.java     |   98 +-
 .../server/protocol/v1_0/codec/MapConstructor.java |  142 +
 .../qpid/server/protocol/v1_0/codec/MapWriter.java |   29 +-
 .../protocol/v1_0/codec/NullTypeConstructor.java   |    6 +-
 .../server/protocol/v1_0/codec/NullWriter.java     |   36 +-
 .../protocol/v1_0/codec/ProtocolHandler.java       |    3 +-
 .../v1_0/codec/RestrictedTypeValueWriter.java      |   18 +-
 .../v1_0/codec/SectionDecoderRegistry.java         |   26 +
 .../protocol/v1_0/codec/ShortTypeConstructor.java  |   21 +-
 .../server/protocol/v1_0/codec/ShortWriter.java    |   17 +-
 .../v1_0/codec/SimpleVariableWidthWriter.java      |   40 +-
 .../protocol/v1_0/codec/SmallIntConstructor.java   |   18 +-
 .../protocol/v1_0/codec/SmallLongConstructor.java  |   18 +-
 .../protocol/v1_0/codec/SmallUIntConstructor.java  |   19 +-
 .../protocol/v1_0/codec/SmallULongConstructor.java |   18 +-
 .../protocol/v1_0/codec/StringTypeConstructor.java |   56 +-
 .../server/protocol/v1_0/codec/StringWriter.java   |  104 +-
 .../protocol/v1_0/codec/SymbolArrayWriter.java     |   76 +-
 .../protocol/v1_0/codec/SymbolTypeConstructor.java |   56 +-
 .../server/protocol/v1_0/codec/SymbolWriter.java   |   51 +-
 .../v1_0/codec/TimestampTypeConstructor.java       |   22 +-
 .../protocol/v1_0/codec/TimestampWriter.java       |   18 +-
 .../protocol/v1_0/codec/TypeConstructor.java       |    4 +-
 .../protocol/v1_0/codec/UByteTypeConstructor.java  |   21 +-
 .../protocol/v1_0/codec/UIntTypeConstructor.java   |   22 +-
 .../protocol/v1_0/codec/ULongTypeConstructor.java  |   21 +-
 .../protocol/v1_0/codec/UShortTypeConstructor.java |   22 +-
 .../protocol/v1_0/codec/UUIDTypeConstructor.java   |   23 +-
 .../server/protocol/v1_0/codec/UUIDWriter.java     |   16 +-
 .../protocol/v1_0/codec/UnsignedByteWriter.java    |   59 +-
 .../protocol/v1_0/codec/UnsignedIntegerWriter.java |  136 +-
 .../protocol/v1_0/codec/UnsignedLongWriter.java    |  135 +-
 .../protocol/v1_0/codec/UnsignedShortWriter.java   |   16 +-
 .../server/protocol/v1_0/codec/ValueHandler.java   |   33 +-
 .../v1_0/codec/ValueProducingProtocolHandler.java  |    4 +-
 .../server/protocol/v1_0/codec/ValueWriter.java    |   31 +-
 .../v1_0/codec/VariableWidthTypeConstructor.java   |   13 +-
 .../protocol/v1_0/codec/VariableWidthWriter.java   |  142 +-
 .../v1_0/codec/WrapperTypeValueWriter.java         |   55 -
 .../protocol/v1_0/codec/ZeroListConstructor.java   |    8 +-
 .../protocol/v1_0/codec/ZeroUIntConstructor.java   |    6 +-
 .../protocol/v1_0/codec/ZeroULongConstructor.java  |    6 +-
 .../protocol/v1_0/delivery/DeliveryRegistry.java   |   35 +
 .../v1_0/delivery/DeliveryRegistryImpl.java        |   85 +
 .../protocol/v1_0/delivery/UnsettledDelivery.java  |   46 +
 .../server/protocol/v1_0/framing/AMQFrame.java     |   14 +-
 .../server/protocol/v1_0/framing/FrameHandler.java |  120 +-
 .../v1_0/framing/OversizeFrameException.java       |    3 +-
 .../server/protocol/v1_0/framing/SASLFrame.java    |    2 +-
 .../protocol/v1_0/framing/TransportFrame.java      |   10 +-
 .../protocol/v1_0/messaging/SectionDecoder.java    |   13 +-
 .../v1_0/messaging/SectionDecoderImpl.java         |   60 +-
 .../protocol/v1_0/messaging/SectionEncoder.java    |   10 +-
 .../v1_0/messaging/SectionEncoderImpl.java         |   85 +-
 .../protocol/v1_0/store/AbstractLinkStore.java     |  134 +
 .../qpid/server/protocol/v1_0/store/LinkStore.java |   44 +
 .../protocol/v1_0/store/LinkStoreFactory.java      |   31 +
 .../protocol/v1_0/store/LinkStoreUpdater.java      |   32 +
 .../protocol/v1_0/store/LinkStoreUpdaterImpl.java  |   37 +
 .../server/protocol/v1_0/store/LinkStoreUtils.java |   57 +
 .../protocol/v1_0/type/AmqpErrorException.java     |    6 +
 .../v1_0/type/AmqpErrorRuntimeException.java       |   34 +
 .../qpid/server/protocol/v1_0/type/BaseSource.java |   26 +
 .../qpid/server/protocol/v1_0/type/BaseTarget.java |   26 +
 .../qpid/server/protocol/v1_0/type/Binary.java     |   80 +-
 .../protocol/v1_0/type/ErrorCarryingFrameBody.java |   28 +
 .../server/protocol/v1_0/type/ErrorCondition.java  |    2 +-
 .../qpid/server/protocol/v1_0/type/FrameBody.java  |    2 +-
 .../qpid/server/protocol/v1_0/type/Outcome.java    |    3 +-
 .../server/protocol/v1_0/type/SaslFrameBody.java   |    2 +-
 .../qpid/server/protocol/v1_0/type/Section.java    |    6 +-
 .../qpid/server/protocol/v1_0/type/Source.java     |   26 -
 .../qpid/server/protocol/v1_0/type/Symbol.java     |   23 +-
 .../qpid/server/protocol/v1_0/type/Target.java     |   26 -
 .../server/protocol/v1_0/type/UnsignedByte.java    |   10 +-
 .../server/protocol/v1_0/type/UnsignedInteger.java |   10 +-
 .../server/protocol/v1_0/type/UnsignedLong.java    |   10 +-
 .../server/protocol/v1_0/type/UnsignedShort.java   |   37 +-
 .../v1_0/type/codec/AMQPDescribedTypeRegistry.java |   98 +-
 .../SoleConnectionConnectionProperties.java        |   30 +
 .../soleconn/SoleConnectionDetectionPolicy.java    |   83 +
 .../soleconn/SoleConnectionEnforcementPolicy.java  |   83 +
 .../v1_0/type/messaging/AbstractSection.java       |  182 +
 .../protocol/v1_0/type/messaging/Accepted.java     |   23 +-
 .../protocol/v1_0/type/messaging/AmqpSequence.java |   42 +-
 .../v1_0/type/messaging/AmqpSequenceSection.java   |   59 +
 .../protocol/v1_0/type/messaging/AmqpValue.java    |   37 +-
 .../v1_0/type/messaging/AmqpValueSection.java      |   57 +
 .../v1_0/type/messaging/ApplicationProperties.java |   68 +-
 .../messaging/ApplicationPropertiesSection.java    |   59 +
 .../server/protocol/v1_0/type/messaging/Data.java  |   44 +-
 .../protocol/v1_0/type/messaging/DataSection.java  |   58 +
 .../v1_0/type/messaging/DeleteOnClose.java         |   22 +-
 .../v1_0/type/messaging/DeleteOnNoLinks.java       |   22 +-
 .../type/messaging/DeleteOnNoLinksOrMessages.java  |   22 +-
 .../v1_0/type/messaging/DeleteOnNoMessages.java    |   22 +-
 .../v1_0/type/messaging/DeliveryAnnotations.java   |   42 +-
 .../type/messaging/DeliveryAnnotationsSection.java |   60 +
 .../type/messaging/EncodingRetainingSection.java   |   28 +
 .../v1_0/type/messaging/ExactSubjectFilter.java    |    7 +-
 .../protocol/v1_0/type/messaging/Footer.java       |   55 +-
 .../v1_0/type/messaging/FooterSection.java         |   59 +
 .../protocol/v1_0/type/messaging/Header.java       |   60 +-
 .../v1_0/type/messaging/HeaderSection.java         |   57 +
 .../v1_0/type/messaging/JMSSelectorFilter.java     |    7 +-
 .../v1_0/type/messaging/MatchingSubjectFilter.java |    7 +-
 .../v1_0/type/messaging/MessageAnnotations.java    |   42 +-
 .../type/messaging/MessageAnnotationsSection.java  |   60 +
 .../protocol/v1_0/type/messaging/Modified.java     |   46 +-
 .../messaging/NonEncodingRetainingSection.java     |   28 +
 .../protocol/v1_0/type/messaging/Properties.java   |  107 +-
 .../v1_0/type/messaging/PropertiesSection.java     |   57 +
 .../protocol/v1_0/type/messaging/Received.java     |   31 +-
 .../protocol/v1_0/type/messaging/Rejected.java     |   31 +-
 .../protocol/v1_0/type/messaging/Released.java     |   21 +-
 .../protocol/v1_0/type/messaging/Source.java       |  168 +-
 .../protocol/v1_0/type/messaging/StdDistMode.java  |   60 +-
 .../protocol/v1_0/type/messaging/Target.java       |  119 +-
 .../v1_0/type/messaging/TerminusDurability.java    |   81 +-
 .../v1_0/type/messaging/TerminusExpiryPolicy.java  |   97 +-
 .../messaging/codec/AbstractLazyConstructor.java   |   54 +
 .../type/messaging/codec/AcceptedConstructor.java  |   72 -
 .../v1_0/type/messaging/codec/AcceptedWriter.java  |  104 +-
 .../messaging/codec/AmqpSequenceConstructor.java   |   25 +-
 .../codec/AmqpSequenceSectionConstructor.java      |   55 +
 .../type/messaging/codec/AmqpSequenceWriter.java   |   38 +-
 .../type/messaging/codec/AmqpValueConstructor.java |    5 +-
 .../codec/AmqpValueSectionConstructor.java         |  153 +
 .../v1_0/type/messaging/codec/AmqpValueWriter.java |   39 +-
 .../codec/ApplicationPropertiesConstructor.java    |   24 +-
 .../ApplicationPropertiesSectionConstructor.java   |   56 +
 .../codec/ApplicationPropertiesWriter.java         |   40 +-
 .../v1_0/type/messaging/codec/DataConstructor.java |   20 +-
 .../messaging/codec/DataSectionConstructor.java    |  129 +
 .../v1_0/type/messaging/codec/DataWriter.java      |   39 +-
 .../messaging/codec/DeleteOnCloseConstructor.java  |   71 -
 .../type/messaging/codec/DeleteOnCloseWriter.java  |   96 +-
 .../codec/DeleteOnNoLinksConstructor.java          |   71 -
 .../DeleteOnNoLinksOrMessagesConstructor.java      |   71 -
 .../codec/DeleteOnNoLinksOrMessagesWriter.java     |   98 +-
 .../messaging/codec/DeleteOnNoLinksWriter.java     |   97 +-
 .../codec/DeleteOnNoMessagesConstructor.java       |   71 -
 .../messaging/codec/DeleteOnNoMessagesWriter.java  |  102 +-
 .../codec/DeliveryAnnotationsConstructor.java      |   24 +-
 .../DeliveryAnnotationsSectionConstructor.java     |   56 +
 .../messaging/codec/DeliveryAnnotationsWriter.java |   39 +-
 .../codec/DescribedListSectionConstructor.java     |  117 +
 .../codec/DescribedMapSectionConstructor.java      |  116 +
 .../type/messaging/codec/EncodingRetaining.java    |   34 +
 .../codec/ExactSubjectFilterConstructor.java       |   14 +-
 .../messaging/codec/ExactSubjectFilterWriter.java  |   41 +-
 .../type/messaging/codec/FooterConstructor.java    |   24 +-
 .../messaging/codec/FooterSectionConstructor.java  |   56 +
 .../v1_0/type/messaging/codec/FooterWriter.java    |   40 +-
 .../type/messaging/codec/HeaderConstructor.java    |  206 --
 .../messaging/codec/HeaderSectionConstructor.java  |   56 +
 .../v1_0/type/messaging/codec/HeaderWriter.java    |  109 +-
 .../codec/JMSSelectorFilterConstructor.java        |   14 +-
 .../messaging/codec/JMSSelectorFilterWriter.java   |   39 +-
 .../codec/MatchingSubjectFilterConstructor.java    |   14 +-
 .../codec/MatchingSubjectFilterWriter.java         |   41 +-
 .../codec/MessageAnnotationsConstructor.java       |   24 +-
 .../MessageAnnotationsSectionConstructor.java      |   56 +
 .../messaging/codec/MessageAnnotationsWriter.java  |   40 +-
 .../type/messaging/codec/ModifiedConstructor.java  |  153 -
 .../v1_0/type/messaging/codec/ModifiedWriter.java  |   94 +-
 .../messaging/codec/NoLocalFilterConstructor.java  |    5 +-
 .../type/messaging/codec/NoLocalFilterWriter.java  |   44 +-
 .../messaging/codec/PropertiesConstructor.java     |  423 ---
 .../codec/PropertiesSectionConstructor.java        |   55 +
 .../type/messaging/codec/PropertiesWriter.java     |  174 +-
 .../type/messaging/codec/ReceivedConstructor.java  |  125 -
 .../v1_0/type/messaging/codec/ReceivedWriter.java  |   86 +-
 .../type/messaging/codec/RejectedConstructor.java  |   99 -
 .../v1_0/type/messaging/codec/RejectedWriter.java  |   82 +-
 .../type/messaging/codec/ReleasedConstructor.java  |   71 -
 .../v1_0/type/messaging/codec/ReleasedWriter.java  |   99 +-
 .../type/messaging/codec/SourceConstructor.java    |  384 --
 .../v1_0/type/messaging/codec/SourceWriter.java    |  159 +-
 .../type/messaging/codec/TargetConstructor.java    |  269 --
 .../v1_0/type/messaging/codec/TargetWriter.java    |  127 +-
 .../protocol/v1_0/type/security/SaslChallenge.java |   29 +-
 .../protocol/v1_0/type/security/SaslCode.java      |  109 +-
 .../protocol/v1_0/type/security/SaslInit.java      |   37 +-
 .../v1_0/type/security/SaslMechanisms.java         |   23 +-
 .../protocol/v1_0/type/security/SaslOutcome.java   |   34 +-
 .../protocol/v1_0/type/security/SaslResponse.java  |   29 +-
 .../security/codec/SaslChallengeConstructor.java   |   98 -
 .../type/security/codec/SaslChallengeWriter.java   |   81 +-
 .../type/security/codec/SaslInitConstructor.java   |  152 -
 .../v1_0/type/security/codec/SaslInitWriter.java   |   97 +-
 .../security/codec/SaslMechanismsConstructor.java  |  105 -
 .../type/security/codec/SaslMechanismsWriter.java  |   77 +-
 .../security/codec/SaslOutcomeConstructor.java     |  125 -
 .../type/security/codec/SaslOutcomeWriter.java     |   88 +-
 .../security/codec/SaslResponseConstructor.java    |   98 -
 .../type/security/codec/SaslResponseWriter.java    |   78 +-
 .../v1_0/type/transaction/Coordinator.java         |   26 +-
 .../protocol/v1_0/type/transaction/Declare.java    |   19 +-
 .../protocol/v1_0/type/transaction/Declared.java   |   31 +-
 .../protocol/v1_0/type/transaction/Discharge.java  |   24 +-
 .../v1_0/type/transaction/TransactionError.java    |  101 +
 .../v1_0/type/transaction/TransactionErrors.java   |  107 -
 .../v1_0/type/transaction/TransactionalState.java  |   31 +-
 .../v1_0/type/transaction/TxnCapabilities.java     |  144 -
 .../v1_0/type/transaction/TxnCapability.java       |  114 +-
 .../transaction/codec/CoordinatorConstructor.java  |  116 -
 .../type/transaction/codec/CoordinatorWriter.java  |   78 +-
 .../type/transaction/codec/DeclareConstructor.java |   98 -
 .../v1_0/type/transaction/codec/DeclareWriter.java |   77 +-
 .../transaction/codec/DeclaredConstructor.java     |   98 -
 .../type/transaction/codec/DeclaredWriter.java     |   77 +-
 .../transaction/codec/DischargeConstructor.java    |  125 -
 .../type/transaction/codec/DischargeWriter.java    |   88 +-
 .../codec/TransactionalStateConstructor.java       |  125 -
 .../codec/TransactionalStateWriter.java            |   90 +-
 .../protocol/v1_0/type/transport/AmqpError.java    |  269 +-
 .../protocol/v1_0/type/transport/Attach.java       |  140 +-
 .../server/protocol/v1_0/type/transport/Begin.java |   88 +-
 .../v1_0/type/transport/ChannelFrameBody.java      |   27 +
 .../server/protocol/v1_0/type/transport/Close.java |   40 +-
 .../v1_0/type/transport/ConnectionError.java       |  115 +-
 .../protocol/v1_0/type/transport/Detach.java       |   51 +-
 .../protocol/v1_0/type/transport/Disposition.java  |   66 +-
 .../server/protocol/v1_0/type/transport/End.java   |   40 +-
 .../server/protocol/v1_0/type/transport/Error.java |   36 +-
 .../server/protocol/v1_0/type/transport/Flow.java  |   98 +-
 .../protocol/v1_0/type/transport/LinkError.java    |  129 +-
 .../server/protocol/v1_0/type/transport/Open.java  |  104 +-
 .../v1_0/type/transport/ReceiverSettleMode.java    |   76 +-
 .../server/protocol/v1_0/type/transport/Role.java  |   75 +-
 .../v1_0/type/transport/SenderSettleMode.java      |   92 +-
 .../protocol/v1_0/type/transport/SessionError.java |  114 +-
 .../protocol/v1_0/type/transport/Transfer.java     |  102 +-
 .../type/transport/codec/AttachConstructor.java    |  464 ---
 .../v1_0/type/transport/codec/AttachWriter.java    |  182 +-
 .../type/transport/codec/BeginConstructor.java     |  302 --
 .../v1_0/type/transport/codec/BeginWriter.java     |  131 +-
 .../type/transport/codec/CloseConstructor.java     |   98 -
 .../v1_0/type/transport/codec/CloseWriter.java     |   79 +-
 .../type/transport/codec/DetachConstructor.java    |  152 -
 .../v1_0/type/transport/codec/DetachWriter.java    |   94 +-
 .../transport/codec/DispositionConstructor.java    |  233 --
 .../type/transport/codec/DispositionWriter.java    |  116 +-
 .../v1_0/type/transport/codec/EndConstructor.java  |   98 -
 .../v1_0/type/transport/codec/EndWriter.java       |   79 +-
 .../type/transport/codec/ErrorConstructor.java     |  221 --
 .../v1_0/type/transport/codec/ErrorWriter.java     |   96 +-
 .../v1_0/type/transport/codec/FlowConstructor.java |  369 --
 .../v1_0/type/transport/codec/FlowWriter.java      |  157 +-
 .../v1_0/type/transport/codec/OpenConstructor.java |  370 --
 .../v1_0/type/transport/codec/OpenWriter.java      |  150 +-
 .../type/transport/codec/TransferConstructor.java  |  368 --
 .../v1_0/type/transport/codec/TransferWriter.java  |  157 +-
 .../protocol/v1_0/ConsumerTarget_1_0Test.java      |  160 +
 .../server/protocol/v1_0/LinkRegistryTest.java     |  144 +
 .../v1_0/MessageConverter_Internal_to_1_0Test.java |  398 ++
 .../MessageConverter_v1_0_to_InternalTest.java     |  726 ++++
 .../PropertyConverter_Internal_to_v1_0Test.java    |  335 ++
 .../PropertyConverter_v1_0_to_InternalTest.java    |  403 ++
 .../protocol/v1_0/ProtocolEngine_1_0_0Test.java    |  113 +-
 .../qpid/server/protocol/v1_0/Session_1_0Test.java |  777 ++++
 .../server/protocol/v1_0/TestLinkStoreFactory.java |  101 +
 .../protocol/v1_0/codec/ValueHandlerTest.java      |  193 +
 .../protocol/v1_0/framing/FrameHandlerTest.java    |  101 +
 .../protocol/v1_0/store/LinkStoreTestCase.java     |  224 ++
 broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml   |   20 +-
 .../v0_10_v1_0/MessageConverter_0_10_to_1_0.java   |  192 +-
 .../v0_10_v1_0/MessageConverter_1_0_to_v0_10.java  |  367 +-
 .../MessageConverter_0_10_to_1_0Test.java          |  499 +++
 .../MessageConverter_1_0_to_v0_10Test.java         | 1054 ++++++
 .../PropertyConverter_0_10_to_1_0Test.java         |  558 +++
 .../PropertyConverter_1_0_to_0_10Test.java         | 1096 ++++++
 broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml   |   18 +-
 .../v0_8_v0_10/MessageConverter_0_10_to_0_8.java   |  144 +-
 .../v0_8_v0_10/MessageConverter_0_8_to_0_10.java   |   84 +-
 .../PropertyConverter_0_10_to_0_8Test.java         |  590 +++
 .../PropertyConverter_0_8_to_0_10Test.java         |  484 +++
 broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml    |   24 +-
 .../v0_8_v1_0/MessageConverter_0_8_to_1_0.java     |  216 +-
 .../v0_8_v1_0/MessageConverter_1_0_to_v0_8.java    |  339 +-
 .../v0_8_v1_0/MessageConverter_0_8_to_1_0Test.java |  497 +++
 .../MessageConverter_1_0_to_v0_8Test.java          | 1050 ++++++
 .../PropertyConverter_0_8_to_1_0Test.java          |  485 +++
 .../PropertyConverter_1_0_to_0_8Test.java          |  948 +++++
 broker-plugins/derby-store/pom.xml                 |   15 +-
 .../store/derby/AbstractDerbyMessageStore.java     |   11 +-
 .../store/derby/DerbyConfigurationStore.java       |   14 +-
 .../qpid/server/store/derby/DerbyMessageStore.java |    4 +-
 .../qpid/server/store/derby/DerbySystemConfig.java |    6 +-
 .../apache/qpid/server/store/derby/DerbyUtils.java |    7 +-
 .../server/virtualhost/derby/DerbyVirtualHost.java |   15 +-
 .../virtualhost/derby/DerbyVirtualHostImpl.java    |   40 +-
 .../derby/DerbyVirtualHostNode.java                |    2 +
 .../derby/DerbyVirtualHostNodeImpl.java            |   35 +-
 .../js/qpid/management/virtualhost/derby/add.js    |    1 +
 .../qpid/management/virtualhostnode/derby/add.js   |    8 +-
 .../server/store/derby/DerbyMessageStoreTest.java  |    2 +-
 .../store/derby/DerbyPreferenceStoreTest.java      |   36 +-
 .../derby/DerbyVirtualHostNodeTest.java            |    1 +
 broker-plugins/jdbc-provider-bone/pom.xml          |   13 +-
 .../bonecp/BoneCPConnectionProviderFactory.java    |    9 +-
 .../js/qpid/management/store/pool/bonecp/show.js   |   24 +-
 broker-plugins/jdbc-store/pom.xml                  |   14 +-
 .../store/jdbc/AbstractJDBCConfigurationStore.java |  955 +++++
 .../store/jdbc/AbstractJDBCMessageStore.java       | 1881 ++++++++++
 .../store/jdbc/AbstractJDBCPreferenceStore.java    |  482 +++
 .../qpid/server/store/jdbc/ConnectionProvider.java |    0
 .../jdbc/DefaultConnectionProviderFactory.java     |    1 -
 .../jdbc/GenericAbstractJDBCMessageStore.java      |    3 +-
 .../store/jdbc/GenericJDBCConfigurationStore.java  |   30 +-
 .../server/store/jdbc/GenericJDBCMessageStore.java |   29 +-
 .../store/jdbc/JDBCConnectionProviderFactory.java  |   60 +
 .../qpid/server/store/jdbc/JDBCContainer.java      |   31 +
 .../apache/qpid/server/store/jdbc/JDBCDetails.java |   29 +-
 .../qpid/server/store/jdbc/JDBCSystemConfig.java   |    6 +
 .../apache/qpid/server/store/jdbc/JdbcUtils.java   |   81 +
 .../server/virtualhost/jdbc/JDBCVirtualHost.java   |   13 +-
 .../virtualhost/jdbc/JDBCVirtualHostImpl.java      |   30 +-
 .../virtualhostnode/jdbc/JDBCVirtualHostNode.java  |    6 +
 .../jdbc/JDBCVirtualHostNodeImpl.java              |   29 +-
 .../js/qpid/management/virtualhost/jdbc/add.js     |    1 +
 .../js/qpid/management/virtualhost/jdbc/show.js    |    3 +-
 .../js/qpid/management/virtualhostnode/jdbc/add.js |    1 +
 .../qpid/management/virtualhostnode/jdbc/show.js   |    2 +-
 .../qpid/server/store/jdbc/JDBCDetailsTest.java    |    9 +-
 .../server/store/jdbc/JDBCMessageStoreTest.java    |   14 +
 .../virtualhost/jdbc/JDBCVirtualHostTest.java      |    4 +-
 .../jdbc/JDBCVirtualHostNodeTest.java              |    2 +-
 broker-plugins/logging-logback/pom.xml             |   17 +-
 .../server/logging/logback/AbstractLogger.java     |   35 +-
 .../AbstractNameAndLevelLogInclusionRule.java      |    5 +-
 .../logback/AbstractPredicateLogInclusionRule.java |  115 +
 .../qpid/server/logging/logback/AppenderUtils.java |   63 +-
 .../server/logging/logback/BrokerFileLogger.java   |    4 +-
 .../logging/logback/BrokerFileLoggerImpl.java      |   15 +-
 .../logback/BrokerLogbackSocketLoggerImpl.java     |   18 +-
 .../BrokerNameAndLevelLogInclusionRuleImpl.java    |    2 +-
 .../BrokerUserOrConnectionLogInclusionRule.java    |   51 +
 ...BrokerUserOrConnectionLogInclusionRuleImpl.java |  113 +
 .../logback/ConnectionAndUserPredicate.java        |  110 +
 .../logback/Logback1027WorkaroundTurboFilter.java  |  117 +
 .../LogbackLoggingSystemLauncherListener.java      |  101 +
 .../logging/logback/LoggerNameAndLevelFilter.java  |    3 +-
 .../PredicateAndLoggerNameAndLevelFilter.java      |   79 +
 .../logging/logback/RecordEventAppender.java       |    2 +
 .../logging/logback/RollingPolicyDecorator.java    |   61 +-
 .../server/logging/logback/RolloverWatcher.java    |    2 +-
 .../server/logging/logback/StartupAppender.java    |    4 +-
 .../logging/logback/VirtualHostFileLogger.java     |    9 +-
 .../VirtualHostNameAndLevelLogInclusionRule.java   |    3 +-
 ...irtualHostNameAndLevelLogInclusionRuleImpl.java |    2 +-
 .../logging/logback/VirtualHostSyslogLogger.java   |    3 +-
 ...irtualHostUserOrConnectionLogInclusionRule.java |   51 +
 ...alHostUserOrConnectionLogInclusionRuleImpl.java |  113 +
 .../server/logging/logback/AppenderUtilsTest.java  |   23 +-
 .../logging/logback/BrokerFileLoggerTest.java      |    4 +-
 .../logging/logback/BrokerMemoryLoggerTest.java    |   13 +-
 .../BrokerNameAndLevelLogInclusionRuleTest.java    |    2 +-
 .../logback/ConnectionAndUserPredicateTest.java    |  179 +
 .../Logback1027WorkaroundTurboFilterTest.java      |  257 ++
 .../logback/RollingPolicyDecoratorTest.java        |   25 +-
 .../logging/logback/RolloverWatcherTest.java       |    3 +-
 .../logging/logback/StartupAppenderTest.java       |    5 +-
 .../VirtualHostLogEventExcludingFilterTest.java    |    1 +
 .../logging/logback/VirtualHostLoggerTest.java     |   24 +-
 ...alHostNameAndLevelLogInclusionRuleImplTest.java |    8 +-
 broker-plugins/management-amqp/pom.xml             |    8 +-
 .../server/management/amqp/ManagedEntityType.java  |   73 -
 .../management/amqp/ManagementAddressSpace.java    |  234 +-
 .../amqp/ManagementAddressSpacePrincipal.java      |    5 +-
 .../management/amqp/ManagementInputConverter.java  |  155 +
 .../server/management/amqp/ManagementNode.java     | 1870 ++++++----
 .../management/amqp/ManagementNodeConsumer.java    |  218 +-
 .../management/amqp/ManagementNodeCreator.java     |    9 +-
 .../management/amqp/ManagementOutputConverter.java |  158 +
 .../server/management/amqp/ManagementResponse.java |   48 +-
 .../server/management/amqp/ProxyMessageSource.java |  423 +++
 broker-plugins/management-http/pom.xml             |   43 +-
 .../qpid/server/management/plugin/DojoHelper.java  |   16 +-
 .../server/management/plugin/HttpManagement.java   |  591 ++-
 .../plugin/HttpManagementConfiguration.java        |   30 +-
 .../management/plugin/HttpManagementUtil.java      |  163 +-
 .../server/management/plugin/RewriteServlet.java   |    2 +
 .../plugin/SessionInvalidatedException.java        |   25 +
 .../auth/AnonymousInteractiveAuthenticator.java    |  134 +
 .../auth/AnonymousPreemptiveAuthenticator.java     |    4 +-
 .../auth/BasicAuthPreemptiveAuthenticator.java     |    6 +-
 .../auth/OAuth2InteractiveAuthenticator.java       |   35 +-
 .../plugin/auth/OAuth2PreemptiveAuthenticator.java |    6 +-
 .../auth/SSLClientCertPreemptiveAuthenticator.java |    6 +-
 .../auth/UsernamePasswordInteractiveLogin.java     |   18 +-
 .../connector/TcpAndSslSelectChannelConnector.java |  378 --
 .../plugin/filter/AuthenticationCheckFilter.java   |  210 ++
 .../plugin/filter/ExceptionHandlingFilter.java     |   23 +-
 .../filter/ForbiddingAuthorisationFilter.java      |  105 -
 .../filter/InteractiveAuthenticationFilter.java    |  108 +
 .../management/plugin/filter/LoggingFilter.java    |   12 +-
 .../PreemptiveSessionInvalidationFilter.java       |   69 -
 .../management/plugin/filter/RedirectFilter.java   |   59 +
 .../filter/RedirectingAuthorisationFilter.java     |  110 -
 .../plugin/portunification/MarkableEndPoint.java   |  275 ++
 .../TlsOrPlainConnectionFactory.java               |  358 ++
 .../management/plugin/report/QueueReport.java      |    2 +-
 .../management/plugin/report/ReportRunner.java     |   13 +-
 .../plugin/servlet/DefinedFileServlet.java         |    1 +
 .../management/plugin/servlet/FileServlet.java     |    3 +
 .../management/plugin/servlet/RootServlet.java     |    1 +
 .../plugin/servlet/ServletConnectionPrincipal.java |   97 +-
 .../servlet/query/ConfiguredObjectExpression.java  |    2 +-
 .../query/ConfiguredObjectExpressionFactory.java   |    4 +-
 .../query/ConfiguredObjectFilterParser.java        |   16 +-
 .../servlet/query/ConfiguredObjectQuery.java       |    8 +-
 .../plugin/servlet/query/NamedExpression.java      |    2 +-
 .../management/plugin/servlet/query/Token.java     |    1 +
 .../plugin/servlet/query/TokenMgrError.java        |    1 +
 .../plugin/servlet/rest/AbstractServlet.java       |  253 +-
 .../plugin/servlet/rest/ApiDocsServlet.java        |  282 +-
 .../plugin/servlet/rest/BrokerQueryServlet.java    |   20 +-
 .../rest/ConfiguredObjectToMapConverter.java       |   15 +-
 .../plugin/servlet/rest/JsonValueServlet.java      |    8 +-
 .../plugin/servlet/rest/KeyComparator.java         |   53 -
 .../plugin/servlet/rest/LogoutServlet.java         |    2 +
 .../plugin/servlet/rest/MapComparator.java         |   74 -
 .../plugin/servlet/rest/MetaDataServlet.java       |   66 +-
 .../plugin/servlet/rest/QueryServlet.java          |   27 +-
 .../plugin/servlet/rest/QueueReportServlet.java    |   35 +-
 .../plugin/servlet/rest/RequestInfo.java           |   28 +-
 .../plugin/servlet/rest/RequestInfoParser.java     |    9 +-
 .../plugin/servlet/rest/RestServlet.java           |  722 ++--
 .../plugin/servlet/rest/SaslServlet.java           |  178 +-
 .../plugin/servlet/rest/StructureServlet.java      |   96 +-
 .../plugin/servlet/rest/TimeZoneServlet.java       |    8 +-
 .../servlet/rest/VirtualHostQueryServlet.java      |   51 +-
 .../accesscontrolprovider/aclfile/add.html         |   40 +-
 .../src/main/java/resources/addBinding.html        |   12 +-
 .../src/main/java/resources/addExchange.html       |   27 +-
 .../src/main/java/resources/addQueue.html          |  305 +-
 .../src/main/java/resources/addVirtualHost.html    |   59 +
 .../src/main/java/resources/common/LoginForm.html  |   47 +
 .../java/resources/common/StatisticsWidget.html    |   35 +
 .../src/main/java/resources/css/apidocs.css        |    8 +
 .../src/main/java/resources/css/common.css         |   69 +-
 .../src/main/java/resources/editBroker.html        |   44 +-
 .../src/main/java/resources/editQueue.html         |  311 --
 .../src/main/java/resources/editVirtualHost.html   |   22 +-
 .../src/main/java/resources/images/minus.svg       |   26 +
 .../src/main/java/resources/index.html             |  144 +-
 .../java/resources/js/qpid/common/ConsoleHelper.js |  170 +-
 .../js/qpid/common/ContextVariablesEditor.js       |   29 +-
 .../resources/js/qpid/common/DestinationChooser.js |  103 +
 .../java/resources/js/qpid/common/LoginForm.js     |  130 +
 .../resources/js/qpid/common/StatisticsWidget.js   |  450 +++
 .../resources/js/qpid/common/UpdatableStore.js     |    6 +-
 .../java/resources/js/qpid/common/formatter.js     |    7 +-
 .../main/java/resources/js/qpid/common/metadata.js |   45 +-
 .../main/java/resources/js/qpid/common/updater.js  |    9 +-
 .../src/main/java/resources/js/qpid/common/util.js |   84 +-
 .../resources/js/qpid/common/widgetconfigurer.js   |   49 +-
 .../js/qpid/management/AccessControlProvider.js    |    2 +-
 .../js/qpid/management/AuthenticationProvider.js   |    2 +-
 .../java/resources/js/qpid/management/Broker.js    |  154 +-
 .../resources/js/qpid/management/Connection.js     |  313 +-
 .../java/resources/js/qpid/management/Exchange.js  |  176 +-
 .../resources/js/qpid/management/GroupProvider.js  |    2 +-
 .../java/resources/js/qpid/management/KeyStore.js  |    4 +-
 .../java/resources/js/qpid/management/Logger.js    |    6 +-
 .../resources/js/qpid/management/Management.js     |   82 +-
 .../java/resources/js/qpid/management/Plugin.js    |    2 +-
 .../main/java/resources/js/qpid/management/Port.js |   13 +-
 .../java/resources/js/qpid/management/Queue.js     |  398 +-
 .../resources/js/qpid/management/TrustStore.js     |   46 +-
 .../resources/js/qpid/management/VirtualHost.js    |  536 ++-
 .../js/qpid/management/VirtualHostNode.js          |   61 +-
 .../management/accesscontrolprovider/AclFile.js    |    7 +-
 .../accesscontrolprovider/aclfile/add.js           |  150 +-
 .../js/qpid/management/addAccessControlProvider.js |    3 +-
 .../resources/js/qpid/management/addBinding.js     |  518 ++-
 .../resources/js/qpid/management/addExchange.js    |  212 +-
 .../java/resources/js/qpid/management/addQueue.js  |  308 +-
 .../java/resources/js/qpid/management/addStore.js  |   20 +-
 .../resources/js/qpid/management/addVirtualHost.js |  197 +
 .../management/addVirtualHostNodeAndVirtualHost.js |   36 +-
 .../resources/js/qpid/management/editBroker.js     |    4 +-
 .../java/resources/js/qpid/management/editQueue.js |  195 -
 .../js/qpid/management/editVirtualHost.js          |    1 -
 .../resources/js/qpid/management/group/Group.js    |    2 +-
 .../groupprovider/GroupManagingGroupProvider.js    |   16 +-
 .../js/qpid/management/plugin/managementhttp.js    |    2 +-
 .../qpid/management/plugin/managementhttp/edit.js  |    2 +-
 .../resources/js/qpid/management/port/amqp/show.js |   18 +-
 .../qpid/management/store/CertificateGridWidget.js |  261 ++
 .../store/autogeneratedselfsigned/add.js           |   46 +-
 .../js/qpid/management/store/filekeystore/add.js   |   54 +-
 .../js/qpid/management/store/filetruststore/add.js |   47 +-
 .../store/managedcertificatestore/show.js          |  183 +-
 .../qpid/management/store/nonjavakeystore/add.js   |   53 +-
 .../qpid/management/store/nonjavatruststore/add.js |   45 +-
 .../management/store/nonjavatruststore/show.js     |   43 +-
 .../management/store/sitespecifictruststore/add.js |   46 +-
 .../store/sitespecifictruststore/show.js           |   29 +-
 .../management/virtualhost/providedstore/add.js    |    1 +
 .../js/qpid/management/virtualhostnode/json/add.js |    8 +-
 .../java/resources/js/qpid/sasl/Authenticator.js   |  251 +-
 .../js/qpid/sasl/CredentialBasedSaslClient.js      |  102 +-
 .../main/java/resources/js/qpid/sasl/SaslClient.js |   35 +-
 .../resources/js/qpid/sasl/ScramShaSaslClient.js   |  244 ++
 .../java/resources/js/qpid/sasl/ShaSaslClient.js   |  269 --
 .../js/qpid/sasl/UsernamePasswordProvider.js       |   41 -
 .../js/qpid/sasl/cram-md5-hex/SaslClient.js        |   11 +-
 .../resources/js/qpid/sasl/cram-md5/SaslClient.js  |   55 +-
 .../resources/js/qpid/sasl/plain/SaslClient.js     |   31 +-
 .../js/qpid/sasl/scram-sha-1/SaslClient.js         |    6 +-
 .../js/qpid/sasl/scram-sha-256/SaslClient.js       |    6 +-
 .../src/main/java/resources/login.html             |  164 -
 .../src/main/java/resources/logout.html            |    2 +-
 .../src/main/java/resources/showBroker.html        |   91 +-
 .../src/main/java/resources/showConnection.html    |   63 +-
 .../src/main/java/resources/showExchange.html      |   74 +-
 .../src/main/java/resources/showMessage.html       |   14 +-
 .../src/main/java/resources/showPort.html          |    5 +
 .../src/main/java/resources/showQueue.html         |  123 +-
 .../src/main/java/resources/showTrustStore.html    |    7 +
 .../src/main/java/resources/showVirtualHost.html   |   64 +-
 .../main/java/resources/showVirtualHostNode.html   |    4 +-
 .../resources/store/CertificateGridWidget.html     |   34 +
 .../java/resources/store/filetruststore/add.html   |    8 +-
 .../store/managedcertificatestore/show.html        |   13 -
 .../resources/store/nonjavatruststore/show.html    |    4 -
 .../store/sitespecifictruststore/show.html         |   28 +-
 .../src/main/java/resources/store/truststore.html  |   33 +-
 .../management/plugin/GunzipOutputStreamTest.java  |    2 +-
 .../auth/OAuth2InteractiveAuthenticatorTest.java   |   50 +-
 .../auth/OAuth2PreemptiveAuthenticatorTest.java    |   20 +-
 .../PreemptiveSessionInvalidationFilterTest.java   |   61 -
 .../TlsOrPlainConnectionFactoryTest.java           |  191 +
 .../management/plugin/report/ReportRunnerTest.java |    3 +
 .../servlet/query/ConfiguredObjectQueryTest.java   |    4 +-
 .../rest/ConfiguredObjectToMapConverterTest.java   |    4 +-
 .../plugin/servlet/rest/RequestInfoParserTest.java |    4 +
 .../rest/RestUserPreferenceHandlerTest.java        |   67 +-
 broker-plugins/memory-store/pom.xml                |   12 +-
 .../qpid/server/store/MemorySystemConfigImpl.java  |    3 +-
 .../js/qpid/management/virtualhost/memory/add.js   |    8 +-
 .../qpid/management/virtualhostnode/memory/add.js  |    8 +-
 broker-plugins/websocket/pom.xml                   |   33 +-
 .../transport/websocket/WebSocketProvider.java     |  373 +-
 {common => broker}/bin/qpid-run                    |    0
 broker/bin/qpid-server.bat                         |   14 +-
 broker/bin/qpid.stop                               |  225 +-
 broker/etc/broker_example.acl                      |  106 -
 broker/pom.xml                                     |   78 +-
 broker/scripts/resetAlerting.sh                    |  116 -
 broker/src/main/assembly/NOTICE                    |  115 -
 .../dependency-verification/DEPENDENCIES_REFERENCE |  129 -
 broker/src/main/assembly/qpid-broker-bin.xml       |   78 -
 .../main/java/org/apache/qpid/server/Broker.java   |  310 --
 .../src/main/java/org/apache/qpid/server/Main.java |  278 +-
 .../java/org/apache/qpid/server/BrokerTest.java    |  161 -
 .../test/java/org/apache/qpid/server/MainTest.java |  126 +-
 client/README.txt                                  |   49 -
 client/example/README.txt                          |   17 -
 client/example/pom.xml                             |   66 -
 .../main/java/org/apache/qpid/example/Drain.java   |  103 -
 .../main/java/org/apache/qpid/example/Hello.java   |   83 -
 .../java/org/apache/qpid/example/ListReceiver.java |  101 -
 .../java/org/apache/qpid/example/ListSender.java   |   86 -
 .../java/org/apache/qpid/example/MapReceiver.java  |   52 -
 .../java/org/apache/qpid/example/MapSender.java    |   83 -
 .../java/org/apache/qpid/example/OptionParser.java |  351 --
 .../main/java/org/apache/qpid/example/Spout.java   |  149 -
 .../java/org/apache/qpid/example/hello.properties  |   28 -
 client/pom.xml                                     |  135 -
 client/src/main/assembly/LICENSE                   |  233 --
 client/src/main/assembly/NOTICE                    |   15 -
 client/src/main/assembly/README.txt                |    3 -
 .../dependency-verification/DEPENDENCIES_REFERENCE |   37 -
 client/src/main/assembly/qpid-client-bin.xml       |   70 -
 client/src/main/java/client.bnd                    |   27 -
 .../org/apache/qpid/client/AMQAnyDestination.java  |   96 -
 .../qpid/client/AMQAuthenticationException.java    |   37 -
 .../java/org/apache/qpid/client/AMQConnection.java | 2032 -----------
 .../apache/qpid/client/AMQConnectionDelegate.java  |   91 -
 .../qpid/client/AMQConnectionDelegate_0_10.java    |  683 ----
 .../qpid/client/AMQConnectionDelegate_0_9.java     |   40 -
 .../qpid/client/AMQConnectionDelegate_0_91.java    |   39 -
 .../qpid/client/AMQConnectionDelegate_8_0.java     |  589 ---
 .../apache/qpid/client/AMQConnectionFactory.java   |  412 ---
 .../org/apache/qpid/client/AMQConnectionURL.java   |  387 --
 .../org/apache/qpid/client/AMQDestination.java     | 1094 ------
 .../org/apache/qpid/client/AMQHeadersExchange.java |   51 -
 .../qpid/client/AMQNoConsumersException.java       |   35 -
 .../apache/qpid/client/AMQNoRouteException.java    |   35 -
 .../org/apache/qpid/client/AMQProtocolHandler.java |  892 -----
 .../main/java/org/apache/qpid/client/AMQQueue.java |  157 -
 .../org/apache/qpid/client/AMQQueueBrowser.java    |  226 --
 .../apache/qpid/client/AMQQueueSessionAdaptor.java |   83 -
 .../java/org/apache/qpid/client/AMQSession.java    | 3848 --------------------
 .../org/apache/qpid/client/AMQSessionAdapter.java  |  191 -
 .../org/apache/qpid/client/AMQSession_0_10.java    | 1467 --------
 .../org/apache/qpid/client/AMQSession_0_8.java     | 1559 --------
 .../org/apache/qpid/client/AMQTemporaryQueue.java  |   67 -
 .../org/apache/qpid/client/AMQTemporaryTopic.java  |   75 -
 .../main/java/org/apache/qpid/client/AMQTopic.java |  251 --
 .../apache/qpid/client/AMQTopicSessionAdaptor.java |   70 -
 .../qpid/client/AMQUndefinedDestination.java       |   45 -
 .../java/org/apache/qpid/client/AMQXAResource.java |   32 -
 .../apache/qpid/client/BasicMessageConsumer.java   | 1053 ------
 .../qpid/client/BasicMessageConsumer_0_10.java     |  624 ----
 .../qpid/client/BasicMessageConsumer_0_8.java      |  249 --
 .../apache/qpid/client/BasicMessageProducer.java   |  769 ----
 .../qpid/client/BasicMessageProducer_0_10.java     |  405 --
 .../qpid/client/BasicMessageProducer_0_8.java      |  500 ---
 .../java/org/apache/qpid/client/BrokerDetails.java |  615 ----
 .../apache/qpid/client/ChannelToSessionMap.java    |  101 -
 .../java/org/apache/qpid/client/Closeable.java     |  102 -
 .../org/apache/qpid/client/CommonConnection.java   |   31 -
 .../qpid/client/ConnectionTuneParameters.java      |   73 -
 .../org/apache/qpid/client/CustomJMSXProperty.java |   67 -
 .../org/apache/qpid/client/FailoverHandler.java    |  147 -
 .../org/apache/qpid/client/HeartbeatListener.java  |   37 -
 .../qpid/client/JmsNotImplementedException.java    |   31 -
 .../apache/qpid/client/MessageConsumerPair.java    |   43 -
 .../qpid/client/PooledConnectionFactory.java       |  695 ----
 .../apache/qpid/client/QpidConnectionMetaData.java |   83 -
 .../apache/qpid/client/QueueReceiverAdaptor.java   |  115 -
 .../org/apache/qpid/client/QueueSenderAdapter.java |  227 --
 .../org/apache/qpid/client/RejectBehaviour.java    |   32 -
 .../apache/qpid/client/TemporaryDestination.java   |   39 -
 .../apache/qpid/client/TopicPublisherAdapter.java  |  205 --
 .../apache/qpid/client/TopicSubscriberAdaptor.java |  133 -
 .../client/UnsupportedAddressSyntaxException.java  |   32 -
 .../org/apache/qpid/client/XAConnectionImpl.java   |   91 -
 .../org/apache/qpid/client/XAResourceImpl.java     |  602 ---
 .../java/org/apache/qpid/client/XASessionImpl.java |  201 -
 .../failover/ConnectionRedirectException.java      |   46 -
 .../qpid/client/failover/FailoverException.java    |   44 -
 .../qpid/client/failover/FailoverNoopSupport.java  |   75 -
 .../failover/FailoverProtectedOperation.java       |   44 -
 .../qpid/client/failover/FailoverRetrySupport.java |   92 -
 .../apache/qpid/client/failover/FailoverState.java |   59 -
 .../qpid/client/failover/FailoverSupport.java      |   42 -
 .../qpid/client/filter/JMSSelectorFilter.java      |  216 --
 .../apache/qpid/client/filter/MessageFilter.java   |   27 -
 .../handler/AccessRequestOkMethodHandler.java      |   50 -
 .../client/handler/BasicCancelOkMethodHandler.java |   55 -
 .../client/handler/BasicDeliverMethodHandler.java  |   58 -
 .../client/handler/BasicReturnMethodHandler.java   |   58 -
 .../client/handler/ChannelCloseMethodHandler.java  |  120 -
 .../handler/ChannelCloseOkMethodHandler.java       |   50 -
 .../client/handler/ChannelFlowMethodHandler.java   |   52 -
 .../client/handler/ChannelFlowOkMethodHandler.java |   52 -
 .../client/handler/ClientMethodDispatcherImpl.java |  466 ---
 .../handler/ClientMethodDispatcherImpl_0_9.java    |   67 -
 .../handler/ClientMethodDispatcherImpl_0_91.java   |   67 -
 .../handler/ClientMethodDispatcherImpl_8_0.java    |   70 -
 .../handler/CloseWhenNoRouteSettingsHelper.java    |   75 -
 .../handler/ConnectionCloseMethodHandler.java      |  117 -
 .../handler/ConnectionOpenOkMethodHandler.java     |   47 -
 .../handler/ConnectionRedirectMethodHandler.java   |   88 -
 .../handler/ConnectionSecureMethodHandler.java     |   70 -
 .../handler/ConnectionStartMethodHandler.java      |  227 --
 .../handler/ConnectionTuneMethodHandler.java       |   90 -
 .../handler/ExchangeBoundOkMethodHandler.java      |   57 -
 .../client/handler/QueueDeleteOkMethodHandler.java |   57 -
 .../qpid/client/message/AMQMessageDelegate.java    |  138 -
 .../client/message/AMQMessageDelegateFactory.java  |   49 -
 .../client/message/AMQMessageDelegate_0_10.java    | 1015 ------
 .../client/message/AMQMessageDelegate_0_8.java     |  700 ----
 .../client/message/AMQPEncodedListMessage.java     |  911 -----
 .../message/AMQPEncodedListMessageFactory.java     |   38 -
 .../qpid/client/message/AMQPEncodedMapMessage.java |  110 -
 .../message/AMQPEncodedMapMessageFactory.java      |   39 -
 .../client/message/AbstractAMQMessageDelegate.java |  357 --
 .../client/message/AbstractBytesTypedMessage.java  |  113 -
 .../qpid/client/message/AbstractJMSMessage.java    |  463 ---
 .../client/message/AbstractJMSMessageFactory.java  |  254 --
 .../qpid/client/message/CloseConsumerMessage.java  |   43 -
 .../client/message/Encrypted010MessageFactory.java |  263 --
 .../client/message/Encrypted091MessageFactory.java |  256 --
 .../qpid/client/message/JMSBytesMessage.java       |  369 --
 .../client/message/JMSBytesMessageFactory.java     |   37 -
 .../qpid/client/message/JMSHeaderAdapter.java      |  475 ---
 .../apache/qpid/client/message/JMSMapMessage.java  |  518 ---
 .../qpid/client/message/JMSMapMessageFactory.java  |   36 -
 .../qpid/client/message/JMSObjectMessage.java      |  207 --
 .../client/message/JMSObjectMessageFactory.java    |   43 -
 .../qpid/client/message/JMSStreamMessage.java      |  378 --
 .../client/message/JMSStreamMessageFactory.java    |   34 -
 .../apache/qpid/client/message/JMSTextMessage.java |  160 -
 .../qpid/client/message/JMSTextMessageFactory.java |   35 -
 .../qpid/client/message/MessageConverter.java      |  202 -
 .../client/message/MessageEncryptionHelper.java    |  425 ---
 .../client/message/MessageFactoryRegistry.java     |  177 -
 .../qpid/client/message/QpidMessageProperties.java |   42 -
 .../apache/qpid/client/message/ReturnMessage.java  |   47 -
 .../qpid/client/message/UnprocessedMessage.java    |   57 -
 .../client/message/UnprocessedMessage_0_10.java    |   53 -
 .../client/message/UnprocessedMessage_0_8.java     |  168 -
 .../client/messaging/address/AddressHelper.java    |  333 --
 .../apache/qpid/client/messaging/address/Link.java |  255 --
 .../apache/qpid/client/messaging/address/Node.java |  133 -
 .../messaging/address/QpidExchangeOptions.java     |   45 -
 .../client/messaging/address/QpidQueueOptions.java |   85 -
 .../qpid/client/protocol/AMQProtocolSession.java   |  499 ---
 .../protocol/BlockingMethodFrameListener.java      |  124 -
 .../qpid/client/security/AMQCallbackHandler.java   |   30 -
 .../client/security/CallbackHandlerRegistry.java   |  315 --
 .../security/CallbackHandlerRegistry.properties    |   37 -
 .../qpid/client/security/DynamicSaslRegistrar.java |  219 --
 .../security/DynamicSaslRegistrar.properties       |   24 -
 .../apache/qpid/client/security/JCAProvider.java   |   73 -
 .../UsernameHashedPasswordCallbackHandler.java     |  101 -
 .../security/UsernamePasswordCallbackHandler.java  |   64 -
 .../security/amqplain/AmqPlainSaslClient.java      |  105 -
 .../amqplain/AmqPlainSaslClientFactory.java        |   62 -
 .../security/anonymous/AnonymousSaslClient.java    |   52 -
 .../anonymous/AnonymousSaslClientFactory.java      |   50 -
 .../crammd5hashed/CRAMMD5HashedSaslClient.java     |   91 -
 .../CRAMMD5HashedSaslClientFactory.java            |   68 -
 .../oauth2/OAuth2AccessTokenCallbackHandler.java   |   56 -
 .../client/security/oauth2/OAuth2SaslClient.java   |  118 -
 .../security/oauth2/OAuth2SaslClientFactory.java   |   57 -
 .../security/scram/AbstractScramSaslClient.java    |  352 --
 .../client/security/scram/ScramSHA1SaslClient.java |   34 -
 .../security/scram/ScramSHA1SaslClientFactory.java |   60 -
 .../security/scram/ScramSHA256SaslClient.java      |   34 -
 .../scram/ScramSHA256SaslClientFactory.java        |   61 -
 .../state/AMQMethodNotImplementedException.java    |   32 -
 .../org/apache/qpid/client/state/AMQState.java     |   35 -
 .../qpid/client/state/AMQStateChangedEvent.java    |   48 -
 .../apache/qpid/client/state/AMQStateListener.java |   26 -
 .../apache/qpid/client/state/AMQStateManager.java  |  232 --
 .../client/state/StateAwareMethodListener.java     |   37 -
 .../org/apache/qpid/client/state/StateWaiter.java  |  137 -
 .../listener/SpecificMethodFrameListener.java      |   41 -
 .../client/transport/ClientConnectionDelegate.java |  200 -
 .../java/org/apache/qpid/client/url/URLParser.java |  250 --
 .../org/apache/qpid/client/url/URLParser_0_10.java |  423 ---
 .../apache/qpid/client/util/BlockingWaiter.java    |  336 --
 .../util/ClassLoadingAwareObjectInputStream.java   |  177 -
 .../client/util/FlowControllingBlockingQueue.java  |  228 --
 .../qpid/client/util/JMSExceptionHelper.java       |   45 -
 .../qpid/jms/ChannelLimitReachedException.java     |   46 -
 .../main/java/org/apache/qpid/jms/Connection.java  |   69 -
 .../org/apache/qpid/jms/ConnectionListener.java    |   58 -
 .../java/org/apache/qpid/jms/ConnectionURL.java    |  139 -
 .../java/org/apache/qpid/jms/FailoverPolicy.java   |  317 --
 .../main/java/org/apache/qpid/jms/ListMessage.java |   55 -
 .../src/main/java/org/apache/qpid/jms/Message.java |   30 -
 .../java/org/apache/qpid/jms/MessageConsumer.java  |   27 -
 .../java/org/apache/qpid/jms/MessageProducer.java  |   41 -
 .../src/main/java/org/apache/qpid/jms/Session.java |  123 -
 .../java/org/apache/qpid/jms/TopicSubscriber.java  |   32 -
 .../qpid/jms/failover/FailoverExchangeMethod.java  |  314 --
 .../apache/qpid/jms/failover/FailoverMethod.java   |   79 -
 .../jms/failover/FailoverRoundRobinServers.java    |  250 --
 .../qpid/jms/failover/FailoverSingleServer.java    |  177 -
 .../org/apache/qpid/jms/failover/NoFailover.java   |   62 -
 .../java/org/apache/qpid/jndi/Example.properties   |   40 -
 .../java/org/apache/qpid/jndi/NameParserImpl.java  |   37 -
 .../java/org/apache/qpid/jndi/ObjectFactory.java   |  229 --
 .../jndi/PropertiesFileInitialContextFactory.java  |  371 --
 .../java/org/apache/qpid/jndi/ReadOnlyContext.java |  521 ---
 .../qpid/client/AMQConnectionFactoryTest.java      |  103 -
 .../apache/qpid/client/AMQConnectionUnitTest.java  |  148 -
 .../org/apache/qpid/client/AMQDestinationTest.java |  263 --
 .../java/org/apache/qpid/client/AMQQueueTest.java  |   34 -
 .../apache/qpid/client/AMQSession_0_10Test.java    |  789 ----
 .../org/apache/qpid/client/AMQSession_0_8Test.java |  195 -
 .../qpid/client/BasicMessageConsumer_0_8_Test.java |  106 -
 .../qpid/client/ConnectionListenerSupport.java     |   55 -
 .../apache/qpid/client/DispatcherDaemonTest.java   |   67 -
 .../org/apache/qpid/client/MockAMQConnection.java  |   68 -
 .../CloseWhenNoRouteSettingsHelperTest.java        |   77 -
 .../handler/PooledConnectionFactoryTest.java       |  430 ---
 .../message/AMQMessageDelegate_0_10Test.java       |  140 -
 .../message/AMQPEncodedListMessageUnitTest.java    |  153 -
 .../client/message/AbstractJMSMessageTest.java     |   57 -
 .../message/Encrypted010MessageFactoryTest.java    |  158 -
 .../message/Encrypted091MessageFactoryTest.java    |  147 -
 .../qpid/client/message/TestMessageHelper.java     |   60 -
 .../messaging/address/AddressHelperTest.java       |  146 -
 .../client/protocol/AMQProtocolHandlerTest.java    |  330 --
 .../security/CallbackHandlerRegistryTest.java      |  184 -
 .../client/security/DynamicSaslRegistrarTest.java  |  140 -
 .../UsernameHashedPasswordCallbackHandlerTest.java |   93 -
 .../UsernamePasswordCallbackHandlerTest.java       |   73 -
 .../OAuth2AccessTokenCallbackHandlerTest.java      |   54 -
 .../security/oauth2/OAuth2SaslClientTest.java      |   76 -
 .../client/transport/TestNetworkConnection.java    |  157 -
 .../ClassLoadingAwareObjectInputStreamTest.java    |  464 ---
 .../org/apache/qpid/client/util/SimplePojo.java    |   91 -
 .../apache/qpid/filter/JMSSelectorFilterTest.java  |  109 -
 .../org/apache/qpid/jms/FailoverPolicyTest.java    |  338 --
 .../java/org/apache/qpid/jndi/JNDITest.properties  |   28 -
 .../org/apache/qpid/jndi/ObjectFactoryTest.java    |  305 --
 .../PropertiesFileInitialContextFactoryTest.java   |  190 -
 .../unit/basic/FieldTableKeyEnumeratorTest.java    |   94 -
 .../test/unit/basic/FieldTablePropertyTest.java    |   60 -
 .../client/BrokerDetails/BrokerDetailsTest.java    |  228 --
 .../ChannelCloseMethodHandlerNoCloseOk.java        |   97 -
 .../client/channelclose/NoCloseOKStateManager.java |   36 -
 .../client/connectionurl/ConnectionURLTest.java    |  659 ----
 .../unit/client/destinationurl/BindingURLTest.java |  320 --
 .../test/unit/client/message/BytesMessageTest.java |  567 ---
 .../test/unit/client/message/MapMessageTest.java   |  383 --
 .../unit/client/message/ObjectMessageUnitTest.java |  105 -
 .../unit/client/message/StreamMessageTest.java     |  621 ----
 .../test/unit/client/message/TextMessageTest.java  |  300 --
 .../test/unit/message/MessageConverterTest.java    |  151 -
 .../qpid/test/unit/message/NonQpidMessage.java     |  419 ---
 .../qpid/test/unit/message/TestAMQSession.java     |  211 --
 .../org/apache/qpid/test/unit/tests.properties     |   45 -
 common/Composite.tpl                               |  383 --
 common/Constant.tpl                                |   35 -
 common/Enum.tpl                                    |   57 -
 common/Invoker.tpl                                 |   70 -
 common/MethodDelegate.tpl                          |   37 -
 common/Option.tpl                                  |   42 -
 common/StructFactory.tpl                           |   60 -
 common/Type.tpl                                    |   99 -
 common/bin/qpid-jaddr                              |   33 -
 common/build-generate-sources.xml                  |   60 -
 common/codegen                                     |   89 -
 common/etc/qpid-run.conf                           |   25 -
 common/etc/qpid-run.conf.dev                       |   26 -
 common/genutil.py                                  |  256 --
 common/mllib/__init__.py                           |   86 -
 common/mllib/dom.py                                |  310 --
 common/mllib/parsers.py                            |  139 -
 common/mllib/transforms.py                         |  164 -
 common/pom.xml                                     |  181 -
 common/readme.txt                                  |    4 -
 common/src/main/grammar/SelectorParser.jj          |  619 ----
 common/src/main/java/common.bnd                    |   25 -
 .../org/apache/qpid/AMQChannelClosedException.java |   34 -
 .../java/org/apache/qpid/AMQChannelException.java  |   65 -
 .../apache/qpid/AMQConnectionClosedException.java  |   37 -
 .../org/apache/qpid/AMQConnectionException.java    |   65 -
 .../apache/qpid/AMQConnectionFailureException.java |   34 -
 .../org/apache/qpid/AMQDisconnectedException.java  |   32 -
 .../main/java/org/apache/qpid/AMQException.java    |  100 -
 .../java/org/apache/qpid/AMQInternalException.java |   49 -
 .../apache/qpid/AMQInvalidArgumentException.java   |   40 -
 .../apache/qpid/AMQInvalidRoutingKeyException.java |   34 -
 .../org/apache/qpid/AMQPInvalidClassException.java |   37 -
 .../java/org/apache/qpid/AMQProtocolException.java |   40 -
 .../java/org/apache/qpid/AMQSecurityException.java |   45 -
 .../java/org/apache/qpid/AMQTimeoutException.java  |   34 -
 .../org/apache/qpid/AMQUndeliveredException.java   |   49 -
 .../apache/qpid/AMQUnresolvedAddressException.java |   45 -
 .../main/java/org/apache/qpid/QpidException.java   |   77 -
 .../org/apache/qpid/bytebuffer/BufferPool.java     |   67 -
 .../org/apache/qpid/bytebuffer/ByteBufferRef.java  |   34 -
 .../qpid/bytebuffer/NonPooledByteBufferRef.java    |   57 -
 .../qpid/bytebuffer/PooledByteBufferRef.java       |   78 -
 .../org/apache/qpid/bytebuffer/QpidByteBuffer.java |  923 -----
 .../qpid/bytebuffer/QpidByteBufferInputStream.java |  109 -
 .../bytebuffer/QpidByteBufferOutputStream.java     |  113 -
 .../java/org/apache/qpid/codec/AMQDecoder.java     |  233 --
 .../java/org/apache/qpid/codec/ClientDecoder.java  |  320 --
 .../java/org/apache/qpid/codec/ServerDecoder.java  |  251 --
 .../org/apache/qpid/common/AMQPFilterTypes.java    |   62 -
 .../apache/qpid/common/ServerPropertyNames.java    |   65 -
 .../org/apache/qpid/configuration/Accessor.java    |  170 -
 .../qpid/configuration/ClientProperties.java       |  330 --
 .../qpid/configuration/CommonProperties.java       |  265 --
 .../org/apache/qpid/configuration/Configured.java  |   44 -
 .../apache/qpid/configuration/QpidProperty.java    |  210 --
 .../org/apache/qpid/configuration/Validator.java   |   31 -
 .../src/main/java/org/apache/qpid/dtx/XidImpl.java |  261 --
 .../org/apache/qpid/exchange/ExchangeDefaults.java |   63 -
 .../apache/qpid/filter/ArithmeticExpression.java   |  263 --
 .../org/apache/qpid/filter/BinaryExpression.java   |   90 -
 .../org/apache/qpid/filter/BooleanExpression.java  |   36 -
 .../apache/qpid/filter/ComparisonExpression.java   |  613 ----
 .../org/apache/qpid/filter/ConstantExpression.java |  224 --
 .../java/org/apache/qpid/filter/Expression.java    |   35 -
 .../org/apache/qpid/filter/FilterableMessage.java  |   41 -
 .../qpid/filter/JMSMessagePropertyExpression.java  |  241 --
 .../org/apache/qpid/filter/LogicExpression.java    |  114 -
 .../org/apache/qpid/filter/OrderByExpression.java  |   61 -
 .../org/apache/qpid/filter/PropertyExpression.java |   29 -
 .../qpid/filter/PropertyExpressionFactory.java     |   26 -
 .../qpid/filter/SelectorParsingException.java      |   36 -
 .../org/apache/qpid/filter/UnaryExpression.java    |  389 --
 .../qpid/filter/selector/ParseException.java       |  208 --
 .../qpid/filter/selector/SelectorParser.java       | 1232 -------
 .../filter/selector/SelectorParserConstants.java   |  125 -
 .../selector/SelectorParserTokenManager.java       | 1056 ------
 .../qpid/filter/selector/SimpleCharStream.java     |  492 ---
 .../org/apache/qpid/filter/selector/Token.java     |  152 -
 .../apache/qpid/filter/selector/TokenMgrError.java |  168 -
 .../main/java/org/apache/qpid/framing/AMQBody.java |   40 -
 .../java/org/apache/qpid/framing/AMQDataBlock.java |   41 -
 .../java/org/apache/qpid/framing/AMQFrame.java     |   92 -
 .../qpid/framing/AMQFrameDecodingException.java    |   42 -
 .../org/apache/qpid/framing/AMQMethodBody.java     |   42 -
 .../org/apache/qpid/framing/AMQMethodBodyImpl.java |  163 -
 .../qpid/framing/AMQProtocolClassException.java    |   34 -
 .../qpid/framing/AMQProtocolHeaderException.java   |   31 -
 .../qpid/framing/AMQProtocolInstanceException.java |   34 -
 .../qpid/framing/AMQProtocolVersionException.java  |   34 -
 .../org/apache/qpid/framing/AMQShortString.java    |  449 ---
 .../main/java/org/apache/qpid/framing/AMQType.java |  824 -----
 .../java/org/apache/qpid/framing/AMQTypeMap.java   |   52 -
 .../org/apache/qpid/framing/AMQTypedValue.java     |  320 --
 .../org/apache/qpid/framing/AccessRequestBody.java |  173 -
 .../apache/qpid/framing/AccessRequestOkBody.java   |   98 -
 .../java/org/apache/qpid/framing/BasicAckBody.java |  116 -
 .../org/apache/qpid/framing/BasicCancelBody.java   |  117 -
 .../org/apache/qpid/framing/BasicCancelOkBody.java |   99 -
 .../org/apache/qpid/framing/BasicConsumeBody.java  |  205 --
 .../apache/qpid/framing/BasicConsumeOkBody.java    |   99 -
 .../qpid/framing/BasicContentHeaderProperties.java |  965 -----
 .../org/apache/qpid/framing/BasicDeliverBody.java  |  156 -
 .../java/org/apache/qpid/framing/BasicGetBody.java |  129 -
 .../org/apache/qpid/framing/BasicGetEmptyBody.java |   99 -
 .../org/apache/qpid/framing/BasicGetOkBody.java    |  154 -
 .../org/apache/qpid/framing/BasicNackBody.java     |  133 -
 .../org/apache/qpid/framing/BasicPublishBody.java  |  158 -
 .../java/org/apache/qpid/framing/BasicQosBody.java |  128 -
 .../org/apache/qpid/framing/BasicQosOkBody.java    |   79 -
 .../org/apache/qpid/framing/BasicRecoverBody.java  |  106 -
 .../apache/qpid/framing/BasicRecoverSyncBody.java  |  105 -
 .../qpid/framing/BasicRecoverSyncOkBody.java       |   85 -
 .../org/apache/qpid/framing/BasicRejectBody.java   |  116 -
 .../org/apache/qpid/framing/BasicReturnBody.java   |  138 -
 .../org/apache/qpid/framing/ChannelAlertBody.java  |  130 -
 .../org/apache/qpid/framing/ChannelCloseBody.java  |  136 -
 .../apache/qpid/framing/ChannelCloseOkBody.java    |   77 -
 .../org/apache/qpid/framing/ChannelFlowBody.java   |   95 -
 .../org/apache/qpid/framing/ChannelFlowOkBody.java |   96 -
 .../qpid/framing/ChannelMethodProcessor.java       |   44 -
 .../org/apache/qpid/framing/ChannelOpenBody.java   |   85 -
 .../org/apache/qpid/framing/ChannelOpenOkBody.java |  112 -
 .../qpid/framing/ClientChannelMethodProcessor.java |   79 -
 .../qpid/framing/ClientMethodDispatcher.java       |   78 -
 .../apache/qpid/framing/ClientMethodProcessor.java |   39 -
 .../apache/qpid/framing/CompositeAMQDataBlock.java |   81 -
 .../org/apache/qpid/framing/ConfirmSelectBody.java |   95 -
 .../apache/qpid/framing/ConfirmSelectOkBody.java   |   75 -
 .../apache/qpid/framing/ConnectionCloseBody.java   |  132 -
 .../apache/qpid/framing/ConnectionCloseOkBody.java |   79 -
 .../apache/qpid/framing/ConnectionOpenBody.java    |  124 -
 .../apache/qpid/framing/ConnectionOpenOkBody.java  |  100 -
 .../qpid/framing/ConnectionRedirectBody.java       |  110 -
 .../apache/qpid/framing/ConnectionSecureBody.java  |  101 -
 .../qpid/framing/ConnectionSecureOkBody.java       |   98 -
 .../apache/qpid/framing/ConnectionStartBody.java   |  154 -
 .../apache/qpid/framing/ConnectionStartOkBody.java |  143 -
 .../apache/qpid/framing/ConnectionTuneBody.java    |  122 -
 .../apache/qpid/framing/ConnectionTuneOkBody.java  |  122 -
 .../java/org/apache/qpid/framing/ContentBody.java  |  113 -
 .../org/apache/qpid/framing/ContentHeaderBody.java |  198 -
 .../framing/ContentHeaderPropertiesFactory.java    |   58 -
 .../apache/qpid/framing/EncodableAMQDataBlock.java |   35 -
 .../org/apache/qpid/framing/EncodingUtils.java     |  444 ---
 .../org/apache/qpid/framing/ExchangeBoundBody.java |  126 -
 .../apache/qpid/framing/ExchangeBoundOkBody.java   |  119 -
 .../apache/qpid/framing/ExchangeDeclareBody.java   |  224 --
 .../apache/qpid/framing/ExchangeDeclareOkBody.java |   79 -
 .../apache/qpid/framing/ExchangeDeleteBody.java    |  144 -
 .../apache/qpid/framing/ExchangeDeleteOkBody.java  |   79 -
 .../java/org/apache/qpid/framing/FieldArray.java   |  129 -
 .../java/org/apache/qpid/framing/FieldTable.java   | 1223 -------
 .../org/apache/qpid/framing/FieldTableFactory.java |   35 -
 .../qpid/framing/FrameCreatingMethodProcessor.java |  631 ----
 .../org/apache/qpid/framing/HeartbeatBody.java     |   98 -
 .../apache/qpid/framing/MessagePublishInfo.java    |   83 -
 .../org/apache/qpid/framing/MethodDispatcher.java  |   37 -
 .../org/apache/qpid/framing/MethodProcessor.java   |   40 -
 .../org/apache/qpid/framing/MethodRegistry.java    |  565 ---
 .../apache/qpid/framing/ProtocolInitiation.java    |  244 --
 .../org/apache/qpid/framing/ProtocolVersion.java   |  203 --
 .../org/apache/qpid/framing/QueueBindBody.java     |  173 -
 .../org/apache/qpid/framing/QueueBindOkBody.java   |   79 -
 .../org/apache/qpid/framing/QueueDeclareBody.java  |  205 --
 .../apache/qpid/framing/QueueDeclareOkBody.java    |  123 -
 .../org/apache/qpid/framing/QueueDeleteBody.java   |  159 -
 .../org/apache/qpid/framing/QueueDeleteOkBody.java |   98 -
 .../org/apache/qpid/framing/QueuePurgeBody.java    |  129 -
 .../org/apache/qpid/framing/QueuePurgeOkBody.java  |   98 -
 .../org/apache/qpid/framing/QueueUnbindBody.java   |  156 -
 .../org/apache/qpid/framing/QueueUnbindOkBody.java |   79 -
 .../qpid/framing/ServerChannelMethodProcessor.java |   93 -
 .../qpid/framing/ServerMethodDispatcher.java       |   73 -
 .../apache/qpid/framing/ServerMethodProcessor.java |   39 -
 .../java/org/apache/qpid/framing/TxCommitBody.java |   78 -
 .../org/apache/qpid/framing/TxCommitOkBody.java    |   76 -
 .../org/apache/qpid/framing/TxRollbackBody.java    |   76 -
 .../org/apache/qpid/framing/TxRollbackOkBody.java  |   77 -
 .../java/org/apache/qpid/framing/TxSelectBody.java |   79 -
 .../org/apache/qpid/framing/TxSelectOkBody.java    |   75 -
 .../java/org/apache/qpid/messaging/Address.java    |   79 -
 .../apache/qpid/messaging/util/AddressParser.java  |  420 ---
 .../java/org/apache/qpid/messaging/util/JAddr.java |   97 -
 .../org/apache/qpid/messaging/util/LexError.java   |   37 -
 .../java/org/apache/qpid/messaging/util/Lexer.java |   82 -
 .../org/apache/qpid/messaging/util/Lexicon.java    |  103 -
 .../org/apache/qpid/messaging/util/LineInfo.java   |   93 -
 .../org/apache/qpid/messaging/util/ParseError.java |   58 -
 .../org/apache/qpid/messaging/util/Parser.java     |   97 -
 .../org/apache/qpid/messaging/util/PyPrint.java    |  149 -
 .../java/org/apache/qpid/messaging/util/Token.java |  106 -
 ...InheritedAccessControlContextThreadFactory.java |   66 -
 .../qpid/properties/ConnectionStartProperties.java |  107 -
 .../java/org/apache/qpid/protocol/AMQConstant.java |  227 --
 .../org/apache/qpid/protocol/AMQMethodEvent.java   |   90 -
 .../apache/qpid/protocol/AMQMethodListener.java    |   64 -
 .../apache/qpid/protocol/AMQProtocolWriter.java    |   38 -
 .../protocol/AMQVersionAwareProtocolSession.java   |   59 -
 .../apache/qpid/protocol/ProtocolVersionAware.java |   32 -
 .../org/apache/qpid/ssl/SSLContextFactory.java     |  120 -
 .../apache/qpid/streams/CompositeInputStream.java  |  188 -
 .../apache/qpid/thread/DefaultThreadFactory.java   |   45 -
 .../thread/LoggingUncaughtExceptionHandler.java    |   60 -
 .../org/apache/qpid/thread/QpidThreadExecutor.java |   40 -
 .../apache/qpid/thread/RealtimeThreadFactory.java  |   72 -
 .../java/org/apache/qpid/thread/ThreadFactory.java |   28 -
 .../java/org/apache/qpid/thread/Threading.java     |   51 -
 .../java/org/apache/qpid/transport/Acquired.java   |  141 -
 .../java/org/apache/qpid/transport/Binary.java     |  154 -
 .../apache/qpid/transport/ByteBufferReceiver.java  |   30 -
 .../apache/qpid/transport/ByteBufferSender.java    |   34 -
 .../org/apache/qpid/transport/ClientDelegate.java  |  228 --
 .../java/org/apache/qpid/transport/Connection.java |  878 -----
 .../org/apache/qpid/transport/ConnectionClose.java |  196 -
 .../apache/qpid/transport/ConnectionCloseCode.java |   54 -
 .../apache/qpid/transport/ConnectionCloseOk.java   |  111 -
 .../apache/qpid/transport/ConnectionDelegate.java  |  114 -
 .../apache/qpid/transport/ConnectionException.java |   70 -
 .../apache/qpid/transport/ConnectionHeartbeat.java |  111 -
 .../apache/qpid/transport/ConnectionInvoker.java   |   78 -
 .../apache/qpid/transport/ConnectionListener.java  |   41 -
 .../org/apache/qpid/transport/ConnectionOpen.java  |  235 --
 .../apache/qpid/transport/ConnectionOpenOk.java    |  154 -
 .../apache/qpid/transport/ConnectionRedirect.java  |  196 -
 .../apache/qpid/transport/ConnectionSecure.java    |  154 -
 .../apache/qpid/transport/ConnectionSecureOk.java  |  154 -
 .../apache/qpid/transport/ConnectionSettings.java  |  730 ----
 .../org/apache/qpid/transport/ConnectionStart.java |  238 --
 .../apache/qpid/transport/ConnectionStartOk.java   |  280 --
 .../org/apache/qpid/transport/ConnectionTune.java  |  272 --
 .../apache/qpid/transport/ConnectionTuneOk.java    |  232 --
 .../java/org/apache/qpid/transport/Constant.java   |   29 -
 .../apache/qpid/transport/DeliveryProperties.java  |  623 ----
 .../java/org/apache/qpid/transport/DtxCommit.java  |  193 -
 .../java/org/apache/qpid/transport/DtxEnd.java     |  232 --
 .../java/org/apache/qpid/transport/DtxForget.java  |  154 -
 .../org/apache/qpid/transport/DtxGetTimeout.java   |  154 -
 .../java/org/apache/qpid/transport/DtxPrepare.java |  154 -
 .../java/org/apache/qpid/transport/DtxRecover.java |  111 -
 .../org/apache/qpid/transport/DtxRollback.java     |  154 -
 .../java/org/apache/qpid/transport/DtxSelect.java  |  111 -
 .../org/apache/qpid/transport/DtxSetTimeout.java   |  194 -
 .../java/org/apache/qpid/transport/DtxStart.java   |  232 --
 .../org/apache/qpid/transport/DtxXaStatus.java     |   62 -
 .../ExceptionHandlingByteBufferReceiver.java       |   27 -
 .../org/apache/qpid/transport/ExchangeBind.java    |  280 --
 .../org/apache/qpid/transport/ExchangeBound.java   |  280 --
 .../apache/qpid/transport/ExchangeBoundResult.java |  301 --
 .../org/apache/qpid/transport/ExchangeDeclare.java |  397 --
 .../org/apache/qpid/transport/ExchangeDelete.java  |  193 -
 .../org/apache/qpid/transport/ExchangeQuery.java   |  154 -
 .../apache/qpid/transport/ExchangeQueryResult.java |  268 --
 .../org/apache/qpid/transport/ExchangeUnbind.java  |  238 --
 .../apache/qpid/transport/ExecutionErrorCode.java  |   72 -
 .../apache/qpid/transport/ExecutionException.java  |  398 --
 .../org/apache/qpid/transport/ExecutionResult.java |  194 -
 .../org/apache/qpid/transport/ExecutionSync.java   |  111 -
 .../main/java/org/apache/qpid/transport/Field.java |   83 -
 .../org/apache/qpid/transport/FileReturnCode.java  |   52 -
 .../apache/qpid/transport/FragmentProperties.java  |  224 --
 .../apache/qpid/transport/FrameSizeObserver.java   |   26 -
 .../java/org/apache/qpid/transport/Future.java     |   37 -
 .../apache/qpid/transport/GetTimeoutResult.java    |  139 -
 .../java/org/apache/qpid/transport/Header.java     |  143 -
 .../qpid/transport/LegacyClientProperties.java     |   34 -
 .../org/apache/qpid/transport/MessageAccept.java   |  154 -
 .../apache/qpid/transport/MessageAcceptMode.java   |   50 -
 .../org/apache/qpid/transport/MessageAcquire.java  |  154 -
 .../apache/qpid/transport/MessageAcquireMode.java  |   50 -
 .../org/apache/qpid/transport/MessageCancel.java   |  154 -
 .../apache/qpid/transport/MessageCreditUnit.java   |   50 -
 .../apache/qpid/transport/MessageDeliveryMode.java |   50 -
 .../qpid/transport/MessageDeliveryPriority.java    |   66 -
 .../org/apache/qpid/transport/MessageFlow.java     |  236 --
 .../org/apache/qpid/transport/MessageFlowMode.java |   50 -
 .../org/apache/qpid/transport/MessageFlush.java    |  154 -
 .../apache/qpid/transport/MessageProperties.java   |  483 ---
 .../org/apache/qpid/transport/MessageReject.java   |  238 --
 .../apache/qpid/transport/MessageRejectCode.java   |   52 -
 .../org/apache/qpid/transport/MessageRelease.java  |  193 -
 .../org/apache/qpid/transport/MessageResume.java   |  196 -
 .../apache/qpid/transport/MessageResumeResult.java |  139 -
 .../apache/qpid/transport/MessageSetFlowMode.java  |  196 -
 .../org/apache/qpid/transport/MessageStop.java     |  154 -
 .../apache/qpid/transport/MessageSubscribe.java    |  443 ---
 .../org/apache/qpid/transport/MessageTransfer.java |  347 --
 .../java/org/apache/qpid/transport/Method.java     |  230 --
 .../org/apache/qpid/transport/MethodDelegate.java  |  217 --
 .../qpid/transport/NetworkEventReceiver.java       |   32 -
 .../transport/NetworkTransportConfiguration.java   |   53 -
 .../java/org/apache/qpid/transport/Option.java     |   60 -
 .../apache/qpid/transport/ProtocolDelegate.java    |   40 -
 .../org/apache/qpid/transport/ProtocolError.java   |   88 -
 .../org/apache/qpid/transport/ProtocolEvent.java   |   41 -
 .../qpid/transport/ProtocolEventReceiver.java      |   30 -
 .../apache/qpid/transport/ProtocolEventSender.java |   30 -
 .../org/apache/qpid/transport/ProtocolHeader.java  |  122 -
 .../qpid/transport/ProtocolVersionException.java   |   62 -
 .../org/apache/qpid/transport/QueueDeclare.java    |  394 --
 .../org/apache/qpid/transport/QueueDelete.java     |  232 --
 .../java/org/apache/qpid/transport/QueuePurge.java |  154 -
 .../java/org/apache/qpid/transport/QueueQuery.java |  154 -
 .../apache/qpid/transport/QueueQueryResult.java    |  429 ---
 .../main/java/org/apache/qpid/transport/Range.java |  306 --
 .../java/org/apache/qpid/transport/RangeSet.java   |   58 -
 .../org/apache/qpid/transport/RangeSetFactory.java |   38 -
 .../org/apache/qpid/transport/RangeSetImpl.java    |  240 --
 .../org/apache/qpid/transport/RecoverResult.java   |  141 -
 .../java/org/apache/qpid/transport/ReplyTo.java    |  200 -
 .../org/apache/qpid/transport/SegmentType.java     |   54 -
 .../qpid/transport/SenderClosedException.java      |   52 -
 .../org/apache/qpid/transport/SenderException.java |   52 -
 .../org/apache/qpid/transport/ServerDelegate.java  |  215 --
 .../java/org/apache/qpid/transport/Session.java    | 1201 ------
 .../org/apache/qpid/transport/SessionAttach.java   |  193 -
 .../org/apache/qpid/transport/SessionAttached.java |  154 -
 .../qpid/transport/SessionClosedException.java     |   46 -
 .../qpid/transport/SessionCommandFragment.java     |  138 -
 .../apache/qpid/transport/SessionCommandPoint.java |  192 -
 .../apache/qpid/transport/SessionCompleted.java    |  193 -
 .../apache/qpid/transport/SessionConfirmed.java    |  196 -
 .../org/apache/qpid/transport/SessionDelegate.java |  248 --
 .../org/apache/qpid/transport/SessionDetach.java   |  154 -
 .../apache/qpid/transport/SessionDetachCode.java   |   56 -
 .../org/apache/qpid/transport/SessionDetached.java |  196 -
 .../apache/qpid/transport/SessionException.java    |   59 -
 .../org/apache/qpid/transport/SessionExpected.java |  196 -
 .../org/apache/qpid/transport/SessionFlush.java    |  229 --
 .../java/org/apache/qpid/transport/SessionGap.java |  154 -
 .../org/apache/qpid/transport/SessionHeader.java   |  145 -
 .../org/apache/qpid/transport/SessionInvoker.java  |  236 --
 .../qpid/transport/SessionKnownCompleted.java      |  154 -
 .../org/apache/qpid/transport/SessionListener.java |   42 -
 .../qpid/transport/SessionRequestTimeout.java      |  152 -
 .../org/apache/qpid/transport/SessionTimeout.java  |  152 -
 .../apache/qpid/transport/StreamReturnCode.java    |   52 -
 .../java/org/apache/qpid/transport/Struct.java     |  156 -
 .../org/apache/qpid/transport/StructFactory.java   |  200 -
 .../main/java/org/apache/qpid/transport/Track.java |   50 -
 .../apache/qpid/transport/TransportException.java  |   51 -
 .../java/org/apache/qpid/transport/TxCommit.java   |  111 -
 .../java/org/apache/qpid/transport/TxRollback.java |  111 -
 .../java/org/apache/qpid/transport/TxSelect.java   |  111 -
 .../main/java/org/apache/qpid/transport/Type.java  |  148 -
 .../java/org/apache/qpid/transport/XaResult.java   |  141 -
 .../main/java/org/apache/qpid/transport/Xid.java   |  223 --
 .../qpid/transport/codec/AbstractDecoder.java      |  478 ---
 .../qpid/transport/codec/AbstractEncoder.java      |  620 ----
 .../org/apache/qpid/transport/codec/BBDecoder.java |  149 -
 .../org/apache/qpid/transport/codec/BBEncoder.java |  363 --
 .../org/apache/qpid/transport/codec/Decoder.java   |  283 --
 .../org/apache/qpid/transport/codec/Encodable.java |   44 -
 .../org/apache/qpid/transport/codec/Encoder.java   |  281 --
 .../apache/qpid/transport/network/Assembler.java   |  287 --
 .../qpid/transport/network/Disassembler.java       |  298 --
 .../org/apache/qpid/transport/network/Frame.java   |  146 -
 .../qpid/transport/network/InputHandler.java       |  224 --
 .../qpid/transport/network/NetworkConnection.java  |   59 -
 .../qpid/transport/network/NetworkDelegate.java    |   42 -
 .../qpid/transport/network/NetworkEvent.java       |   34 -
 .../org/apache/qpid/transport/network/Ticker.java  |   29 -
 .../qpid/transport/network/TransportActivity.java  |   33 -
 .../transport/network/TransportEncryption.java     |   26 -
 .../transport/network/io/IdleTimeoutTicker.java    |   87 -
 .../transport/network/io/IoNetworkConnection.java  |  169 -
 .../transport/network/io/IoNetworkTransport.java   |  173 -
 .../qpid/transport/network/io/IoReceiver.java      |  268 --
 .../apache/qpid/transport/network/io/IoSender.java |  386 --
 .../qpid/transport/network/security/SSLStatus.java |   49 -
 .../transport/network/security/SecurityLayer.java  |   34 -
 .../network/security/SecurityLayerFactory.java     |  238 --
 .../network/security/sasl/SASLEncryptor.java       |   87 -
 .../network/security/sasl/SASLReceiver.java        |   88 -
 .../network/security/sasl/SASLSender.java          |  124 -
 .../security/ssl/QpidClientX509KeyManager.java     |  117 -
 .../security/ssl/QpidMultipleTrustManager.java     |  103 -
 .../security/ssl/QpidPeersOnlyTrustManager.java    |   81 -
 .../network/security/ssl/SSLReceiver.java          |  216 --
 .../transport/network/security/ssl/SSLSender.java  |  304 --
 .../transport/network/security/ssl/SSLUtil.java    |  644 ----
 .../org/apache/qpid/transport/util/Functions.java  |  187 -
 .../org/apache/qpid/transport/util/Waiter.java     |   63 -
 .../apache/qpid/typedmessage/TypedBytesCodes.java  |   46 -
 .../qpid/typedmessage/TypedBytesContentReader.java |  670 ----
 .../qpid/typedmessage/TypedBytesContentWriter.java |  366 --
 .../typedmessage/TypedBytesFormatException.java    |   29 -
 .../java/org/apache/qpid/url/AMQBindingURL.java    |  250 --
 .../main/java/org/apache/qpid/url/BindingURL.java  |   98 -
 .../java/org/apache/qpid/url/BindingURLParser.java |  432 ---
 .../main/java/org/apache/qpid/url/URLHelper.java   |  173 -
 .../org/apache/qpid/url/URLSyntaxException.java    |   97 -
 .../apache/qpid/util/ByteBufferInputStream.java    |  100 -
 .../java/org/apache/qpid/util/ByteBufferUtils.java |   71 -
 .../org/apache/qpid/util/CommandLineParser.java    |  680 ----
 .../java/org/apache/qpid/util/DataUrlUtils.java    |   32 -
 .../main/java/org/apache/qpid/util/FileUtils.java  |  412 ---
 .../main/java/org/apache/qpid/util/GZIPUtils.java  |  119 -
 .../java/org/apache/qpid/util/NameUUIDGen.java     |   59 -
 .../java/org/apache/qpid/util/RandomUUIDGen.java   |   39 -
 .../src/main/java/org/apache/qpid/util/Serial.java |  109 -
 .../main/java/org/apache/qpid/util/Strings.java    |  430 ---
 .../java/org/apache/qpid/util/SystemUtils.java     |  127 -
 .../main/java/org/apache/qpid/util/UUIDGen.java    |   36 -
 .../src/main/java/org/apache/qpid/util/UUIDs.java  |   62 -
 .../java/org/apache/qpid/QpidExceptionTest.java    |  121 -
 .../bytebuffer/QpidByteBufferOutputStreamTest.java |  114 -
 .../apache/qpid/bytebuffer/QpidByteBufferTest.java |  915 -----
 .../java/org/apache/qpid/codec/AMQDecoderTest.java |  281 --
 .../qpid/configuration/QpidPropertyTest.java       |  185 -
 .../apache/qpid/framing/AMQShortStringTest.java    |  177 -
 .../framing/BasicContentHeaderPropertiesTest.java  |  184 -
 .../org/apache/qpid/framing/FieldTableTest.java    |  947 -----
 .../abstraction/MessagePublishInfoImplTest.java    |   99 -
 ...ritedAccessControlContextThreadFactoryTest.java |   96 -
 .../org/apache/qpid/ssl/SSLContextFactoryTest.java |  136 -
 .../java/org/apache/qpid/ssl/TrustManagerTest.java |  346 --
 .../qpid/streams/CompositeInputStreamTest.java     |  132 -
 .../org/apache/qpid/thread/ThreadFactoryTest.java  |  104 -
 .../qpid/transport/ConnectionSettingsTest.java     |  211 --
 .../org/apache/qpid/transport/ConnectionTest.java  |  473 ---
 .../java/org/apache/qpid/transport/GenTest.java    |   44 -
 .../org/apache/qpid/transport/RangeSetTest.java    |  353 --
 .../apache/qpid/transport/SessionTimeoutTest.java  |   81 -
 .../apache/qpid/transport/codec/BBEncoderTest.java |   47 -
 .../qpid/transport/network/ConnectionBinding.java  |  101 -
 .../network/io/IdleTimeoutTickerTest.java          |  256 --
 .../qpid/transport/network/io/IoAcceptor.java      |  122 -
 .../qpid/transport/network/io/IoTransport.java     |   92 -
 .../network/security/ssl/SSLUtilTest.java          | 1682 ---------
 .../qpid/util/ByteBufferInputStreamTest.java       |  111 -
 .../apache/qpid/util/CommandLineParserTest.java    |  550 ---
 .../java/org/apache/qpid/util/FileUtilsTest.java   |  694 ----
 .../java/org/apache/qpid/util/GZIPUtilsTest.java   |  102 -
 .../test/java/org/apache/qpid/util/SerialTest.java |   78 -
 .../java/org/apache/qpid/util/StringsTest.java     |   48 -
 common/templates/method/MethodBodyInterface.vm     |   50 -
 common/templates/method/version/MethodBodyClass.vm |  196 -
 .../model/ClientMethodDispatcherInterface.vm       |   55 -
 .../templates/model/MethodDispatcherInterface.vm   |   36 -
 common/templates/model/MethodRegistryClass.vm      |   98 -
 common/templates/model/ProtocolVersionListClass.vm |  189 -
 .../model/ServerMethodDispatcherInterface.vm       |   55 -
 .../version/ClientMethodDispatcherInterface.vm     |   54 -
 .../model/version/MethodDispatcherInterface.vm     |   41 -
 .../templates/model/version/MethodRegistryClass.vm |  179 -
 .../version/ServerMethodDispatcherInterface.vm     |   55 -
 common/templating.py                               |  119 -
 doc/java-broker/pom.xml                            |   10 +-
 .../src/docbkx/AMQP-Messaging-Broker-Java-Book.xml |   42 -
 .../src/docbkx/Apache-Qpid-Broker-J-Book.xml       |   44 +
 .../docbkx/Java-Broker-Appendix-Miscellaneous.xml  |   47 +-
 ...roker-Appendix-Operational-Logging-Messages.xml |  168 +-
 ...Broker-Appendix-Queue-Declaration-Arguments.xml |  176 +
 .../Java-Broker-Appendix-Statistics-Reporting.xml  |  101 +
 .../Java-Broker-Appendix-System-Properties.xml     |    7 -
 .../src/docbkx/Java-Broker-Getting-Started.xml     |    9 +-
 .../src/docbkx/Java-Broker-High-Availability.xml   |   27 +-
 .../docbkx/Java-Broker-Initial-Configuration.xml   |   30 +-
 .../src/docbkx/Java-Broker-Installation.xml        |   14 +-
 .../src/docbkx/Java-Broker-Introduction.xml        |   33 +-
 .../src/docbkx/Java-Broker-Management-Channels.xml |    1 -
 .../Java-Broker-Management-Managing-Entities.xml   |    1 -
 .../src/docbkx/Java-Broker-Security.xml            |    2 +-
 .../concepts/Java-Broker-Concepts-Exchanges.xml    |   18 +-
 .../Java-Broker-Concepts-Other-Services.xml        |    2 +-
 .../concepts/Java-Broker-Concepts-Overview.xml     |   13 +-
 .../concepts/Java-Broker-Concepts-Queues.xml       |  227 +-
 .../concepts/Java-Broker-Concepts-Virtualhosts.xml |   10 +-
 .../src/docbkx/images/Broker-MessageFlow.png       |  Bin 36827 -> 36840 bytes
 .../src/docbkx/images/JMX-Connect-MBeans.png       |  Bin 66586 -> 54557 bytes
 .../src/docbkx/images/JMX-Connect-Remote.png       |  Bin 66411 -> 55060 bytes
 .../docbkx/images/Management-Web-Add-Dialogue.png  |  Bin 70733 -> 92422 bytes
 .../docbkx/images/Management-Web-ContextVar.png    |  Bin 29470 -> 33453 bytes
 .../docbkx/images/Management-Web-Edit-Dialogue.png |  Bin 27262 -> 31643 bytes
 .../images/Management-Web-Logging-FileLogger.png   |  Bin 136172 -> 107458 bytes
 .../Management-Web-Logging-InclusionRule.png       |  Bin 149497 -> 118676 bytes
 .../images/Management-Web-Logging-MemoryLogger.png |  Bin 229299 -> 190563 bytes
 .../src/docbkx/images/VirtualHost-Model.png        |  Bin 24672 -> 24613 bytes
 .../Java-Broker-Management-Channel-QMF.xml         |   26 -
 .../Java-Broker-Management-Channel-REST-API.xml    |   54 +-
 ...va-Broker-Management-Channel-REST-Query-API.xml |    2 +-
 .../Java-Broker-Management-Channel-Web-Console.xml |    2 +-
 ...anagement-Managing-Access-Control-Providers.xml |    2 +-
 .../Java-Broker-Management-Managing-Broker.xml     |    4 -
 ...-Broker-Management-Managing-Entities-Matrix.xml |  128 -
 .../Java-Broker-Management-Managing-Exchanges.xml  |   21 +-
 .../Java-Broker-Management-Managing-Keystores.xml  |    2 +-
 .../Java-Broker-Management-Managing-Ports.xml      |    6 +
 .../Java-Broker-Management-Managing-Queues.xml     |   31 +-
 ...Java-Broker-Management-Managing-Truststores.xml |    4 +
 ...Broker-Management-Managing-VirtualhostNodes.xml |    7 +-
 ...ava-Broker-Management-Managing-Virtualhosts.xml |    4 +-
 .../Java-Broker-Runtime-Close-On-No-Route.xml      |   36 +-
 ...Disk-Space-Management-Producer-Flow-Control.xml |  210 +-
 .../runtime/Java-Broker-Runtime-Flow-To-Disk.xml   |   17 +-
 ...ker-Runtime-Handling-Undeliverable-Messages.xml |   54 +-
 .../runtime/Java-Broker-Runtime-Log-Files.xml      |    2 +-
 .../docbkx/runtime/Java-Broker-Runtime-Memory.xml  |   33 +-
 .../Java-Broker-Runtime-Message-Compression.xml    |    2 +-
 ...Broker-Runtime-Producer-Transaction-Timeout.xml |    6 +
 .../docbkx/security/Java-Broker-Security-ACLs.xml  |  638 ----
 ...Java-Broker-Security-AccessControlProviders.xml |  568 +++
 ...-Security-Authentication-Providers-External.xml |    2 +-
 .../Java-Broker-Security-Group-Providers.xml       |    2 +-
 doc/java-perftests/pom.xml                         |    4 +-
 doc/jms-client-0-10/pom.xml                        |   72 -
 .../src/docbkx/JMS-Client-0-10-Book.xml            | 2421 ------------
 doc/jms-client-0-8/pom.xml                         |   72 -
 .../src/docbkx/JMS-Client-Appendix-Exceptions.xml  |  180 -
 .../src/docbkx/JMS-Client-Appendix-Maven.xml       |   63 -
 ...JMS-Client-Appendix-PooledConnectionFactory.xml |   92 -
 ...JMS-Client-Appendix-Tomcat-JNDI-Integration.xml |  186 -
 .../src/docbkx/JMS-Client-Binding-URL.xml          |  257 --
 doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml  |   48 -
 .../src/docbkx/JMS-Client-Connection-URL.xml       |  422 ---
 ...Client-Document-Scope-And-Intended-Audience.xml |   57 -
 .../src/docbkx/JMS-Client-Examples.xml             |  282 --
 .../docbkx/JMS-Client-Getting-And-Dependencies.xml |   61 -
 .../src/docbkx/JMS-Client-Introduction.xml         |   41 -
 .../src/docbkx/JMS-Client-JMS-Extensions.xml       |   89 -
 .../docbkx/JMS-Client-JNDI-Properties-Format.xml   |   75 -
 .../src/docbkx/JMS-Client-Logging.xml              |   63 -
 .../src/docbkx/JMS-Client-Message-Encryption.xml   |  393 --
 .../src/docbkx/JMS-Client-System-Properties.xml    |  635 ----
 .../src/docbkx/JMS-Client-Understanding.xml        |  501 ---
 .../src/docbkx/images/JndiOverview.png             |  Bin 67726 -> 0 bytes
 .../src/docbkx/images/JndiOverview.svg             |   23 -
 .../src/docbkx/images/QpidJmsOverview.png          |  Bin 52377 -> 0 bytes
 .../src/docbkx/images/QpidJmsOverview.svg          |   23 -
 doc/pom.xml                                        |   10 +-
 jca/README-GERONIMO.txt                            |   47 -
 jca/README-JBOSS-EAP6.txt                          |  201 -
 jca/README-JBOSS.txt                               |  183 -
 jca/README.txt                                     |  250 --
 jca/example/README-EXAMPLE.txt                     |  258 --
 jca/example/README-GERONIMO.txt                    |   87 -
 jca/example/README-GLASSFISH.txt                   |  102 -
 jca/example/README-JBOSS.txt                       |  125 -
 jca/example/README-JBOSS7.txt                      |  147 -
 jca/example/build-geronimo-properties.xml          |  196 -
 jca/example/build-glassfish-properties.xml         |  137 -
 jca/example/build-jboss-properties.xml             |  122 -
 jca/example/build-jboss7-properties.xml            |  132 -
 jca/example/build-properties.xml.temp              |   24 -
 jca/example/build.xml                              |  206 --
 jca/example/conf/application.xml                   |   37 -
 jca/example/conf/ejb-jar.xml                       |   40 -
 jca/example/conf/geronimo-application.xml          |  121 -
 jca/example/conf/geronimo-ra.xml                   |  141 -
 jca/example/conf/glassfish-ejb-jar.xml             |   90 -
 jca/example/conf/glassfish-resources.xml           |   94 -
 jca/example/conf/glassfish-web.xml                 |   46 -
 jca/example/conf/jboss-ejb-client.properties       |   32 -
 jca/example/conf/jboss-web.xml                     |   39 -
 jca/example/conf/jboss.xml                         |   52 -
 jca/example/conf/log4j.properties                  |   36 -
 jca/example/conf/qpid-jca-ds.xml                   |  126 -
 jca/example/conf/qpid-standalone.xml               |  422 ---
 jca/example/conf/web.xml                           |   50 -
 jca/example/qpid-jca-example-properties.xml        |   84 -
 .../example/client/QpidRequestResponseClient.java  |  159 -
 .../qpid/jca/example/client/QpidTestClient.java    |  134 -
 .../qpid/jca/example/client/QpidTestUtil.java      |   52 -
 .../jca/example/ejb/QpidGoodByeListenerBean.java   |   65 -
 .../jca/example/ejb/QpidGoodByeSubscriberBean.java |   66 -
 .../jca/example/ejb/QpidHelloListenerBean.java     |   98 -
 .../jca/example/ejb/QpidHelloSubscriberBean.java   |   99 -
 .../qpid/jca/example/ejb/QpidJMSResponderBean.java |  104 -
 .../org/apache/qpid/jca/example/ejb/QpidTest.java  |   30 -
 .../apache/qpid/jca/example/ejb/QpidTestBean.java  |  104 -
 .../apache/qpid/jca/example/ejb/QpidTestLocal.java |   29 -
 .../qpid/jca/example/ejb/QpidTestRemote.java       |   29 -
 .../org/apache/qpid/jca/example/ejb/QpidUtil.java  |   90 -
 .../example/web/QpidRequestResponseServlet.java    |  283 --
 .../qpid/jca/example/web/QpidTestServlet.java      |  229 --
 jca/pom.xml                                        |  140 -
 jca/rar/pom.xml                                    |   69 -
 jca/rar/src/main/resources/META-INF/jboss-ra.xml   |   33 -
 jca/rar/src/main/resources/META-INF/ra.xml         |  230 --
 .../qpid/ra/ConnectionFactoryObjectFactory.java    |   62 -
 .../qpid/ra/ConnectionFactoryProperties.java       |  216 --
 .../org/apache/qpid/ra/QpidRABytesMessage.java     |  462 ---
 .../apache/qpid/ra/QpidRAConnectionFactory.java    |   58 -
 .../qpid/ra/QpidRAConnectionFactoryImpl.java       |  442 ---
 .../apache/qpid/ra/QpidRAConnectionManager.java    |   80 -
 .../apache/qpid/ra/QpidRAConnectionMetaData.java   |  176 -
 .../qpid/ra/QpidRAConnectionRequestInfo.java       |  361 --
 .../java/org/apache/qpid/ra/QpidRACredential.java  |  245 --
 .../java/org/apache/qpid/ra/QpidRAException.java   |   70 -
 .../org/apache/qpid/ra/QpidRALocalTransaction.java |  129 -
 .../org/apache/qpid/ra/QpidRAMCFProperties.java    |  177 -
 .../apache/qpid/ra/QpidRAManagedConnection.java    |  838 -----
 .../qpid/ra/QpidRAManagedConnectionFactory.java    |  623 ----
 .../java/org/apache/qpid/ra/QpidRAMapMessage.java  |  457 ---
 .../java/org/apache/qpid/ra/QpidRAMessage.java     |  782 ----
 .../org/apache/qpid/ra/QpidRAMessageConsumer.java  |  353 --
 .../org/apache/qpid/ra/QpidRAMessageListener.java  |   74 -
 .../org/apache/qpid/ra/QpidRAMessageProducer.java  |  419 ---
 .../java/org/apache/qpid/ra/QpidRAMetaData.java    |  116 -
 .../org/apache/qpid/ra/QpidRAObjectMessage.java    |   85 -
 .../java/org/apache/qpid/ra/QpidRAProperties.java  |  164 -
 .../org/apache/qpid/ra/QpidRAQueueBrowser.java     |  139 -
 .../org/apache/qpid/ra/QpidRAQueueReceiver.java    |   70 -
 .../java/org/apache/qpid/ra/QpidRAQueueSender.java |  147 -
 .../java/org/apache/qpid/ra/QpidRASession.java     |   35 -
 .../org/apache/qpid/ra/QpidRASessionFactory.java   |   62 -
 .../apache/qpid/ra/QpidRASessionFactoryImpl.java   |  913 -----
 .../java/org/apache/qpid/ra/QpidRASessionImpl.java | 1736 ---------
 .../org/apache/qpid/ra/QpidRAStreamMessage.java    |  415 ---
 .../java/org/apache/qpid/ra/QpidRATextMessage.java |   83 -
 .../org/apache/qpid/ra/QpidRATopicPublisher.java   |  220 --
 .../org/apache/qpid/ra/QpidRATopicSubscriber.java  |   86 -
 .../java/org/apache/qpid/ra/QpidRAXAResource.java  |  258 --
 .../org/apache/qpid/ra/QpidResourceAdapter.java    |  777 ----
 jca/src/main/java/org/apache/qpid/ra/Util.java     |  174 -
 .../apache/qpid/ra/admin/AdminObjectFactory.java   |   71 -
 .../org/apache/qpid/ra/admin/QpidBindingURL.java   |   52 -
 .../qpid/ra/admin/QpidConnectionFactoryProxy.java  |  222 --
 .../apache/qpid/ra/admin/QpidDestinationProxy.java |  162 -
 .../java/org/apache/qpid/ra/admin/QpidQueue.java   |   27 -
 .../org/apache/qpid/ra/admin/QpidQueueImpl.java    |   97 -
 .../java/org/apache/qpid/ra/admin/QpidTopic.java   |   28 -
 .../org/apache/qpid/ra/admin/QpidTopicImpl.java    |   95 -
 .../org/apache/qpid/ra/inflow/QpidActivation.java  |  215 --
 .../apache/qpid/ra/inflow/QpidActivationSpec.java  |  627 ----
 .../qpid/ra/inflow/QpidExceptionHandler.java       |  339 --
 .../apache/qpid/ra/inflow/QpidMessageHandler.java  |  282 --
 .../ra/tm/GeronimoTransactionManagerLocator.java   |   63 -
 .../ra/tm/GlassfishTransactionManagerLocator.java  |   63 -
 .../ra/tm/JBoss7TransactionManagerLocator.java     |   53 -
 .../qpid/ra/tm/JBossTransactionManagerLocator.java |   70 -
 .../qpid/ra/tm/WLSTransactionManagerLocator.java   |   64 -
 .../org/apache/qpid/ra/QpidActivationSpecTest.java |   43 -
 .../apache/qpid/ra/QpidResourceAdapterTest.java    |   78 -
 joramtests/pom.xml                                 |   37 +-
 .../qpid/joramtests/admin/JavaBrokerAdmin.java     |   86 +-
 .../test/resources/jms-client/surefire.excludes    |   20 +
 .../qpid-amqp-1-0-client-jms/surefire.excludes     |   24 +
 .../resources/qpid-jms-client/surefire.excludes    |   20 +
 .../combined_competing_consumers_plain.chartdef    |   48 +
 .../combined_persistent_transaction_plain.chartdef |   11 +-
 .../combined_persistent_transaction_ssl.chartdef   |   11 +-
 .../combined_transient_autoack_plain.chartdef      |    9 +-
 .../combined_transient_autoack_ssl.chartdef        |    9 +-
 .../combined_transient_transaction_plain.chartdef  |   11 +-
 .../combined_transient_transaction_ssl.chartdef    |   11 +-
 perftests/etc/json_config_tool.py                  |    2 +-
 .../etc/perftests-jndi-qpid-jms-client.properties  |   30 -
 perftests/etc/perftests-jndi.properties            |   31 -
 perftests/etc/testdefs/defaultTests.js             |   43 +-
 perftests/pom.xml                                  |  350 +-
 perftests/src/main/assembly/NOTICE                 |   27 +-
 .../dependency-verification/DEPENDENCIES_REFERENCE |   22 +-
 perftests/src/main/assembly/qpid-perftests-bin.xml |   10 +-
 .../org/apache/qpid/disttest/ControllerRunner.java |   13 +-
 .../qpid/disttest/DistributedTestConstants.java    |    5 -
 .../client/property/ListPropertyValue.java         |    2 +-
 .../property/NumericGeneratedPropertySupport.java  |    2 +-
 .../client/property/RangePropertyValue.java        |    2 +-
 .../qpid/disttest/controller/Controller.java       |    9 +-
 .../controller/HillClimbingTestRunner.java         |    4 +
 .../apache/qpid/disttest/db/ResultsDbWriter.java   |   12 +-
 .../qpid/disttest/jms/ClientJmsDelegate.java       |   88 +-
 .../qpid/disttest/jms/ControllerJmsDelegate.java   |   38 +-
 .../qpid/disttest/jms/ExistingQueueDrainer.java    |   12 +
 .../apache/qpid/disttest/jms/NoOpQueueCreator.java |   13 +
 .../apache/qpid/disttest/jms/QpidQueueCreator.java |  455 ---
 .../qpid/disttest/jms/QpidQueueCreatorFactory.java |   68 +
 .../qpid/disttest/jms/QpidRestAPIQueueCreator.java |  168 +-
 .../org/apache/qpid/disttest/jms/QueueCreator.java |    3 +
 .../apache/qpid/disttest/ArgumentParserTest.java   |    2 +-
 .../apache/qpid/disttest/ConfigFileHelperTest.java |    1 +
 .../disttest/controller/ClientRegistryTest.java    |   16 +-
 .../qpid/disttest/controller/ControllerTest.java   |    8 +-
 .../controller/config/ConfigReaderTest.java        |    1 +
 .../qpid/disttest/db/ResultsDbWriterTest.java      |    4 +-
 .../disttest/results/ResultsCsvWriterTest.java     |   17 +-
 .../disttest/results/ResultsXmlWriterTest.java     |   16 +-
 .../src/test/resources/jms-client/jndi.properties  |   32 +
 perftests/src/test/resources/logback-test.xml      |   34 +
 .../test/resources/qpid-jms-client/jndi.properties |   31 +
 perftests/visualisation-jfc/pom.xml                |   17 +-
 .../qpid-perftests-visualisation-jfc-bin.xml       |    2 +-
 .../definition/ChartingDefinitionCreator.java      |    2 +-
 .../definition/SeriesDefinitionCreator.java        |    2 +-
 .../charting/chartbuilder/ChartProductionTest.java |    4 +-
 .../disttest/charting/writer/ChartWriterTest.java  |    5 +-
 .../src/test/resources/logback-test.xml            |   34 +
 pom.xml                                            |  651 +++-
 qpid-perftests-systests/pom.xml                    |   55 +-
 .../systest/disttest/QpidQueueCreatorTest.java     |  101 -
 .../systest/disttest/endtoend/EndToEndTest.java    |   60 +-
 .../qpid/systest/disttest/endtoend/error.json      |    2 +-
 .../qpid/systest/disttest/endtoend/hillclimbing.js |    6 +-
 .../qpid/systest/disttest/endtoend/iterations.json |    6 +-
 .../disttest/endtoend/manyparticipants.json        |   12 +-
 qpid-systests-parent/pom.xml                       |   33 +-
 qpid-test-utils/pom.xml                            |    9 +-
 .../utils/LogbackPropertyValueDiscriminator.java   |    2 +
 .../org/apache/qpid/test/utils/PortHelper.java     |   10 +-
 .../org/apache/qpid/test/utils/QpidTestCase.java   |   39 +-
 .../org/apache/qpid/test/utils/TCPTunneler.java    |   90 +-
 .../org/apache/qpid/test/utils/TestFileUtils.java  |    6 +-
 .../apache/qpid/test/utils/TestSSLConstants.java   |    2 +
 systests/end-to-end-conversion-tests/pom.xml       |  196 +
 .../ClientInstructionBuilder.java                  |  116 +
 .../EndToEndConversionTestBase.java                |  395 ++
 .../end_to_end_conversion/client/Client.java       |  341 ++
 .../client/ClientInstruction.java                  |   27 +
 .../end_to_end_conversion/client/ClientResult.java |   43 +
 .../client/ConfigureDestination.java               |   39 +
 .../client/ConfigureJndiContext.java               |   43 +
 .../client/MessageCreator.java                     |  189 +
 .../client/MessageDescription.java                 |  144 +
 .../client/MessageVerifier.java                    |  354 ++
 .../client/MessagingInstruction.java               |   80 +
 .../client/SerializableTestClass.java              |   79 +
 .../client/VerificationException.java              |   29 +
 .../dependency_resolution/Booter.java              |  103 +
 .../dependency_resolution/ClasspathQuery.java      |  204 ++
 .../ConsoleRepositoryListener.java                 |  128 +
 .../ConsoleTransferListener.java                   |  175 +
 .../ManualRepositorySystemFactory.java             |   58 +
 .../utils/LoggingOutputStream.java                 |  277 ++
 .../config-end-to-end-conversion-tests.json        |   47 +
 .../src/main/resources/logback-test.xml            |   48 +
 .../SimpleConversionTest.java                      |  340 ++
 systests/etc/config-systests.json                  |    2 +-
 systests/pom.xml                                   |  102 +-
 systests/protocol-tests-amqp-1-0/pom.xml           |  149 +
 .../qpid/tests/protocol/v1_0/FrameTransport.java   |  246 ++
 .../qpid/tests/protocol/v1_0/HeaderResponse.java   |   46 +
 .../qpid/tests/protocol/v1_0/InputHandler.java     |  305 ++
 .../qpid/tests/protocol/v1_0/Interaction.java      | 1121 ++++++
 .../v1_0/InteractionTransactionalState.java        |   50 +
 .../apache/qpid/tests/protocol/v1_0/Matchers.java  |   60 +
 .../qpid/tests/protocol/v1_0/MessageDecoder.java   |  204 ++
 .../qpid/tests/protocol/v1_0/MessageEncoder.java   |   81 +
 .../qpid/tests/protocol/v1_0/OutputHandler.java    |   96 +
 .../tests/protocol/v1_0/PerformativeResponse.java  |   56 +
 .../apache/qpid/tests/protocol/v1_0/Response.java  |   25 +
 .../protocol/v1_0/SaslPerformativeResponse.java    |   56 +
 .../tests/protocol/v1_0/SpecificationTest.java     |   34 +
 .../org/apache/qpid/tests/protocol/v1_0/Utils.java |  118 +
 .../websocket/WebSocketFrameTransport.java         |  231 ++
 .../src/main/resources/config-protocol-tests.json  |   98 +
 .../qpid/tests/protocol/v1_0/DecodeErrorTest.java  |  201 +
 .../bindmapjms/TemporaryDestinationTest.java       |  116 +
 .../extensions/soleconn/CloseExistingPolicy.java   |  213 ++
 .../v1_0/extensions/soleconn/MixedPolicy.java      |  121 +
 .../soleconn/RefuseConnectionPolicy.java           |  255 ++
 .../v1_0/extensions/websocket/WebSocketTest.java   |  114 +
 .../protocol/v1_0/messaging/DeleteOnCloseTest.java |  187 +
 .../protocol/v1_0/messaging/MessageFormat.java     |  125 +
 .../protocol/v1_0/messaging/MultiTransferTest.java |  394 ++
 .../tests/protocol/v1_0/messaging/OutcomeTest.java |  105 +
 .../protocol/v1_0/messaging/TransferTest.java      |  886 +++++
 .../protocol/v1_0/transaction/DischargeTest.java   |  301 ++
 .../transaction/TransactionalTransferTest.java     |  683 ++++
 .../v1_0/transport/ProtocolHeaderTest.java         |   79 +
 .../v1_0/transport/connection/OpenTest.java        |  137 +
 .../protocol/v1_0/transport/link/AttachTest.java   |  210 ++
 .../protocol/v1_0/transport/link/FlowTest.java     |  198 +
 .../v1_0/transport/link/ResumeDeliveriesTest.java  |  777 ++++
 .../v1_0/transport/security/sasl/SaslTest.java     |  297 ++
 .../protocol/v1_0/transport/session/BeginTest.java |  112 +
 systests/qpid-systests-jms_2.0/pom.xml             |  114 +
 .../jms_2_0/connection/ConnectionTest.java         |   35 +
 .../jms_2_0/deliverycount/DeliveryCountTest.java   |  113 +
 .../jms_2_0/deliverydelay/DeliveryDelayTest.java   |  205 ++
 .../apache/qpid/systests/jms_2_0/package-info.java |   25 +
 .../subscription/SharedSubscriptionTest.java       |  322 ++
 .../java/org/apache/qpid/systest/rest/Asserts.java |   73 +-
 .../apache/qpid/systest/rest/RestTestHelper.java   |   71 +-
 .../qpid/test/utils/AbstractBrokerHolder.java      |   29 +-
 .../qpid/test/utils/AmqpManagementFacade.java      |  352 ++
 .../apache/qpid/test/utils/ConnectionBuilder.java  |   43 +
 .../qpid/test/utils/InternalBrokerHolder.java      |  100 +-
 .../org/apache/qpid/test/utils/JmsProvider.java    |   96 +
 .../java/org/apache/qpid/test/utils/Piper.java     |    1 +
 .../apache/qpid/test/utils/QpidBrokerTestCase.java |  339 +-
 .../utils/QpidJmsClient0xConnectionBuilder.java    |  177 +
 .../qpid/test/utils/QpidJmsClient0xProvider.java   |  324 ++
 .../test/utils/QpidJmsClientConnectionBuilder.java |  205 ++
 .../qpid/test/utils/QpidJmsClientProvider.java     |  490 +++
 .../qpid/test/utils/SpawnedBrokerHolder.java       |   49 +-
 .../qpid/test/utils/TestBrokerConfiguration.java   |   29 +-
 systests/src/main/resources/logback-test.xml       |    2 +
 .../qpid/client/AMQQueueDeferredOrderingTest.java  |  167 -
 .../qpid/client/AsynchMessageListenerTest.java     |    6 +-
 .../java/org/apache/qpid/client/HeartbeatTest.java |   29 +-
 .../org/apache/qpid/client/SessionCreateTest.java  |    2 +-
 .../org/apache/qpid/client/SyncPublishTest.java    |   41 +-
 .../org/apache/qpid/client/SynchReceiveTest.java   |   36 +-
 .../qpid/client/TemporaryQueuePrefixTest.java      |   12 +-
 .../qpid/client/connection/ExistingSocketTest.java |    5 +-
 .../client/failover/FailoverBehaviourTest.java     |   29 +-
 .../failover/MultipleBrokersFailoverTest.java      |    9 +-
 .../client/message/AMQPEncodedMapMessageTest.java  |    2 +
 .../qpid/client/message/JmsObjectMessageTest.java  |  340 --
 .../qpid/client/message/NonQpidObjectMessage.java  |  235 --
 .../ObjectMessageClassWhitelistingTest.java        |  340 ++
 .../client/prefetch/PrefetchBehaviourTest.java     |   14 +-
 .../client/redelivered/RedeliveredMessageTest.java |   54 +-
 .../qpid/client/session/ExchangeDeleteTest.java    |    5 +-
 .../qpid/client/session/QueueDeclareTest.java      |    1 +
 .../qpid/client/session/QueueDeleteTest.java       |    7 +-
 .../java/org/apache/qpid/client/ssl/SSLTest.java   |  266 +-
 .../org/apache/qpid/jms/xa/XAResourceTest.java     |  149 -
 .../org/apache/qpid/ra/QpidRAConnectionTest.java   |   93 -
 .../org/apache/qpid/ra/QpidRAXAResourceTest.java   |   58 -
 .../ra/admin/QpidConnectionFactoryProxyTest.java   |  116 -
 .../qpid/server/AbruptClientDisconnectTest.java    |   44 +-
 .../org/apache/qpid/server/BrokerStartupTest.java  |   25 +-
 .../qpid/server/SupportedProtocolVersionsTest.java |   17 +-
 .../ReturnUnroutableMandatoryMessageTest.java      |   33 +-
 .../qpid/server/failover/FailoverMethodTest.java   |    1 +
 .../qpid/server/logging/AbstractTestLogging.java   |    8 +-
 .../server/logging/AccessControlLoggingTest.java   |   96 +-
 .../apache/qpid/server/logging/AlertingTest.java   |   10 +-
 .../qpid/server/logging/BindingLoggingTest.java    |  223 --
 .../qpid/server/logging/BrokerLoggingTest.java     |    2 +-
 .../qpid/server/logging/ChannelLoggingTest.java    |   46 +-
 .../qpid/server/logging/ConnectionLoggingTest.java |   14 +-
 .../qpid/server/logging/ConsumerLoggingTest.java   |   39 +-
 .../server/logging/DurableQueueLoggingTest.java    |    1 +
 .../qpid/server/logging/ExchangeLoggingTest.java   |   49 +-
 .../qpid/server/logging/QueueLoggingTest.java      |    1 +
 .../server/logging/TransientQueueLoggingTest.java  |    1 +
 .../persistent/NoLocalAfterRecoveryTest.java       |   10 +-
 .../qpid/server/queue/ArrivalTimeFilterTest.java   |    3 +-
 .../qpid/server/queue/ConsumerPriorityTest.java    |    1 +
 .../server/queue/DeepQueueConsumeWithSelector.java |    7 +-
 .../qpid/server/queue/DefaultFiltersTest.java      |   23 +-
 .../queue/EnsureNondestructiveConsumersTest.java   |   28 +-
 .../apache/qpid/server/queue/FlowToDiskTest.java   |   90 +
 .../qpid/server/queue/LastValueQueueTest.java      |  154 +-
 .../qpid/server/queue/LiveQueueOperationsTest.java |   45 +-
 .../qpid/server/queue/MessageGroupQueueTest.java   |  525 +--
 .../org/apache/qpid/server/queue/ModelTest.java    |    2 +-
 .../queue/MultipleTransactedBatchProducerTest.java |   48 +-
 .../server/queue/NodeAutoCreationPolicyTest.java   |  223 +-
 .../qpid/server/queue/PriorityQueueTest.java       |   66 +-
 .../qpid/server/queue/ProducerFlowControlTest.java |  430 ++-
 .../apache/qpid/server/queue/QueueBindTest.java    |    1 +
 .../server/queue/QueueDepthWithSelectorTest.java   |   33 +-
 .../server/queue/QueueMessageDurabilityTest.java   |  182 +-
 .../apache/qpid/server/queue/SortedQueueTest.java  |   84 +-
 .../apache/qpid/server/queue/TimeToLiveTest.java   |   55 +-
 .../routing/AlternateBindingRoutingTest.java       |   88 +
 .../qpid/server/routing/ExchangeRoutingTest.java   |  187 +
 .../server/security/acl/AbstractACLTestCase.java   |  150 +-
 .../security/acl/Amqp0xMessagingACLTest.java       |   56 +
 .../server/security/acl/ExhaustiveACLTest.java     |  216 --
 .../qpid/server/security/acl/ExternalACLTest.java  |  561 ---
 .../qpid/server/security/acl/MessagingACLTest.java |  678 ++++
 .../auth/manager/ExternalAuthenticationTest.java   |  214 +-
 .../qpid/server/stats/StatisticsReportingTest.java |  217 +-
 .../qpid/server/store/PersistentStoreTest.java     |   28 +-
 .../apache/qpid/server/store/SplitStoreTest.java   |    3 +-
 .../server/store/VirtualHostMessageStoreTest.java  |  833 -----
 .../apache/qpid/systest/AnonymousProducerTest.java |  116 +
 .../qpid/systest/MessageCompressionTest.java       |  118 +-
 .../apache/qpid/systest/MessageRoutingTest.java    |  186 +
 .../management/amqp/AmqpManagementTest.java        |  874 +++++
 .../messageencryption/MessageEncryptionTest.java   |   40 +-
 .../qpid/systest/prefetch/ZeroPrefetchTest.java    |   16 +-
 .../rest/AccessControlProviderRestTest.java        |   12 +-
 .../qpid/systest/rest/AnonymousAccessRestTest.java |    4 +-
 .../rest/AuthenticationProviderRestTest.java       |   59 +-
 .../apache/qpid/systest/rest/BindingRestTest.java  |  133 -
 .../systest/rest/BrokerRestHttpAndHttpsTest.java   |   91 +-
 .../rest/BrokerRestHttpsClientCertAuthTest.java    |    4 +-
 .../qpid/systest/rest/BrokerRestHttpsTest.java     |    2 +-
 .../apache/qpid/systest/rest/BrokerRestTest.java   |   55 +-
 .../systest/rest/CompressedResponsesRestTest.java  |   20 +-
 .../qpid/systest/rest/ConnectionRestTest.java      |  297 +-
 .../apache/qpid/systest/rest/ExchangeRestTest.java |   37 +-
 .../systest/rest/ExportImportMessagesRestTest.java |   22 +-
 .../qpid/systest/rest/GroupProviderRestTest.java   |   31 +-
 .../apache/qpid/systest/rest/GroupRestTest.java    |   23 +-
 .../qpid/systest/rest/HttpManagementRestTest.java  |    8 +-
 .../apache/qpid/systest/rest/KeyStoreRestTest.java |   28 +-
 .../apache/qpid/systest/rest/MessagesRestTest.java |  104 +-
 .../org/apache/qpid/systest/rest/PortRestTest.java |   62 +-
 .../qpid/systest/rest/PreemtiveAuthRestTest.java   |   15 +
 .../qpid/systest/rest/PublishMessageRestTest.java  |   92 +-
 .../apache/qpid/systest/rest/QueueRestTest.java    |  218 +-
 .../org/apache/qpid/systest/rest/SaslRestTest.java |   54 +
 .../apache/qpid/systest/rest/SessionRestTest.java  |  159 +
 .../qpid/systest/rest/StructureRestTest.java       |   21 -
 .../qpid/systest/rest/TrustStoreRestTest.java      |   39 +-
 .../org/apache/qpid/systest/rest/UserRestTest.java |   22 +-
 .../systest/rest/VirtualHostLoggerRestTest.java    |    2 +-
 .../qpid/systest/rest/VirtualHostNodeRestTest.java |   16 +-
 .../qpid/systest/rest/VirtualHostRestTest.java     |  190 +-
 .../qpid/systest/rest/acl/BrokerACLTest.java       |   83 +-
 .../qpid/systest/rest/acl/ExchangeRestACLTest.java |   49 +-
 .../qpid/systest/rest/acl/GroupRestACLTest.java    |   37 +-
 .../qpid/systest/rest/acl/QueueRestACLTest.java    |   81 +-
 .../qpid/systest/rest/acl/UserRestACLTest.java     |    2 +-
 .../qpid/systest/rest/acl/VirtualHostACLTest.java  |   22 +-
 .../VirtualHostAccessControlProviderRestTest.java  |   59 +-
 .../CloseOnNoRouteForMandatoryMessageTest.java     |    4 +-
 .../qpid/test/client/ConsumerFlowControlTest.java  |  199 +
 .../org/apache/qpid/test/client/DupsOkTest.java    |   36 +-
 .../apache/qpid/test/client/FlowControlTest.java   |  223 --
 .../ImmediateAndMandatoryPublishingTest.java       |   19 +-
 .../qpid/test/client/ProducerFlowControlTest.java  |  126 +
 .../qpid/test/client/QueueBrowserAutoAckTest.java  |   63 +-
 .../test/client/QueueBrowserClientAckTest.java     |    1 +
 .../qpid/test/client/QueueBrowserDupsOkTest.java   |    1 +
 .../qpid/test/client/QueueBrowserNoAckTest.java    |    1 +
 .../qpid/test/client/QueueBrowserPreAckTest.java   |    1 +
 .../test/client/QueueBrowserTransactedTest.java    |    1 +
 .../apache/qpid/test/client/RollbackOrderTest.java |   26 +-
 .../UnroutableMessageTestExceptionListener.java    |   24 +-
 .../destination/AddressBasedDestinationTest.java   |   18 +-
 .../qpid/test/client/failover/FailoverTest.java    |   66 +-
 .../test/client/message/JMSDestinationTest.java    |   20 +-
 .../qpid/test/client/message/JMSReplyToTest.java   |    4 +-
 .../qpid/test/client/message/JMSXUserIDTest.java   |    9 +-
 .../test/client/message/MessageToStringTest.java   |   20 +-
 .../test/client/message/ObjectMessageTest.java     |   16 +-
 .../qpid/test/client/message/SelectorTest.java     |  126 +-
 .../org/apache/qpid/test/client/queue/LVQTest.java |   84 -
 .../qpid/test/client/queue/QueuePolicyTest.java    |  154 +-
 .../qpid/test/client/queue/QueueReceiverTest.java  |   57 +
 .../test/unit/ack/Acknowledge2ConsumersTest.java   |   12 +-
 .../test/unit/ack/AcknowledgeOnMessageTest.java    |   33 +-
 .../apache/qpid/test/unit/ack/AcknowledgeTest.java |   23 +-
 .../qpid/test/unit/ack/ClientAcknowledgeTest.java  |   20 +-
 .../org/apache/qpid/test/unit/ack/RecoverTest.java |  159 +-
 .../qpid/test/unit/basic/BytesMessageTest.java     |  122 +-
 .../test/unit/basic/FieldTableMessageTest.java     |   92 +-
 .../test/unit/basic/InvalidDestinationTest.java    |   15 +-
 .../qpid/test/unit/basic/LargeMessageTest.java     |   97 +-
 .../qpid/test/unit/basic/MapMessageTest.java       |  133 +-
 .../test/unit/basic/MultipleConnectionTest.java    |   74 +-
 .../qpid/test/unit/basic/ObjectMessageTest.java    |  125 +-
 .../qpid/test/unit/basic/PropertyValueTest.java    |   82 +-
 .../test/unit/basic/PubSubTwoConnectionTest.java   |   27 +-
 .../qpid/test/unit/basic/SessionStartTest.java     |   74 +-
 .../qpid/test/unit/basic/TextMessageTest.java      |  103 +-
 .../qpid/test/unit/basic/close/CloseTest.java      |   24 +-
 .../qpid/test/unit/client/AMQSessionTest.java      |   99 +-
 .../client/DynamicQueueExchangeCreateTest.java     |   48 +-
 .../test/unit/client/MaxDeliveryCountTest.java     |  264 +-
 .../test/unit/client/QueueSessionFactoryTest.java  |    5 +-
 .../test/unit/client/TopicSessionFactoryTest.java  |    3 -
 .../channelclose/CloseWithBlockingReceiveTest.java |    3 +-
 .../BrokerClosesClientConnectionTest.java          |  116 +-
 .../client/connection/ConnectionStartTest.java     |   69 +-
 .../unit/client/connection/ConnectionTest.java     |   23 +-
 .../client/connection/ExceptionListenerTest.java   |   13 +-
 .../unit/client/message/ObjectMessageTest.java     |   83 +-
 .../client/temporaryqueue/TemporaryQueueTest.java  |   24 +-
 .../test/unit/close/MessageConsumerCloseTest.java  |   22 +-
 .../test/unit/close/TopicPublisherCloseTest.java   |   13 +-
 .../qpid/test/unit/ct/DurableSubscriberTest.java   |  177 +-
 .../qpid/test/unit/message/ForeignMessageTest.java |  118 +
 .../qpid/test/unit/message/JMSHeaderTest.java      |   68 +
 .../qpid/test/unit/message/JMSPropertiesTest.java  |  104 +-
 .../qpid/test/unit/message/StreamMessageTest.java  |   69 +-
 .../apache/qpid/test/unit/message/UTF8Test.java    |   62 +-
 .../test/unit/topic/DurableSubscriptionTest.java   |  228 +-
 .../qpid/test/unit/topic/TemporaryTopicTest.java   |   18 +-
 .../qpid/test/unit/topic/TopicPublisherTest.java   |   36 +-
 .../qpid/test/unit/topic/TopicSessionTest.java     |   78 +-
 .../qpid/test/unit/topic/TopicSubscriberTest.java  |  102 +
 .../test/unit/transacted/CommitRollbackTest.java   |  106 +-
 .../qpid/test/unit/transacted/TransactedTest.java  |  163 +-
 .../unit/transacted/TransactionTimeoutTest.java    |   23 +-
 .../transacted/TransactionTimeoutTestCase.java     |   59 +-
 .../qpid/test/unit/xa/AbstractXATestCase.java      |  138 -
 .../org/apache/qpid/test/unit/xa/FaultTest.java    |  414 ---
 .../org/apache/qpid/test/unit/xa/QueueTest.java    |  669 ----
 .../org/apache/qpid/test/unit/xa/TopicTest.java    | 1744 ---------
 .../qpid/test/utils/BrokerCommandHelperTest.java   |    3 +-
 .../apache/qpid/test/utils/FailoverBaseCase.java   |   49 +-
 .../qpid/test/utils/SpawnedBrokerHolderTest.java   |    6 +
 .../transport/ConnectionEstablishmentTest.java     |    3 +-
 .../apache/qpid/transport/MaxFrameSizeTest.java    |   16 +-
 .../qpid/transport/ProtocolNegotiationTest.java    |  106 +-
 .../org/apache/qpid/util/AMQExceptionTestUtil.java |   54 +
 .../test/java/org/apache/qpid/util/LogMonitor.java |    4 +-
 .../java/org/apache/qpid/util/LogMonitorTest.java  |    1 +
 systests/systests-utils/pom.xml                    |   66 +
 .../org/apache/qpid/tests/utils/BrokerAdmin.java   |   66 +
 .../qpid/tests/utils/BrokerAdminFactory.java       |   39 +
 .../qpid/tests/utils/BrokerAdminUsingTestBase.java |   43 +
 .../utils/EmbeddedBrokerPerClassAdminImpl.java     |  508 +++
 .../tests/utils/ExternalQpidBrokerAdminImpl.java   |  157 +
 .../apache/qpid/tests/utils/QpidTestRunner.java    |   76 +
 tck/pom.xml                                        |  329 +-
 .../apache/qpid/tck/ManageQpidJMSResources.java    |   69 +-
 tck/src/test/resources/jms-client/ts.jtx           |   22 -
 tck/src/test/resources/qpid-jms-client/ts.jtx      |   37 -
 .../resources/qpid-jms20-client/jndi.properties    |   47 +
 tck/src/test/resources/resources.json              |   31 +-
 tck/src/test/resources/ts.jte                      |    6 +-
 test-profiles/CPPExcludes                          |   85 +-
 test-profiles/CPPNoPrefetchExcludes                |    1 -
 test-profiles/CPPPrefetchExcludes                  |    1 -
 test-profiles/CPPTransientExcludes                 |    5 -
 test-profiles/ExternalBrokerTests                  |    1 -
 test-profiles/IBMJDKExcludes                       |   10 +
 test-profiles/Java010Excludes                      |   26 +-
 test-profiles/Java10BrokenTestsExcludes            |   64 +
 test-profiles/Java10Excludes                       |  221 ++
 test-profiles/Java10UninvestigatedTestsExcludes    |   28 +
 test-profiles/JavaDerbyExcludes                    |    1 +
 test-profiles/JavaExcludes                         |    6 +-
 test-profiles/JavaPre010Excludes                   |   36 +-
 test-profiles/JavaTransientExcludes                |   16 +-
 test-profiles/XAExcludes                           |   22 -
 test-profiles/apache-ci.test.overridden.properties |   13 +-
 test-profiles/cpp.async.excludes                   |    2 -
 test-profiles/python_tests/Java010PythonExcludes   |   22 +-
 test-profiles/python_tests/Java10PythonExcludes    |    8 +-
 .../python_tests/JavaPre010PythonExcludes          |    6 +-
 test-profiles/test-provider-1-0.properties         |   39 +
 test-profiles/test-provider.properties             |    5 +-
 test-profiles/test_resources/ssl/expired.crt       |   17 +
 .../test_resources/ssl/generate-java-keystores.sh  |    4 +-
 .../ssl/java_broker_expired_truststore.jks         |  Bin 0 -> 769 bytes
 .../ssl/java_client_expired_keystore.jks           |  Bin 0 -> 2057 bytes
 tools/README.txt                                   |  153 -
 tools/bin/Profile-run-from-source                  |   70 -
 tools/bin/check-qpid-java-env                      |   38 -
 tools/bin/jms-quick-perf-report                    |  137 -
 tools/bin/memory-test                              |   47 +-
 tools/bin/mercury-controller                       |  132 -
 tools/bin/mercury-start-consumers                  |  119 -
 tools/bin/mercury-start-producers                  |  136 -
 tools/bin/qpid-bench                               |   23 -
 tools/bin/qpid-jms-benchmark                       |  316 --
 tools/bin/qpid-jms-receive                         |  193 -
 tools/bin/qpid-jms-send                            |  261 --
 tools/bin/qpid-python-testkit                      |   33 -
 tools/bin/run-pub                                  |   28 -
 tools/bin/run-sub                                  |   32 -
 tools/bin/testkit.py                               |  278 --
 tools/etc/perf-report.gnu                          |   61 -
 tools/pom.xml                                      |  252 +-
 .../main/java/org/apache/qpid/testkit/Client.java  |  153 -
 .../java/org/apache/qpid/testkit/ErrorHandler.java |   27 -
 .../java/org/apache/qpid/testkit/Receiver.java     |  215 --
 .../main/java/org/apache/qpid/testkit/Sender.java  |  197 -
 .../java/org/apache/qpid/testkit/TestLauncher.java |  342 --
 .../src/main/java/org/apache/qpid/tools/Clock.java |  123 -
 .../main/java/org/apache/qpid/tools/JNDICheck.java |  201 -
 .../org/apache/qpid/tools/JVMArgConfiguration.java |  450 ---
 .../qpid/tools/MemoryConsumptionTestClient.java    |  251 +-
 .../java/org/apache/qpid/tools/MercuryBase.java    |  190 -
 .../qpid/tools/MercuryConsumerController.java      |  231 --
 .../qpid/tools/MercuryProducerController.java      |  210 --
 .../apache/qpid/tools/MercuryTestController.java   |  450 ---
 .../java/org/apache/qpid/tools/MessageFactory.java |   64 -
 .../main/java/org/apache/qpid/tools/QpidBench.java |  904 -----
 .../java/org/apache/qpid/tools/QpidReceive.java    |  205 --
 .../main/java/org/apache/qpid/tools/QpidSend.java  |  303 --
 .../apache/qpid/tools/RestStressTestClient.java    |  143 +-
 .../org/apache/qpid/tools/StressTestClient.java    |  422 ++-
 .../org/apache/qpid/tools/TestConfiguration.java   |  134 -
 .../apache/qpid/tools/report/BasicReporter.java    |  113 -
 .../apache/qpid/tools/report/MercuryReporter.java  |  167 -
 .../org/apache/qpid/tools/report/Reporter.java     |   40 -
 .../org/apache/qpid/tools/report/Statistics.java   |  145 -
 ...ress-test-client-qpid-jms-client-0-x.properties |   29 +
 .../stress-test-client-qpid-jms-client.properties  |   32 +
 .../main/resources/stress-test-client.properties   |   22 -
 3231 files changed, 182995 insertions(+), 239558 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