[qpid-java] branch master updated (3676f6a -> 831414d)

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


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

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

      from  3676f6a   Fix various lintian issues
       new  5f4016e   Use my Debian e-mail address in copyright and rules Remove auto generated debian/maven.publishedRules
      adds  55a0474   New upstream version 6.1.4
       new  30c008a   Updated version 6.1.4 from 'upstream/6.1.4'
       new  1a4640a   New upstream 6.1.4
       new  bd145dc   Use gbp pq
       new  374a653   Update debian/watch and signing keys
       new  bb15dcb   Change name from qpid-java to qpid-broker-j
       new  9e6978e   Remove non Free ICC profiles
      adds  5b6c2c1   New upstream version 7.0.0
       new  acb7cda   Update upstream source from tag 'upstream/7.0.0'
       new  831414d   Adapt to the new release

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                                        |   10 +
 DEPENDENCIES                                       |  120 +-
 LICENSE                                            |  382 ++
 NOTICE                                             |    4 +-
 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/bin/backup.sh                             |   41 -
 bdbstore/jmx/pom.xml                               |   85 -
 .../jmx/BDBHAMessageStoreManagerMBean.java         |  253 --
 .../jmx/BDBHAMessageStoreManagerMBeanProvider.java |   70 -
 .../berkeleydb/jmx/ManagedBDBHAMessageStore.java   |   85 -
 .../org.apache.qpid.server.jmx.MBeanProvider       |   19 -
 .../jmx/BDBHAMessageStoreManagerMBeanTest.java     |  224 --
 bdbstore/pom.xml                                   |   47 +-
 .../main/java/org/apache/qpid/server/JECheck.java  |   37 +
 .../store/berkeleydb/AMQShortStringEncoding.java   |    2 +-
 .../store/berkeleydb/AbstractBDBMessageStore.java  |  584 ++-
 .../berkeleydb/AbstractBDBPreferenceStore.java     |  404 +++
 .../qpid/server/store/berkeleydb/BDBBackup.java    |    5 +-
 .../store/berkeleydb/BDBCacheSizeSetter.java       |   31 +-
 .../store/berkeleydb/BDBConfigurationStore.java    |  274 +-
 .../berkeleydb/BDBConfiguredObjectRecord.java      |    3 +
 .../store/berkeleydb/BDBEnvironmentContainer.java  |   22 +-
 .../server/store/berkeleydb/BDBMessageStore.java   |    4 +-
 .../store/berkeleydb/BDBPreferenceStore.java       |  144 +
 .../BDBPreferenceStoreFactoryService.java          |   57 +
 .../server/store/berkeleydb/BDBSystemConfig.java   |   14 +-
 .../store/berkeleydb/BDBSystemConfigImpl.java      |   11 +-
 .../qpid/server/store/berkeleydb/BDBUtils.java     |   16 -
 .../store/berkeleydb/CoalescingCommiter.java       |    3 +
 .../server/store/berkeleydb/EnvHomeRegistry.java   |    2 +-
 .../server/store/berkeleydb/EnvironmentFacade.java |    8 +-
 .../server/store/berkeleydb/EnvironmentUtils.java  |    5 -
 .../store/berkeleydb/FieldTableEncoding.java       |    4 +-
 .../berkeleydb/StandardEnvironmentFacade.java      |   30 +-
 .../replication/ReplicatedEnvironmentFacade.java   |  328 +-
 .../store/berkeleydb/tuple/ByteBufferBinding.java  |   17 +-
 .../berkeleydb/tuple/ConfiguredObjectBinding.java  |   10 +-
 .../berkeleydb/tuple/HierarchyKeyBinding.java      |    2 +
 .../server/store/berkeleydb/tuple/MapBinding.java  |   75 +
 .../berkeleydb/tuple/MessageMetaDataBinding.java   |   56 +-
 .../tuple/PreparedTransactionBinding.java          |   51 +-
 .../store/berkeleydb/tuple/QueueEntryBinding.java  |   50 +-
 .../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  |   78 +-
 .../store/berkeleydb/upgrade/UpgradeFrom5To6.java  |   61 +-
 .../store/berkeleydb/upgrade/UpgradeFrom7To8.java  |    5 +-
 .../store/berkeleydb/upgrade/UpgradeFrom8To9.java  |   93 +
 .../upgrade/UpgradeInteractionHandler.java         |    1 +
 .../berkeleydb/BDBHAReplicaVirtualHost.java        |    7 +-
 .../berkeleydb/BDBHAReplicaVirtualHostImpl.java    |  545 +--
 .../virtualhost/berkeleydb/BDBHAVirtualHost.java   |   11 +-
 .../berkeleydb/BDBHAVirtualHostImpl.java           |    2 +-
 .../virtualhost/berkeleydb/BDBVirtualHost.java     |   14 +-
 .../virtualhost/berkeleydb/BDBVirtualHostImpl.java |   17 +-
 .../berkeleydb/BDBHARemoteReplicationNode.java     |    4 +-
 .../berkeleydb/BDBHARemoteReplicationNodeImpl.java |   20 +-
 .../berkeleydb/BDBHAVirtualHostNode.java           |   12 +-
 .../berkeleydb/BDBHAVirtualHostNodeImpl.java       |  198 +-
 .../berkeleydb/BDBVirtualHostNode.java             |   13 +-
 .../berkeleydb/BDBVirtualHostNodeImpl.java         |   24 +-
 .../js/qpid/management/virtualhost/bdb/add.js      |   22 +-
 .../js/qpid/management/virtualhost/bdb/edit.js     |   31 +-
 .../js/qpid/management/virtualhost/bdb/show.js     |   11 +-
 .../js/qpid/management/virtualhost/bdb_ha/add.js   |   16 +-
 .../js/qpid/management/virtualhost/bdb_ha/edit.js  |   31 +-
 .../js/qpid/management/virtualhost/bdb_ha/show.js  |   33 +-
 .../management/virtualhost/bdb_ha_replica/show.js  |   31 +
 .../js/qpid/management/virtualhostnode/bdb/add.js  |   16 +-
 .../js/qpid/management/virtualhostnode/bdb/edit.js |   28 +-
 .../js/qpid/management/virtualhostnode/bdb/show.js |   15 +-
 .../qpid/management/virtualhostnode/bdb_ha/add.js  |  106 +-
 .../bdb_ha/add/existinggroup/add.js                |   32 +-
 .../virtualhostnode/bdb_ha/add/newgroup/add.js     |  257 +-
 .../qpid/management/virtualhostnode/bdb_ha/edit.js |  328 +-
 .../qpid/management/virtualhostnode/bdb_ha/show.js |  292 +-
 .../berkeleydb/AMQShortStringEncodingTest.java     |    2 +-
 .../store/berkeleydb/BDBHAVirtualHostNodeTest.java |   62 +-
 .../store/berkeleydb/BDBMessageStoreTest.java      |  255 +-
 .../store/berkeleydb/BDBPreferenceStoreTest.java   |  227 ++
 .../berkeleydb/BDBStoreUpgradeTestPreparer.java    |   68 +-
 .../NoopConfigurationChangeListener.java           |   65 -
 .../StandardEnvironmentFacadeFactoryTest.java      |    1 +
 .../berkeleydb/StandardEnvironmentFacadeTest.java  |    7 +-
 .../ReplicatedEnvironmentFacadeTest.java           |  280 +-
 .../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    |   21 +-
 .../berkeleydb/upgrade/UpgradeFrom8To9Test.java    |   73 +
 .../store/berkeleydb/upgrade/UpgraderTest.java     |    3 +-
 .../berkeleydb/BDBVirtualHostImplTest.java         |    6 +-
 .../berkeleydb/BDBHARemoteReplicationNodeTest.java |   47 +-
 ...BDBHAVirtualHostNodeOperationalLoggingTest.java |   19 +-
 .../berkeleydb/BDBHAVirtualHostNodeTestHelper.java |   48 +-
 .../berkeleydb/BDBVirtualHostNodeTest.java         |    4 +-
 .../upgrade/bdbstore-v8/test-store/00000000.jdb    |  Bin 0 -> 5702 bytes
 .../bdbstore-v9-amqp10v0/test-store/00000000.jdb   |  Bin 0 -> 535122 bytes
 bdbstore/systests/pom.xml                          |   61 +-
 .../store/berkeleydb/BDBAMQP10V0UpgradeTest.java   |  127 +
 .../server/store/berkeleydb/BDBBackupTest.java     |   68 +-
 .../server/store/berkeleydb/BDBUpgradeTest.java    |  331 +-
 .../replication/BDBHAVirtualHostNodeRestTest.java  |   54 +-
 .../replication/BDBHAVirtualHostRestTest.java      |   16 +-
 .../store/berkeleydb/replication/GroupCreator.java |  216 +-
 .../berkeleydb/replication/JMXManagementTest.java  |  320 --
 .../berkeleydb/replication/MultiNodeTest.java      |  346 +-
 .../store/berkeleydb/replication/TwoNodeTest.java  |   14 +-
 broker-codegen/pom.xml                             |    7 +-
 .../model/ConfiguredObjectFactoryGenerator.java    |  503 ++-
 .../ConfiguredObjectRegistrationGenerator.java     |  118 +-
 .../model/ManagedObjectFactoryConstructor.java     |    2 +
 .../server/model/SystemConfigFactoryGenerator.java |    4 +-
 .../validation/AttributeAnnotationValidator.java   |  204 +-
 .../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                                |   88 +-
 broker-core/src/main/grammar/SelectorParser.jj     |  619 ++++
 broker-core/src/main/java/broker.bnd               |   26 -
 .../java/org/apache/qpid/server/AMQException.java  |  150 +
 .../main/java/org/apache/qpid/server/Broker.java   |  247 --
 .../java/org/apache/qpid/server/BrokerOptions.java |  372 --
 .../org/apache/qpid/server/BrokerPrincipal.java    |   68 +
 .../java/org/apache/qpid/server/QpidException.java |   78 +
 .../org/apache/qpid/server/SystemLauncher.java     |  352 ++
 .../apache/qpid/server/SystemLauncherListener.java |  153 +
 .../qpid/server/TransactionTimeoutHelper.java      |  109 -
 .../apache/qpid/server/binding/BindingFactory.java |   50 -
 .../apache/qpid/server/binding/BindingImpl.java    |  245 +-
 .../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     |   72 -
 .../server/configuration/CommonProperties.java     |  256 ++
 .../store/ManagementModeStoreHandler.java          |  357 +-
 .../store/StoreConfigurationChangeListener.java    |   25 +-
 .../server/configuration/updater/TaskExecutor.java |    5 +-
 .../configuration/updater/TaskExecutorImpl.java    |   78 +-
 .../server/connection/AmqpConnectionMetaData.java  |   37 +
 .../server/connection/ConnectionPrincipal.java     |   82 +-
 .../connection/ConnectionVersionValidator.java     |    7 +-
 .../qpid/server/connection/SessionPrincipal.java   |   15 +-
 .../StandardConnectionPropertyEnricher.java        |  115 +
 .../SuppliedMapConnectionPropertyEnricher.java     |   67 +
 .../server/consumer/AbstractConsumerTarget.java    |  380 +-
 .../apache/qpid/server/consumer/ConsumerImpl.java  |   82 -
 .../consumer/ConsumerMessageInstancePair.java      |   60 -
 .../qpid/server/consumer/ConsumerOption.java       |   31 +
 .../qpid/server/consumer/ConsumerTarget.java       |   49 +-
 .../consumer/ScheduledConsumerTargetSet.java       |  189 +
 .../qpid/server/exchange/AbstractExchange.java     | 1082 +++---
 .../qpid/server/exchange/DefaultDestination.java   |  157 +-
 .../qpid/server/exchange/DestinationReferrer.java  |   26 +
 .../qpid/server/exchange/DirectExchange.java       |  219 +-
 .../qpid/server/exchange/DirectExchangeImpl.java   |  273 ++
 .../qpid/server/exchange/ExchangeDefaults.java     |   63 +
 .../apache/qpid/server/exchange/ExchangeImpl.java  |  112 -
 .../qpid/server/exchange/ExchangeReferrer.java     |   26 -
 .../qpid/server/exchange/FanoutExchange.java       |  275 +-
 .../qpid/server/exchange/FanoutExchangeImpl.java   |  251 ++
 .../FilterManagerReplacementRoutingKeyTuple.java   |   46 +
 .../qpid/server/exchange/HeadersBinding.java       |   46 +-
 .../qpid/server/exchange/HeadersExchange.java      |  160 +-
 .../qpid/server/exchange/HeadersExchangeImpl.java  |  126 +
 .../apache/qpid/server/exchange/TopicExchange.java |  317 +-
 .../qpid/server/exchange/TopicExchangeImpl.java    |  282 ++
 .../server/exchange/topic/TopicExchangeResult.java |  138 +-
 .../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   |   29 +-
 .../org/apache/qpid/server/filter/Filterable.java  |    4 +-
 .../qpid/server/filter/FilterableMessage.java      |   41 +
 .../filter/JMSMessagePropertyExpression.java       |  255 ++
 .../qpid/server/filter/JMSSelectorFilter.java      |   20 +-
 .../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     |   74 -
 .../apache/qpid/server/flow/FlowCreditManager.java |   15 +-
 .../qpid/server/logging/AbstractBrokerLogger.java  |   61 -
 .../apache/qpid/server/logging/AbstractLogger.java |  186 -
 .../qpid/server/logging/AbstractMessageLogger.java |   49 +-
 .../AbstractNameAndLevelLogInclusionRule.java      |  107 -
 .../server/logging/AbstractVirtualHostLogger.java  |   54 -
 .../apache/qpid/server/logging/AppenderUtils.java  |  198 -
 .../qpid/server/logging/BrokerConsoleLogger.java   |   43 -
 .../server/logging/BrokerConsoleLoggerImpl.java    |   95 -
 .../qpid/server/logging/BrokerFileLogger.java      |   79 -
 .../qpid/server/logging/BrokerFileLoggerImpl.java  |  265 --
 .../server/logging/BrokerLogbackSocketLogger.java  |   55 -
 .../logging/BrokerLogbackSocketLoggerImpl.java     |  132 -
 .../qpid/server/logging/BrokerMemoryLogger.java    |   50 -
 .../server/logging/BrokerMemoryLoggerImpl.java     |  121 -
 .../BrokerNameAndLevelLogInclusionRule.java        |   40 -
 .../BrokerNameAndLevelLogInclusionRuleImpl.java    |   55 -
 .../qpid/server/logging/BrokerSyslogLogger.java    |   47 -
 .../server/logging/BrokerSyslogLoggerImpl.java     |   94 -
 .../qpid/server/logging/CompositeFilter.java       |  103 -
 .../qpid/server/logging/EffectiveLevelFilter.java  |   31 -
 .../qpid/server/logging/FileLoggerSettings.java    |   46 -
 .../qpid/server/logging/LogInclusionRule.java      |    5 -
 .../org/apache/qpid/server/logging/LogMessage.java |    1 +
 .../org/apache/qpid/server/logging/LogRecord.java  |   67 -
 .../apache/qpid/server/logging/LogRecorder.java    |   42 -
 .../org/apache/qpid/server/logging/LogSubject.java |    2 +-
 .../server/logging/LoggerNameAndLevelFilter.java   |  115 -
 .../qpid/server/logging/NullMessageLogger.java     |    2 +
 .../qpid/server/logging/OperationLogMessage.java   |   50 +
 .../apache/qpid/server/logging/PathContent.java    |    5 +
 .../server/logging/PrincipalLogEventFilter.java    |   64 -
 .../qpid/server/logging/QpidLoggerTurboFilter.java |  207 --
 .../qpid/server/logging/RecordEventAppender.java   |   67 -
 .../qpid/server/logging/StartupAppender.java       |  103 -
 .../server/logging/SystemOutMessageLogger.java     |    2 +
 .../qpid/server/logging/VirtualHostFileLogger.java |   74 -
 .../server/logging/VirtualHostFileLoggerImpl.java  |  202 --
 .../VirtualHostLogEventExcludingFilter.java        |   85 -
 .../VirtualHostNameAndLevelLogInclusionRule.java   |   39 -
 ...irtualHostNameAndLevelLogInclusionRuleImpl.java |   55 -
 .../server/logging/VirtualHostSyslogLogger.java    |   46 -
 .../logging/VirtualHostSyslogLoggerImpl.java       |   94 -
 .../apache/qpid/server/logging/ZippedContent.java  |    6 +
 .../logging/logback/RollingPolicyDecorator.java    |  312 --
 .../server/logging/logback/RolloverWatcher.java    |  195 -
 .../logging/messages/AccessControlMessages.java    |  218 +-
 .../messages/AccessControl_logmessages.properties  |    3 +
 .../messages/AuthenticationProviderMessages.java   |  211 +-
 .../AuthenticationProvider_logmessages.properties  |    4 +
 .../server/logging/messages/BindingMessages.java   |  126 +-
 .../messages/Binding_logmessages.properties        |    6 +-
 .../server/logging/messages/BrokerMessages.java    |  328 +-
 .../logging/messages/Broker_logmessages.properties |    8 -
 .../server/logging/messages/ChannelMessages.java   |  266 +-
 .../messages/Channel_logmessages.properties        |    8 +-
 .../logging/messages/ConfigStoreMessages.java      |  104 +-
 .../logging/messages/ConnectionMessages.java       |  362 +-
 .../messages/Connection_logmessages.properties     |    4 +
 .../server/logging/messages/ExchangeMessages.java  |  160 +-
 .../messages/Exchange_logmessages.properties       |    2 +
 .../logging/messages/HighAvailabilityMessages.java |  244 +-
 .../server/logging/messages/KeyStoreMessages.java  |  188 +-
 .../messages/KeyStore_logmessages.properties       |    3 +
 .../messages/ManagementConsoleMessages.java        |   94 +-
 .../logging/messages/MessageStoreMessages.java     |  157 +-
 .../messages/MessageStore_logmessages.properties   |    1 -
 .../qpid/server/logging/messages/PortMessages.java |  214 +-
 .../logging/messages/Port_logmessages.properties   |    3 +
 .../server/logging/messages/QueueMessages.java     |  244 +-
 .../logging/messages/Queue_logmessages.properties  |   14 +-
 .../logging/messages/SubscriptionMessages.java     |  138 +-
 .../messages/Subscription_logmessages.properties   |    3 +
 .../logging/messages/TransactionLogMessages.java   |  234 +-
 .../logging/messages/TrustStoreMessages.java       |  188 +-
 .../messages/TrustStore_logmessages.properties     |    4 +
 .../logging/messages/VirtualHostMessages.java      |  162 +-
 .../messages/VirtualHost_logmessages.properties    |    7 +-
 .../logging/subjects/AbstractLogSubject.java       |   11 +-
 .../server/logging/subjects/BindingLogSubject.java |   12 +-
 .../server/logging/subjects/ChannelLogSubject.java |   22 +-
 .../logging/subjects/ConnectionLogSubject.java     |    5 +-
 .../logging/subjects/ExchangeLogSubject.java       |    6 +-
 .../server/logging/subjects/LogSubjectFormat.java  |    7 +-
 .../server/logging/subjects/QueueLogSubject.java   |    4 +-
 .../qpid/server/message/AMQMessageHeader.java      |    2 +
 .../server/message/AbstractServerMessageImpl.java  |   64 +-
 .../qpid/server/message/MessageContainer.java      |   49 +
 .../qpid/server/message/MessageContentSource.java  |    9 +-
 .../qpid/server/message/MessageDestination.java    |   42 +-
 .../apache/qpid/server/message/MessageInfo.java    |   12 +-
 .../qpid/server/message/MessageInfoImpl.java       |   79 +-
 .../qpid/server/message/MessageInstance.java       |  121 +-
 .../server/message/MessageInstanceConsumer.java    |   44 +
 .../qpid/server/message/MessageReference.java      |    8 +-
 .../apache/qpid/server/message/MessageSender.java  |   32 +
 .../apache/qpid/server/message/MessageSource.java  |   44 +-
 .../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  |   14 +-
 .../server/message/internal/InternalMessage.java   |  149 +-
 .../message/internal/InternalMessageHeader.java    |   73 +-
 .../message/internal/InternalMessageMetaData.java  |   74 +-
 .../internal/InternalMessageMetaDataType.java      |    9 +-
 .../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     | 1382 +++++--
 .../model/AbstractConfiguredObjectTypeFactory.java |   44 +-
 .../qpid/server/model/AbstractContainer.java       |  523 +++
 .../qpid/server/model/AbstractSystemConfig.java    |  408 ++-
 .../server/model/AbstractUnresolvedObject.java     |   19 +-
 .../qpid/server/model/AccessControlProvider.java   |   10 +-
 .../qpid/server/model/AccessControlSource.java     |   28 +
 .../apache/qpid/server/model/AlternateBinding.java |   33 +
 .../server/model/AncestorAttributeResolver.java    |   12 +-
 .../qpid/server/model/AttributeValueConverter.java |  314 +-
 .../qpid/server/model/AuthenticationProvider.java  |   64 +-
 .../java/org/apache/qpid/server/model/Binding.java |   28 +-
 .../java/org/apache/qpid/server/model/Broker.java  |  224 +-
 .../qpid/server/model/BrokerAttributeInjector.java |  104 +-
 .../qpid/server/model/BrokerContainerType.java     |   53 +
 .../org/apache/qpid/server/model/BrokerImpl.java   | 1238 +++++++
 .../org/apache/qpid/server/model/BrokerModel.java  |   44 +-
 .../server/model/CommonAccessControlProvider.java  |   55 +
 .../qpid/server/model/ConfigurationExtractor.java  |  271 ++
 .../model/ConfigurationSecretEncrypterSource.java  |   28 +
 .../server/model/ConfiguredAutomatedAttribute.java |   61 +
 .../model/ConfiguredDerivedInjectedAttribute.java  |    5 +
 .../model/ConfiguredDerivedMethodAttribute.java    |   12 +
 .../apache/qpid/server/model/ConfiguredObject.java |   83 +-
 .../server/model/ConfiguredObjectAttribute.java    |    1 -
 .../ConfiguredObjectAttributeOrStatistic.java      |    2 +-
 .../model/ConfiguredObjectCustomSerialization.java |  307 ++
 .../qpid/server/model/ConfiguredObjectFactory.java |   11 +-
 .../server/model/ConfiguredObjectFactoryImpl.java  |   50 +-
 .../qpid/server/model/ConfiguredObjectFinder.java  |  470 +++
 ...nfiguredObjectInjectedAttributeOrStatistic.java |   28 -
 .../model/ConfiguredObjectInjectedOperation.java   |  126 +-
 .../model/ConfiguredObjectInjectedStatistic.java   |    1 +
 .../model/ConfiguredObjectJacksonModule.java       |  110 +-
 .../model/ConfiguredObjectMethodAttribute.java     |   20 -
 ...ConfiguredObjectMethodAttributeOrStatistic.java |   10 -
 .../model/ConfiguredObjectMethodOperation.java     |  119 +-
 .../model/ConfiguredObjectMethodStatistic.java     |    7 +-
 .../server/model/ConfiguredObjectOperation.java    |    6 +-
 .../server/model/ConfiguredObjectStatistic.java    |    2 +-
 .../server/model/ConfiguredObjectTypeRegistry.java |  572 ++-
 .../server/model/ConfiguredSettableAttribute.java  |    8 +
 .../model/ConfiguredSettableInjectedAttribute.java |   93 +-
 .../org/apache/qpid/server/model/Connection.java   |   97 +-
 .../org/apache/qpid/server/model/Consumer.java     |   53 +-
 .../org/apache/qpid/server/model/Container.java    |   36 +
 .../model/ContainerStoreUpgraderAndRecoverer.java  |   30 +
 .../apache/qpid/server/model/ContainerType.java    |   31 +
 .../java/org/apache/qpid/server/model/Content.java |    2 +
 .../apache/qpid/server/model/ContextProvider.java  |   33 +
 .../qpid/server/model/DefaultVirtualHostAlias.java |    1 +
 .../qpid/server/model/DestinationAddress.java      |   79 +
 .../apache/qpid/server/model/DoOnConfigThread.java |   32 +
 .../org/apache/qpid/server/model/DynamicModel.java |   26 +
 .../org/apache/qpid/server/model/Exchange.java     |  163 +-
 .../qpid/server/model/ExclusivityPolicy.java       |    3 +-
 .../ExternalFileBasedAuthenticationManager.java    |    2 +-
 .../java/org/apache/qpid/server/model/Group.java   |    2 -
 .../org/apache/qpid/server/model/GroupMember.java  |    3 -
 .../apache/qpid/server/model/HostNameAlias.java    |    1 +
 .../apache/qpid/server/model/Initialization.java   |   28 +
 .../apache/qpid/server/model/JsonSystemConfig.java |    3 +-
 .../qpid/server/model/JsonSystemConfigImpl.java    |    8 +-
 .../org/apache/qpid/server/model/KeyStore.java     |   21 +-
 .../apache/qpid/server/model/LifetimePolicy.java   |    1 +
 .../qpid/server/model/ManageableMessage.java       |   56 +
 .../apache/qpid/server/model/ManagedAttribute.java |    4 +
 .../server/model/ManagedAttributeValueType.java    |    1 +
 .../ManagedAttributeValueTypeDerivedMethod.java    |   32 +
 .../qpid/server/model/ManagedContextDefault.java   |    1 +
 .../server/model/ManagedContextDependency.java     |   32 +
 .../apache/qpid/server/model/ManagedObject.java    |    1 +
 .../apache/qpid/server/model/ManagedOperation.java |    6 +
 .../qpid/server/model/MemorySystemConfig.java      |   31 +
 .../java/org/apache/qpid/server/model/Model.java   |   57 +-
 .../org/apache/qpid/server/model/ModelVersion.java |   72 +
 .../java/org/apache/qpid/server/model/Named.java   |   26 +
 .../qpid/server/model/NamedAddressSpace.java       |   84 +
 .../server/model/NoFactoryForTypeException.java    |    4 +-
 .../model/NoopConfigurationChangeListener.java     |   60 -
 .../qpid/server/model/NotFoundException.java       |   33 +
 .../qpid/server/model/OperationParameter.java      |    2 +
 .../model/OperationParameterFromAnnotation.java    |    5 +
 .../model/OperationParameterFromInjection.java     |   10 +-
 .../server/model/OperationTimeoutException.java    |   38 +
 .../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 +-
 .../qpid/server/model/PermissionedObject.java      |   28 +
 .../java/org/apache/qpid/server/model/Port.java    |   45 +-
 .../qpid/server/model/PreferencesProvider.java     |   64 -
 ...referencesSupportingAuthenticationProvider.java |   36 -
 .../org/apache/qpid/server/model/Protocol.java     |    6 +-
 .../org/apache/qpid/server/model/Publisher.java    |   26 -
 .../apache/qpid/server/model/PublishingLink.java   |   29 +
 .../java/org/apache/qpid/server/model/Queue.java   |  450 ++-
 .../java/org/apache/qpid/server/model/Session.java |   50 +-
 .../apache/qpid/server/model/StatisticUnit.java    |    3 +-
 .../qpid/server/model/SystemAddressSpaceAlias.java |   41 +
 .../org/apache/qpid/server/model/SystemConfig.java |   76 +-
 .../server/model/SystemConfigBootstrapModel.java   |  114 +
 .../qpid/server/model/SystemPrincipalSource.java   |   28 +
 .../qpid/server/model/TaskExecutorProvider.java    |   28 +
 .../org/apache/qpid/server/model/TrustStore.java   |   47 +-
 .../apache/qpid/server/model/UUIDGenerator.java    |    8 +-
 .../java/org/apache/qpid/server/model/User.java    |   13 +-
 .../org/apache/qpid/server/model/VirtualHost.java  |  203 +-
 .../model/VirtualHostAccessControlProvider.java    |   29 +
 .../apache/qpid/server/model/VirtualHostAlias.java |   30 +-
 .../server/model/VirtualHostLogInclusionRule.java  |    3 +-
 .../qpid/server/model/VirtualHostLogger.java       |    2 +-
 .../apache/qpid/server/model/VirtualHostNode.java  |   14 +-
 .../model/adapter/AbstractPluginAdapter.java       |    4 +-
 .../qpid/server/model/adapter/BrokerAdapter.java   | 1232 -------
 .../model/adapter/FileBasedGroupProvider.java      |    2 +-
 .../model/adapter/FileBasedGroupProviderImpl.java  |  135 +-
 .../adapter/FileSystemPreferencesProvider.java     |   35 -
 .../adapter/FileSystemPreferencesProviderImpl.java |  579 ---
 .../qpid/server/model/adapter/SessionAdapter.java  |  186 -
 ...tractClientAuthCapablePortWithAuthProvider.java |  130 -
 .../qpid/server/model/port/AbstractPort.java       |  263 +-
 .../model/port/AbstractPortWithAuthProvider.java   |  109 -
 .../apache/qpid/server/model/port/AmqpPort.java    |  103 +-
 .../qpid/server/model/port/AmqpPortImpl.java       |  291 +-
 .../server/model/port/ClientAuthCapablePort.java   |   32 -
 .../apache/qpid/server/model/port/HttpPort.java    |   87 +-
 .../qpid/server/model/port/HttpPortImpl.java       |  106 +-
 .../org/apache/qpid/server/model/port/JmxPort.java |   45 -
 .../apache/qpid/server/model/port/JmxPortImpl.java |   65 -
 .../apache/qpid/server/model/port/PortFactory.java |   16 +-
 .../apache/qpid/server/model/port/PortManager.java |    6 +
 .../server/model/port/PortWithAuthProvider.java    |   29 -
 .../org/apache/qpid/server/model/port/RmiPort.java |   46 -
 .../apache/qpid/server/model/port/RmiPortImpl.java |   65 -
 .../model/preferences/GenericPreferenceValue.java  |   40 +
 .../preferences/GenericPreferenceValueFactory.java |   41 +
 .../server/model/preferences/GenericPrincipal.java |  199 +
 .../qpid/server/model/preferences/Preference.java  |   65 +
 .../model/preferences/PreferenceFactory.java       |  204 ++
 .../server/model/preferences/PreferenceImpl.java   |  160 +
 .../server/model/preferences/PreferenceValue.java  |   27 +
 .../preferences/PreferenceValueFactoryService.java |   29 +
 .../server/model/preferences/UserPreferences.java  |   44 +
 .../model/preferences/UserPreferencesImpl.java     |  682 ++++
 .../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       |    5 +-
 .../apache/qpid/server/plugin/MessageFormat.java   |   33 +
 .../qpid/server/plugin/MessageMetaDataType.java    |    2 +-
 .../qpid/server/plugin/ProtocolEngineCreator.java  |    2 +-
 .../qpid/server/plugin/QpidServiceLoader.java      |    4 +-
 .../server/plugin/SystemAddressSpaceCreator.java   |   41 +
 .../qpid/server/plugin/SystemConfigFactory.java    |    8 +-
 .../qpid/server/plugin/SystemNodeCreator.java      |    7 +-
 ...InheritedAccessControlContextThreadFactory.java |   66 +
 .../properties/ConnectionStartProperties.java      |   58 +
 .../qpid/server/protocol/AMQSessionModel.java      |  128 -
 .../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  |   79 -
 .../server/protocol/MessageFormatRegistry.java     |   61 +
 .../qpid/server/protocol/ProtocolVersion.java      |  207 ++
 .../server/protocol/PublishAuthorisationCache.java |  110 +
 .../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 +
 .../org/apache/qpid/server/queue/AMQQueue.java     |  121 -
 .../apache/qpid/server/queue/AbstractQueue.java    | 2649 +++++++-------
 .../qpid/server/queue/AbstractQueueEntryList.java  |  103 +
 .../queue/AssignedConsumerMessageGroupManager.java |   53 +-
 .../org/apache/qpid/server/queue/BaseQueue.java    |    4 -
 .../qpid/server/queue/CopyMessagesTransaction.java |   28 +-
 .../apache/qpid/server/queue/CreatingLinkInfo.java |   34 +
 .../qpid/server/queue/CreatingLinkInfoImpl.java    |   55 +
 .../queue/DefinedGroupMessageGroupManager.java     |   93 +-
 .../server/queue/DeleteMessagesTransaction.java    |    5 +-
 .../queue/FlowToDiskOverflowPolicyHandler.java     |  143 +
 .../apache/qpid/server/queue/LastValueQueue.java   |    6 +-
 .../qpid/server/queue/LastValueQueueImpl.java      |    6 +-
 .../qpid/server/queue/LastValueQueueList.java      |   14 +-
 .../server/queue/MessageContentJsonConverter.java  |  209 ++
 .../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       |   35 +-
 .../qpid/server/queue/OrderedQueueEntryList.java   |   29 +-
 .../apache/qpid/server/queue/OutOfOrderQueue.java  |   13 +-
 .../qpid/server/queue/OverflowPolicyHandler.java   |   26 +
 ...rflowPolicyMaximumQueueDepthChangeListener.java |   76 +
 .../apache/qpid/server/queue/PriorityQueue.java    |    6 +-
 .../qpid/server/queue/PriorityQueueImpl.java       |    5 +-
 .../qpid/server/queue/PriorityQueueList.java       |   23 +-
 .../ProducerFlowControlOverflowPolicyHandler.java  |  216 ++
 .../qpid/server/queue/QueueArgumentsConverter.java |  160 +-
 .../apache/qpid/server/queue/QueueConsumer.java    |   31 +-
 .../qpid/server/queue/QueueConsumerImpl.java       |  344 +-
 .../qpid/server/queue/QueueConsumerList.java       |  280 --
 .../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   |    7 +-
 .../apache/qpid/server/queue/QueueEntryImpl.java   |  297 +-
 .../apache/qpid/server/queue/QueueEntryList.java   |    9 +-
 .../qpid/server/queue/QueueEntryListBase.java      |   25 -
 .../qpid/server/queue/QueueEntryTransaction.java   |   16 +-
 .../org/apache/qpid/server/queue/QueueFactory.java |   12 +-
 .../org/apache/qpid/server/queue/QueueRunner.java  |  126 -
 .../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  |    6 +-
 .../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    |    5 +-
 .../qpid/server/queue/StandardQueueEntryList.java  |   11 +-
 .../qpid/server/queue/StandardQueueImpl.java       |    6 +-
 .../queue/SuspendedConsumerLoggingTicker.java      |    2 +-
 .../qpid/server/security/AbstractKeyStore.java     |  209 ++
 .../qpid/server/security/AbstractTrustStore.java   |  388 ++
 .../apache/qpid/server/security/AccessControl.java |   99 +-
 .../security/AllowAllAccessControlProvider.java    |   33 +
 .../AllowAllAccessControlProviderImpl.java         |  109 +
 .../security/AutoGeneratedSelfSignedKeyStore.java  |   15 +-
 .../AutoGeneratedSelfSignedKeyStoreImpl.java       |   79 +-
 .../qpid/server/security/CertificateDetails.java   |    4 +-
 .../server/security/CertificateDetailsImpl.java    |  111 +
 .../server/security/CompoundAccessControl.java     |  108 +
 .../server/security/CompoundSecurityToken.java     |  120 +
 .../apache/qpid/server/security/FileKeyStore.java  |    1 +
 .../qpid/server/security/FileKeyStoreImpl.java     |   94 +-
 .../qpid/server/security/FileTrustStore.java       |    7 +-
 .../qpid/server/security/FileTrustStoreImpl.java   |  287 +-
 .../security/ManagedPeerCertificateTrustStore.java |   21 +-
 .../ManagedPeerCertificateTrustStoreImpl.java      |  360 +-
 .../security/MutableCertificateTrustStore.java     |   29 +
 .../qpid/server/security/NonJavaKeyStore.java      |    7 +-
 .../qpid/server/security/NonJavaKeyStoreImpl.java  |   98 +-
 .../qpid/server/security/NonJavaTrustStore.java    |   19 +-
 .../server/security/NonJavaTrustStoreImpl.java     |  190 +-
 .../apache/qpid/server/security/QpidPrincipal.java |   31 +
 .../org/apache/qpid/server/security/Result.java    |   25 +-
 .../qpid/server/security/SecurityManager.java      |  812 -----
 .../apache/qpid/server/security/SecurityToken.java |   25 +
 .../server/security/SiteSpecificTrustStore.java    |   32 +-
 .../security/SiteSpecificTrustStoreImpl.java       |  335 +-
 .../qpid/server/security/SubjectCreator.java       |   77 +-
 .../security/SubjectFixedResultAccessControl.java  |  101 +
 .../TrustAnchorValidatingTrustManager.java         |  154 +
 .../server/security/TrustStoreMessageSource.java   |   48 +-
 .../security/TrustStoreMessageSourceCreator.java   |   74 +-
 .../access/AbstractAccessControlProvider.java      |  108 +
 .../access/FileAccessControlProviderConstants.java |   27 -
 .../server/security/access/ObjectProperties.java   |  253 --
 .../qpid/server/security/access/ObjectType.java    |  109 -
 .../qpid/server/security/access/Operation.java     |  153 +-
 .../security/access/OperationLoggingDetails.java   |   89 -
 .../qpid/server/security/access/OperationType.java |   32 +
 .../qpid/server/security/access/Permission.java    |   45 -
 .../security/auth/AuthenticatedPrincipal.java      |   51 +-
 .../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    |   57 +-
 .../AbstractPasswordFilePrincipalDatabase.java     |   54 +-
 .../Base64MD5PasswordFilePrincipalDatabase.java    |   90 +-
 .../server/security/auth/database/HashedUser.java  |   24 +-
 .../security/auth/database/PasswordPrincipal.java  |    3 +-
 .../PlainPasswordFilePrincipalDatabase.java        |  106 +-
 .../server/security/auth/database/PlainUser.java   |   22 +-
 .../security/auth/database/PrincipalDatabase.java  |   11 +-
 .../security/auth/jmx/JMXConnectionPrincipal.java  |   82 -
 .../auth/jmx/JMXPasswordAuthenticator.java         |  145 -
 .../manager/AbstractAuthenticationManager.java     |  198 +-
 .../AbstractScramAuthenticationManager.java        |   40 +-
 .../manager/AnonymousAuthenticationManager.java    |   62 +-
 .../auth/manager/AuthenticationResultCacher.java   |  142 +
 ...64MD5PasswordDatabaseAuthenticationManager.java |    2 +-
 .../manager/CachingAuthenticationProvider.java     |   44 +
 ...odelPasswordManagingAuthenticationProvider.java |   88 +-
 .../manager/ExternalAuthenticationManager.java     |    3 +-
 .../manager/ExternalAuthenticationManagerImpl.java |   52 +-
 .../manager/KerberosAuthenticationManager.java     |   81 +-
 .../auth/manager/MD5AuthenticationProvider.java    |  149 +-
 .../server/security/auth/manager/ManagedUser.java  |   73 +-
 .../auth/manager/PlainAuthenticationProvider.java  |  177 +-
 .../PrincipalDatabaseAuthenticationManager.java    |  215 +-
 .../manager/ScramSHA1AuthenticationManager.java    |   11 +-
 .../manager/ScramSHA256AuthenticationManager.java  |   11 +-
 .../auth/manager/SimpleAuthenticationManager.java  |  216 +-
 .../manager/SimpleLDAPAuthenticationManager.java   |   42 +-
 .../SimpleLDAPAuthenticationManagerImpl.java       |  443 ++-
 .../oauth2/OAuth2AuthenticationProvider.java       |   27 +-
 .../oauth2/OAuth2AuthenticationProviderImpl.java   |  164 +-
 .../oauth2/OAuth2IdentityResolverService.java      |    3 +-
 .../auth/manager/oauth2/OAuth2SaslServer.java      |  140 -
 .../auth/manager/oauth2/OAuth2UserPrincipal.java   |   18 +-
 .../CloudFoundryOAuth2IdentityResolverService.java |   20 +-
 .../facebook/FacebookIdentityResolverService.java  |    8 +-
 .../GitHubOAuth2IdentityResolverService.java       |    8 +-
 .../GoogleOAuth2IdentityResolverService.java       |    8 +-
 .../KeycloakOAuth2IdentityResolverService.java     |  215 ++
 ...MicrosoftLiveOAuth2IdentityResolverService.java |    8 +-
 .../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   |  149 -
 .../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     |  119 -
 .../auth/sasl/kerberos/KerberosNegotiator.java     |  110 +
 .../auth/sasl/oauth2/OAuth2Negotiator.java         |  110 +
 .../auth/sasl/plain/PlainAdapterSaslServer.java    |  168 -
 .../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  |  165 -
 .../auth/sasl/plain/PlainSaslServerFactory.java    |   60 -
 .../security/auth/sasl/scram/ScramNegotiator.java  |   63 +
 .../security/auth/sasl/scram/ScramSaslServer.java  |   55 +-
 .../auth/sasl/scram/ScramSaslServerSource.java     |    4 +
 .../sasl/scram/ScramSaslServerSourceAdapter.java   |   19 +-
 .../security/encryption/AESKeyFileEncrypter.java   |    6 +-
 .../encryption/AESKeyFileEncrypterFactory.java     |    6 +-
 .../qpid/server/security/group/GroupImpl.java      |   35 +-
 .../qpid/server/security/group/GroupManager.java   |   48 -
 .../server/security/group/GroupMemberImpl.java     |   25 +-
 .../qpid/server/security/group/GroupPrincipal.java |   69 +-
 .../server/security/group/GroupProviderImpl.java   |   18 +-
 ...oudFoundryDashboardManagementGroupProvider.java |    6 +-
 ...oundryDashboardManagementGroupProviderImpl.java |   79 +-
 .../apache/qpid/server/session/AMQPSession.java    |   97 +
 .../qpid/server/session/AbstractAMQPSession.java   |  416 +++
 .../server/stats/FormattingStatisticsResolver.java |   97 +
 .../qpid/server/stats/StatisticsCounter.java       |  155 -
 .../qpid/server/stats/StatisticsGatherer.java      |   62 +-
 .../qpid/server/stats/StatisticsReportingTask.java |  130 +
 ...ractConfigurationStoreUpgraderAndRecoverer.java |  129 +
 .../store/AbstractJDBCConfigurationStore.java      | 1000 -----
 .../server/store/AbstractJDBCMessageStore.java     | 2010 ----------
 .../qpid/server/store/AbstractJsonFileStore.java   |  277 ++
 .../qpid/server/store/AbstractMemoryStore.java     |   75 +-
 .../store/BrokerStoreUpgraderAndRecoverer.java     |  354 +-
 .../store/ConfiguredObjectRecordConverter.java     |   88 +-
 .../server/store/DurableConfigurationStore.java    |   12 +-
 .../store/DurableConfigurationStoreUpgrader.java   |    2 -
 .../org/apache/qpid/server/store/EventManager.java |    6 +-
 .../apache/qpid/server/store/GenericRecoverer.java |   33 +-
 .../qpid/server/store/GenericStoreUpgrader.java    |   83 +-
 .../org/apache/qpid/server/store/JdbcUtils.java    |   85 -
 .../qpid/server/store/JsonFileConfigStore.java     |  488 +--
 .../qpid/server/store/MemoryMessageStore.java      |   66 +-
 .../apache/qpid/server/store/MessageHandle.java    |    4 +-
 .../org/apache/qpid/server/store/MessageStore.java |   13 +
 .../apache/qpid/server/store/NonNullUpgrader.java  |   36 +-
 .../apache/qpid/server/store/NullMessageStore.java |   49 +-
 .../org/apache/qpid/server/store/NullUpgrader.java |   57 -
 .../apache/qpid/server/store/ResolvedObject.java   |   70 -
 .../qpid/server/store/StorableMessageMetaData.java |   10 +-
 .../qpid/server/store/StoredMemoryMessage.java     |  100 +-
 .../apache/qpid/server/store/StoredMessage.java    |   18 +-
 .../qpid/server/store/TransactionLogResource.java  |    4 +-
 .../server/store/UnresolvedConfiguredObject.java   |    2 +-
 .../VirtualHostStoreUpgraderAndRecoverer.java      |  738 +++-
 .../java/org/apache/qpid/server/store/Xid.java     |  102 -
 .../handler/ConfiguredObjectRecordHandler.java     |    7 +-
 .../store/preferences/JsonFilePreferenceStore.java |  272 ++
 .../JsonFilePreferenceStoreFactoryService.java     |   54 +
 .../NoopPreferenceStoreFactoryService.java         |   81 +
 .../server/store/preferences/PreferenceRecord.java |   29 +
 .../store/preferences/PreferenceRecordImpl.java    |   55 +
 .../server/store/preferences/PreferenceStore.java  |   38 +
 .../preferences/PreferenceStoreAttributes.java     |   32 +
 .../preferences/PreferenceStoreAttributesImpl.java |   40 +
 .../preferences/PreferenceStoreFactoryService.java |   31 +
 .../store/preferences/PreferenceStoreProvider.java |   25 +
 .../store/preferences/PreferenceStoreUpdater.java  |   28 +
 .../preferences/PreferenceStoreUpdaterImpl.java    |   40 +
 .../store/preferences/PreferencesRecoverer.java    |  186 +
 .../server/store/preferences/PreferencesRoot.java  |   25 +
 .../ProvidedPreferenceStoreFactoryService.java     |   53 +
 .../store/preferences/UserPreferencesCreator.java  |   29 +
 .../store/serializer/MessageStoreSerializer.java   |   49 +
 .../serializer/MessageStoreSerializerFactory.java  |   71 +
 .../qpid/server/store/serializer/v1/DTXRecord.java |  227 ++
 .../server/store/serializer/v1/Deserializer.java   |  141 +
 .../store/serializer/v1/MessageInstanceRecord.java |   75 +
 .../server/store/serializer/v1/MessageRecord.java  |  104 +
 .../serializer/v1/MessageStoreSerializer_v1.java   |  432 +++
 .../store/serializer/v1/QueueMappingRecord.java    |   72 +
 .../qpid/server/store/serializer/v1/Record.java    |   30 +
 .../server/store/serializer/v1/RecordType.java     |   78 +
 .../server/store/serializer/v1/Serializer.java     |  107 +
 .../server/store/serializer/v1/VersionRecord.java  |   56 +
 .../qpid/server/streams/CompositeInputStream.java  |  189 +
 .../qpid/server/transport/AMQPConnection.java      |   87 +-
 .../server/transport/AbstractAMQPConnection.java   |  581 ++-
 .../qpid/server/transport/AggregateTicker.java     |  100 +
 .../qpid/server/transport/ByteBufferSender.java    |   34 +
 .../transport/MultiVersionProtocolEngine.java      |  100 +-
 .../MultiVersionProtocolEngineFactory.java         |    5 +-
 .../transport/NetworkConnectionScheduler.java      |   24 +-
 .../server/transport/NonBlockingConnection.java    |  141 +-
 .../transport/NonBlockingConnectionDelegate.java   |   27 +-
 .../NonBlockingConnectionPlainDelegate.java        |   65 +-
 .../NonBlockingConnectionTLSDelegate.java          |  117 +-
 .../NonBlockingConnectionUndecidedDelegate.java    |   49 +-
 .../transport/NonBlockingNetworkTransport.java     |   23 +-
 .../qpid/server/transport/ProtocolEngine.java      |    9 +-
 .../qpid/server/transport/SelectorThread.java      |  119 +-
 .../transport/ServerIdleReadTimeoutTicker.java     |    4 +-
 .../transport/ServerIdleWriteTimeoutTicker.java    |    4 +-
 .../server/transport/ServerNetworkConnection.java  |    6 +-
 .../qpid/server/transport/TCPandSSLTransport.java  |   12 +-
 .../server/transport/TransactionTimeoutTicker.java |  121 +
 .../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    |   39 +-
 .../java/org/apache/qpid/server/txn/DtxBranch.java |   68 +-
 .../qpid/server/txn/DtxNotSupportedException.java  |   41 +
 .../org/apache/qpid/server/txn/DtxRegistry.java    |   30 +-
 .../server/txn/FlowToDiskTransactionObserver.java  |  144 +
 .../server/txn/IncorrectDtxStateException.java     |    2 -
 .../qpid/server/txn/JoinAndResumeDtxException.java |    2 -
 .../apache/qpid/server/txn/LocalTransaction.java   |  101 +-
 .../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       |   48 +
 ...uiteAndProtocolRestrictingSSLSocketFactory.java |  122 +
 .../apache/qpid/server/util/CommandLineParser.java |  680 ++++
 .../apache/qpid/server/util/ConnectionBuilder.java |   89 +-
 .../org/apache/qpid/server/util/DataUrlUtils.java  |   32 +
 .../apache/qpid/server/util/DeleteDeleteTask.java  |   41 +
 .../qpid/server/util/ExternalServiceException.java |   37 +
 .../util/ExternalServiceTimeoutException.java      |   37 +
 .../org/apache/qpid/server/util/FileUtils.java     |  412 +++
 .../qpid/server/util/FixedKeyMapCreator.java       |  329 ++
 .../org/apache/qpid/server/util/FutureHelper.java  |   86 +
 .../org/apache/qpid/server/util/GZIPUtils.java     |  119 +
 .../qpid/server/util/HousekeepingExecutor.java     |  101 +
 .../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 +
 .../qpid/server/util/StateChangeListener.java      |    2 +-
 .../qpid/server/util/StateChangeListenerEntry.java |    2 +-
 .../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 |   30 +-
 .../AbstractNonConnectionAcceptingVirtualHost.java |  227 ++
 .../virtualhost/AbstractSystemMessageSource.java   |  286 +-
 .../server/virtualhost/AbstractVirtualHost.java    | 2793 +++++++++-----
 .../AsynchronousMessageStoreRecoverer.java         |  158 +-
 .../virtualhost/ConnectionEstablishmentPolicy.java |   28 +
 .../virtualhost/ExchangeExistsException.java       |   46 -
 .../virtualhost/ExchangeIsAlternateException.java  |   31 -
 .../qpid/server/virtualhost/HouseKeepingTask.java  |   32 +-
 .../server/virtualhost/LinkRegistryFactory.java    |   28 +
 .../qpid/server/virtualhost/LinkRegistryModel.java |   42 +
 .../server/virtualhost/ManagedVirtualHost.java     |   44 -
 .../MessageDestinationIsAlternateException.java    |   31 +
 .../server/virtualhost/MessageStoreRecoverer.java  |    2 +-
 .../server/virtualhost/NodeAutoCreationPolicy.java |   41 +
 .../server/virtualhost/NonStandardVirtualHost.java |    4 +-
 .../NoopConnectionEstablishmentPolicy.java         |   33 +
 .../virtualhost/ProvidedStoreVirtualHost.java      |    9 +-
 .../virtualhost/ProvidedStoreVirtualHostImpl.java  |    4 +-
 .../server/virtualhost/QueueExistsException.java   |   45 -
 .../virtualhost/QueueManagingVirtualHost.java      |  366 ++
 .../SynchronousMessageStoreRecoverer.java          |  151 +-
 .../virtualhost/VirtualHostConnectionListener.java |   29 -
 .../qpid/server/virtualhost/VirtualHostImpl.java   |  114 -
 .../server/virtualhost/VirtualHostPrincipal.java   |    9 +-
 .../virtualhost/VirtualHostPropertiesNode.java     |   34 +-
 .../VirtualHostUnavailableException.java           |    2 +-
 .../AbstractFixedVirtualHostNodeAlias.java         |   21 +-
 .../virtualhostalias/AbstractVirtualHostAlias.java |   23 +-
 .../DefaultVirtualHostAliasImpl.java               |   10 +-
 .../server/virtualhostalias/HostNameAliasImpl.java |   21 +-
 .../virtualhostalias/PatternMatchingAliasImpl.java |    2 +-
 .../SystemAddressSpaceAliasImpl.java               |  103 +
 .../virtualhostalias/VirtualHostNameAliasImpl.java |   22 +-
 .../AbstractStandardVirtualHostNode.java           |   86 +-
 .../virtualhostnode/AbstractVirtualHostNode.java   |   89 +-
 .../virtualhostnode/JsonVirtualHostNode.java       |   11 +
 .../virtualhostnode/JsonVirtualHostNodeImpl.java   |    2 -
 .../virtualhostnode/RedirectingVirtualHost.java    |   12 +-
 .../RedirectingVirtualHostImpl.java                |  554 +--
 .../RedirectingVirtualHostNode.java                |    5 +-
 .../RedirectingVirtualHostNodeImpl.java            |  165 +-
 broker-core/src/main/resources/initial-config.json |   22 +-
 .../main/resources/qpidbrokerversion.properties    |    0
 .../org/apache/qpid/server/BrokerOptionsTest.java  |  285 --
 .../java/org/apache/qpid/server/BrokerTest.java    |  160 -
 .../org/apache/qpid/server/QpidExceptionTest.java  |  121 +
 .../org/apache/qpid/server/SelectorParserTest.java |    4 +-
 .../org/apache/qpid/server/SystemLauncherTest.java |  156 +
 .../qpid/server/TransactionTimeoutHelperTest.java  |  222 --
 .../qpid/server/binding/BindingImplTest.java       |   84 -
 .../bytebuffer/QpidByteBufferOutputStreamTest.java |  113 +
 .../qpid/server/bytebuffer/QpidByteBufferTest.java | 1007 +++++
 .../server/configuration/BrokerPropertiesTest.java |   51 -
 .../startup/PreferencesProviderCreationTest.java   |  125 -
 .../startup/VirtualHostCreationTest.java           |   15 +-
 .../store/ManagementModeStoreHandlerTest.java      |  411 +--
 .../StoreConfigurationChangeListenerTest.java      |    8 +-
 .../updater/CurrentThreadTaskExecutor.java         |   42 +-
 .../configuration/updater/TaskExecutorTest.java    |    2 +
 .../connection/ConnectionVersionValidatorTest.java |    7 +-
 .../consumer/AbstractConsumerTargetTest.java       |  288 ++
 .../apache/qpid/server/consumer/MockConsumer.java  |  520 ---
 .../qpid/server/consumer/TestConsumerTarget.java   |  243 ++
 .../qpid/server/exchange/DirectExchangeTest.java   |  328 +-
 .../qpid/server/exchange/FanoutExchangeTest.java   |  399 +-
 .../qpid/server/exchange/HeadersBindingTest.java   |  143 +-
 .../qpid/server/exchange/HeadersExchangeTest.java  |  363 +-
 .../qpid/server/exchange/TopicExchangeTest.java    |  690 ++--
 .../qpid/server/logging/AppenderUtilsTest.java     |  204 --
 .../BrokerFileLoggerStatusListenerTest.java        |  102 -
 .../qpid/server/logging/BrokerFileLoggerTest.java  |  131 -
 .../qpid/server/logging/BrokerLoggerTest.java      |  256 --
 .../server/logging/BrokerMemoryLoggerTest.java     |  143 -
 .../BrokerNameAndLevelLogInclusionRuleTest.java    |  145 -
 .../qpid/server/logging/CompositeFilterTest.java   |  143 -
 .../logging/LoggerNameAndLevelFilterTest.java      |  116 -
 .../logging/PrincipalLogEventFilterTest.java       |   95 -
 .../server/logging/QpidLoggerTurboFilterTest.java  |  115 -
 .../qpid/server/logging/StartupAppenderTest.java   |  171 -
 .../qpid/server/logging/UnitTestMessageLogger.java |    2 +
 .../VirtualHostLogEventExcludingFilterTest.java    |  116 -
 .../qpid/server/logging/VirtualHostLoggerTest.java |  249 --
 ...alHostNameAndLevelLogInclusionRuleImplTest.java |  163 -
 .../logging/actors/AMQPConnectionActorTest.java    |    3 +
 .../server/logging/actors/BaseActorTestCase.java   |    3 +
 .../actors/BaseConnectionActorTestCase.java        |   11 +-
 .../logging/actors/HttpManagementActorTest.java    |   45 +-
 .../logback/RollingPolicyDecoratorTest.java        |  212 --
 .../logging/logback/RolloverWatcherTest.java       |  289 --
 .../logging/messages/AbstractTestMessages.java     |    2 +-
 .../logging/messages/BindingMessagesTest.java      |   64 -
 .../logging/messages/ExchangeMessagesTest.java     |   10 +-
 .../messages/ManagementConsoleMessagesTest.java    |    4 +-
 .../logging/subjects/AbstractTestLogSubject.java   |   16 +-
 .../logging/subjects/BindingLogSubjectTest.java    |   18 +-
 .../logging/subjects/ChannelLogSubjectTest.java    |    7 +-
 .../logging/subjects/ConnectionLogSubjectTest.java |    3 +-
 .../logging/subjects/ExchangeLogSubjectTest.java   |   11 +-
 .../subjects/MessageStoreLogSubjectTest.java       |    6 +-
 .../logging/subjects/QueueLogSubjectTest.java      |   13 +-
 .../server/message/AbstractServerMessageTest.java  |   18 +-
 .../server/model/AttributeValueConverterTest.java  |  139 +-
 .../apache/qpid/server/model/BrokerTestHelper.java |  410 +++
 .../model/ConfiguredObjectJacksonModuleTest.java   |   29 +-
 .../apache/qpid/server/model/VirtualHostTest.java  |  217 +-
 .../server/model/adapter/BrokerAdapterTest.java    |  186 -
 .../qpid/server/model/adapter/BrokerImplTest.java  |  300 ++
 .../adapter/FileBasedGroupProviderImplTest.java    |    3 +-
 .../adapter/FileSystemPreferencesProviderTest.java |  373 --
 .../qpid/server/model/adapter/PortFactoryTest.java |   82 +-
 .../qpid/server/model/port/AmqpPortImplTest.java   |   18 +-
 .../qpid/server/model/port/HttpPortImplTest.java   |   16 +-
 .../model/preferences/GenericPrincipalTest.java    |  191 +
 .../model/preferences/PreferenceFactoryTest.java   |   72 +
 .../model/preferences/PreferenceTestHelper.java    |   90 +
 .../model/preferences/UserPreferencesTest.java     |  310 ++
 .../model/testmodels/TestSecurityManager.java      |   40 -
 .../hierarchy/AbstractConfiguredObjectTest.java    |  141 +-
 .../hierarchy/AncestorAttributeResolverTest.java   |    6 +-
 .../ConfiguredObjectTypeRegistryTest.java          |   68 +-
 .../hierarchy/InjectedAttributeTest.java           |  210 +-
 .../hierarchy/TestAbstractEngineImpl.java          |   19 +-
 .../server/model/testmodels/hierarchy/TestCar.java |   25 +-
 .../testmodels/hierarchy/TestElecEngineImpl.java   |    6 +-
 .../model/testmodels/hierarchy/TestEngine.java     |    1 -
 .../testmodels/hierarchy/TestHybridEngineImpl.java |    7 +-
 .../model/testmodels/hierarchy/TestKitCar.java     |    3 +-
 .../model/testmodels/hierarchy/TestKitCarImpl.java |   41 +-
 .../model/testmodels/hierarchy/TestModel.java      |    6 +-
 .../testmodels/hierarchy/TestPetrolEngineImpl.java |    6 +-
 .../testmodels/hierarchy/TestStandardCar.java      |    6 +-
 .../testmodels/hierarchy/TestStandardCarImpl.java  |   59 +-
 .../lifecycle/AbstractConfiguredObjectTest.java    |   37 +-
 .../testmodels/lifecycle/TestConfiguredObject.java |   72 +-
 .../singleton/AbstractConfiguredObjectTest.java    |  411 ++-
 .../testmodels/singleton/PreferencesTest.java      | 1267 +++++++
 .../model/testmodels/singleton/TestModel.java      |    4 +-
 .../model/testmodels/singleton/TestSingleton.java  |   38 +-
 .../testmodels/singleton/TestSingletonImpl.java    |  128 +-
 ...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   |  680 ++--
 .../apache/qpid/server/queue/ConsumerListTest.java |  446 ---
 .../queue/FlowToDiskOverflowPolicyHandlerTest.java |  137 +
 .../qpid/server/queue/LastValueQueueListTest.java  |   40 +-
 .../qpid/server/queue/LastValueQueueTest.java      |    3 +-
 .../qpid/server/queue/MockMessageInstance.java     |   56 +-
 .../qpid/server/queue/NotificationCheckTest.java   |    5 +-
 .../qpid/server/queue/PriorityQueueListTest.java   |   43 +-
 .../qpid/server/queue/PriorityQueueTest.java       |    8 +-
 ...oducerFlowControlOverflowPolicyHandlerTest.java |  217 ++
 .../qpid/server/queue/QueueEntryImplTestBase.java  |   67 +-
 .../qpid/server/queue/QueueEntryListTestBase.java  |   21 +-
 .../server/queue/QueueMessageRecoveryTest.java     |   11 +-
 .../qpid/server/queue/RejectPolicyHandlerTest.java |  144 +
 .../queue/RingOverflowPolicyHandlerTest.java       |  132 +
 .../queue/SelfValidatingSortedQueueEntryList.java  |    2 +-
 .../server/queue/SimpleQueueEntryImplTest.java     |   18 +-
 .../server/queue/SortedQueueEntryListTest.java     |   38 +-
 .../qpid/server/queue/SortedQueueEntryTest.java    |   18 +-
 .../server/queue/StandardQueueEntryListTest.java   |  112 +-
 .../qpid/server/queue/StandardQueueTest.java       |  165 +-
 .../qpid/server/security/FileKeyStoreTest.java     |    8 +-
 .../qpid/server/security/FileTrustStoreTest.java   |  104 +-
 .../qpid/server/security/NonJavaKeyStoreTest.java  |   75 +-
 .../server/security/NonJavaTrustStoreTest.java     |   64 +-
 .../qpid/server/security/SecurityManagerTest.java  | 1249 -------
 .../security/SiteSpecificTrustStoreTest.java       |  292 ++
 .../qpid/server/security/SubjectCreatorTest.java   |   80 +-
 .../security/TrustStoreMessageSourceTest.java      |   38 +-
 .../security/auth/AuthenticatedPrincipalTest.java  |   24 +-
 .../security/auth/AuthenticationProviderTest.java  |  189 -
 .../server/security/auth/TestPrincipalUtils.java   |   23 +-
 .../security/auth/UsernamePrincipalTest.java       |   18 +-
 .../AbstractPasswordFilePrincipalDatabaseTest.java |  169 +
 ...Base64MD5PasswordFilePrincipalDatabaseTest.java |  118 +-
 .../security/auth/database/HashedUserTest.java     |    4 +-
 .../PlainPasswordFilePrincipalDatabaseTest.java    |  107 +-
 .../security/auth/database/PlainUserTest.java      |    4 +-
 .../auth/jmx/JMXPasswordAuthenticatorTest.java     |  149 -
 .../AnonymousAuthenticationManagerTest.java        |   35 +-
 .../manager/AuthenticationResultCacherTest.java    |  141 +
 .../manager/ExternalAuthenticationManagerTest.java |  117 +-
 .../auth/manager/MD5AuthenticationManagerTest.java |   64 -
 .../ManagedAuthenticationManagerTestBase.java      |   79 +-
 ...sswordFileAuthenticationManagerFactoryTest.java |    2 +-
 ...PrincipalDatabaseAuthenticationManagerTest.java |  151 +-
 .../manager/SimpleAuthenticationManagerTest.java   |   47 +-
 ...SimpleLDAPAuthenticationManagerFactoryTest.java |    3 +-
 .../OAuth2AuthenticationProviderImplTest.java      |  315 ++
 .../auth/manager/oauth2/OAuth2MockEndpoint.java    |  145 +
 .../manager/oauth2/OAuth2MockEndpointHolder.java   |  151 +
 .../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  |  107 -
 .../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 |   20 +-
 .../server/security/group/GroupPrincipalTest.java  |   25 +-
 .../apache/qpid/server/ssl/TrustManagerTest.java   |  346 ++
 .../stats/FormattingStatisticsResolverTest.java    |  100 +
 .../qpid/server/stats/StatisticsCounterTest.java   |  149 -
 ...ConfigurationStoreUpgraderAndRecovererTest.java |  123 +
 .../AbstractDurableConfigurationStoreTestCase.java |  255 +-
 .../qpid/server/store/BrokerRecovererTest.java     |   30 +-
 .../store/BrokerStoreUpgraderAndRecovererTest.java |  436 ++-
 .../store/ConfiguredObjectRecordConverterTest.java |  142 -
 .../JsonFileConfigStoreConfigurationTest.java      |    5 +-
 .../qpid/server/store/JsonFileConfigStoreTest.java |  109 +-
 .../store/MessageStoreQuotaEventsTestBase.java     |   12 +-
 .../qpid/server/store/MessageStoreTestCase.java    |   46 +-
 .../qpid/server/store/TestMessageMetaData.java     |   40 +-
 .../server/store/TestMessageMetaDataFactory.java   |   25 +-
 .../qpid/server/store/TestMessageMetaDataType.java |   44 +-
 .../VirtualHostStoreUpgraderAndRecovererTest.java  |  467 +--
 .../preferences/JsonFilePreferenceStoreTest.java   |  200 +
 .../preferences/PreferencesRecovererTest.java      |  128 +
 .../server/streams/CompositeInputStreamTest.java   |  132 +
 .../server/transport/TCPandSSLTransportTest.java   |   53 +-
 .../transport/TransactionTimeoutTickerTest.java    |  246 ++
 .../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  |   33 +-
 .../qpid/server/txn/MockStoreTransaction.java      |    7 +
 .../apache/qpid/server/util/BrokerTestHelper.java  |  253 --
 .../server/util/ByteBufferInputStreamTest.java     |  113 +
 .../qpid/server/util/CachingUUIDFactoryTest.java   |   47 +
 .../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       |   43 +-
 .../AsynchronousMessageStoreRecovererTest.java     |  152 +-
 .../SynchronousMessageStoreRecovererTest.java      |   48 +-
 .../virtualhost/VirtualHostPropertiesNodeTest.java |   18 +-
 .../virtualhost/VirtualHostQueueCreationTest.java  |  363 +-
 .../virtualhostalias/VirtualHostAliasTest.java     |  117 +-
 .../AbstractStandardVirtualHostNodeTest.java       |   70 +-
 .../RedirectingVirtualHostNodeTest.java            |  154 +
 .../virtualhostnode/TestVirtualHostNode.java       |   14 +
 .../TestVirtualHostNodeFactory.java                |    4 +-
 .../src/test/resources/ssl/test_keystore.jks       |  Bin
 .../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              |   18 +-
 .../server/security/access/config/AclAction.java   |   11 +-
 .../security/access/config/AclFileParser.java      |  370 ++
 .../security/access/config/AclRulePredicates.java  |   41 +-
 .../qpid/server/security/access/config/Action.java |   52 +-
 .../access/config/CachingSecurityToken.java        |  141 +
 .../security/access/config/ClientAction.java       |    7 +-
 .../security/access/config/ConfigurationFile.java  |   39 -
 .../access/config/LegacyAccessControl.java         |   28 +
 .../access/config/LegacyAccessControlAdapter.java  |  520 +++
 .../security/access/config/LegacyOperation.java    |   47 +
 .../security/access/config/ObjectProperties.java   |  289 ++
 .../server/security/access/config/ObjectType.java  |   87 +
 .../access/config/OperationLoggingDetails.java     |   89 +
 .../security/access/config/PlainConfiguration.java |  323 --
 .../qpid/server/security/access/config/Rule.java   |   92 +-
 .../access/config/RuleBasedAccessControl.java      |  150 +
 .../server/security/access/config/RuleSet.java     |  269 +-
 .../security/access/config/RuleSetCreator.java     |  136 +
 .../access/firewall/HostnameFirewallRule.java      |   13 +-
 .../security/access/firewall/InetNetwork.java      |    4 +-
 .../access/firewall/NetworkFirewallRule.java       |   10 +-
 .../plugins/ACLFileAccessControlProvider.java      |   32 -
 .../plugins/ACLFileAccessControlProviderImpl.java  |  218 --
 ...stractCommonRuleBasedAccessControlProvider.java |  225 ++
 .../AbstractLegacyAccessControlProvider.java       |  125 +
 .../plugins/AclFileAccessControlProvider.java      |   41 +
 .../plugins/AclFileAccessControlProviderImpl.java  |  135 +
 .../server/security/access/plugins/AclRule.java    |   39 +
 .../access/plugins/DefaultAccessControl.java       |  201 -
 .../plugins/RuleBasedAccessControlProvider.java    |   55 +
 .../RuleBasedAccessControlProviderImpl.java        |   49 +
 .../RuleBasedVirtualHostAccessControlProvider.java |   52 +
 ...eBasedVirtualHostAccessControlProviderImpl.java |   75 +
 .../security/access/plugins/RuleOutcome.java       |   52 +
 .../security/access/config/AclActionTest.java      |    7 +-
 .../security/access/config/AclFileParserTest.java  |  445 +++
 .../access/config/AclRulePredicatesTest.java       |   33 +-
 .../server/security/access/config/ActionTest.java  |   64 +-
 .../config/LegacyAccessControlAdapterTest.java     |  941 +++++
 .../access/config/PlainConfigurationTest.java      |  445 ---
 .../access/config/RuleBasedAccessControlTest.java  |  469 +++
 .../server/security/access/config/RuleSetTest.java |  509 +++
 .../server/security/access/config/RuleTest.java    |   11 +-
 .../access/firewall/HostnameFirewallRuleTest.java  |    1 +
 .../access/firewall/NetworkFirewallRuleTest.java   |    1 +
 .../ACLFileAccessControlProviderFactoryTest.java   |  120 -
 .../ACLFileAccessControlProviderImplTest.java      |   83 -
 .../AclFileAccessControlProviderFactoryTest.java   |  117 +
 .../AclFileAccessControlProviderImplTest.java      |   84 +
 .../access/plugins/DefaultAccessControlTest.java   |  470 ---
 .../security/access/plugins/RuleSetTest.java       |  468 ---
 broker-plugins/amqp-0-10-protocol/pom.xml          |   19 +-
 .../server/protocol/v0_10/AMQPConnection_0_10.java |  348 +-
 .../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 |  387 +-
 .../server/protocol/v0_10/CreditCreditManager.java |   61 +-
 .../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   |   16 +-
 .../v0_10/MessageAcceptCompletionListener.java     |   11 +-
 .../v0_10/MessageConverter_Internal_to_v0_10.java  |  261 +-
 .../protocol/v0_10/MessageConverter_v0_10.java     |  132 +-
 .../v0_10/MessageConverter_v0_10_to_Internal.java  |  200 +-
 .../server/protocol/v0_10/MessageFormat_0_10.java  |  129 +
 .../protocol/v0_10/MessageMetaDataType_0_10.java   |    4 +-
 .../protocol/v0_10/MessageMetaData_0_10.java       |  199 +-
 .../protocol/v0_10/MessageTransferHeader.java      |   71 +-
 .../protocol/v0_10/MessageTransferMessage.java     |   39 +-
 .../protocol/v0_10/ProtocolEngineCreator_0_10.java |    9 +-
 .../server/protocol/v0_10/ProtocolEventSender.java |   31 +
 .../server/protocol/v0_10/SenderException.java     |   54 +
 .../server/protocol/v0_10/ServerAssembler.java     |  237 +-
 .../server/protocol/v0_10/ServerConnection.java    |  721 ++--
 .../protocol/v0_10/ServerConnectionDelegate.java   |  350 +-
 .../qpid/server/protocol/v0_10/ServerDecoder.java  |  155 +-
 .../server/protocol/v0_10/ServerDisassembler.java  |  149 +-
 .../qpid/server/protocol/v0_10/ServerEncoder.java  |   69 +-
 .../qpid/server/protocol/v0_10/ServerFrame.java    |   11 +-
 .../server/protocol/v0_10/ServerInputHandler.java  |  178 +-
 .../qpid/server/protocol/v0_10/ServerSession.java  | 1440 +++++---
 .../protocol/v0_10/ServerSessionDelegate.java      |  762 ++--
 .../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 |   66 +-
 .../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  |   28 +-
 .../server/protocol/v0_10/ServerSessionTest.java   |   78 +-
 .../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           |   24 +-
 .../qpid/server/protocol/v0_8/AMQChannel.java      | 2098 +++++------
 .../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   | 1572 +-------
 .../protocol/v0_8/AMQPConnection_0_8Impl.java      | 1521 ++++++++
 .../qpid/server/protocol/v0_8/BrokerDecoder.java   |   89 +-
 .../qpid/server/protocol/v0_8/CachedFrame.java     |  108 +
 .../server/protocol/v0_8/ClientDeliveryMethod.java |    4 +-
 .../server/protocol/v0_8/ConsumerTarget_0_8.java   |  396 +-
 .../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    |  282 +-
 .../v0_8/MessageConverter_v0_8_to_Internal.java    |  201 +-
 .../server/protocol/v0_8/MessageFormat_0_9_1.java  |  170 +
 .../qpid/server/protocol/v0_8/MessageMetaData.java |  160 +-
 .../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 |  171 +-
 .../protocol/v0_8/ProtocolEngineCreator_0_8.java   |    9 +-
 .../protocol/v0_8/ProtocolEngineCreator_0_9.java   |    9 +-
 .../protocol/v0_8/ProtocolEngineCreator_0_9_1.java |    9 +-
 .../protocol/v0_8/ProtocolOutputConverter.java     |   12 +-
 .../protocol/v0_8/ProtocolOutputConverterImpl.java |  311 +-
 .../server/protocol/v0_8/RecordDeliveryMethod.java |   29 -
 .../qpid/server/protocol/v0_8/ServerDecoder.java   |  253 ++
 .../protocol/v0_8/UnacknowledgedMessageMap.java    |   30 +-
 .../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  |  113 +-
 .../qpid/server/protocol/v0_8/AMQDecoderTest.java  |  310 ++
 .../protocol/v0_8/AMQPConnection_0_8Test.java      |   72 +-
 .../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    |  115 +
 .../PropertyConverter_Internal_to_v0_8Test.java    |  583 +++
 .../PropertyConverter_v0_8_to_InternalTest.java    |  325 ++
 .../protocol/v0_8/ReferenceCountingTest.java       |   10 +-
 .../v0_8/UnacknowledgedMessageMapTest.java         |   41 +-
 .../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           |   32 +-
 .../codec/AbstractDescribedTypeWriter.java         |  190 -
 .../qpid/amqp_1_0/codec/AbstractListWriter.java    |   41 -
 .../qpid/amqp_1_0/codec/AbstractMapWriter.java     |   95 -
 .../qpid/amqp_1_0/codec/ArrayTypeConstructor.java  |  122 -
 .../apache/qpid/amqp_1_0/codec/ArrayWriter.java    |   82 -
 .../apache/qpid/amqp_1_0/codec/BinaryString.java   |   93 -
 .../qpid/amqp_1_0/codec/BinaryTypeConstructor.java |   64 -
 .../apache/qpid/amqp_1_0/codec/BinaryWriter.java   |   75 -
 .../qpid/amqp_1_0/codec/BooleanConstructor.java    |   79 -
 .../apache/qpid/amqp_1_0/codec/BooleanWriter.java  |   70 -
 .../qpid/amqp_1_0/codec/ByteArrayWriter.java       |   66 -
 .../qpid/amqp_1_0/codec/ByteTypeConstructor.java   |   58 -
 .../org/apache/qpid/amqp_1_0/codec/ByteWriter.java |   90 -
 .../qpid/amqp_1_0/codec/CharTypeConstructor.java   |   66 -
 .../org/apache/qpid/amqp_1_0/codec/CharWriter.java |   53 -
 .../qpid/amqp_1_0/codec/CompoundTypeAssembler.java |   36 -
 .../amqp_1_0/codec/CompoundTypeConstructor.java    |  188 -
 .../apache/qpid/amqp_1_0/codec/CompoundWriter.java |  417 ---
 .../qpid/amqp_1_0/codec/DecimalConstructor.java    |  230 --
 .../codec/DefaultDescribedTypeConstructor.java     |   70 -
 .../qpid/amqp_1_0/codec/DelegatingValueWriter.java |   52 -
 .../apache/qpid/amqp_1_0/codec/DescribedType.java  |   85 -
 .../amqp_1_0/codec/DescribedTypeConstructor.java   |   40 -
 .../codec/DescribedTypeConstructorRegistry.java    |   35 -
 .../qpid/amqp_1_0/codec/DoubleTypeConstructor.java |   57 -
 .../apache/qpid/amqp_1_0/codec/DoubleWriter.java   |   54 -
 .../qpid/amqp_1_0/codec/FixedEightWriter.java      |  108 -
 .../qpid/amqp_1_0/codec/FixedFourWriter.java       |  122 -
 .../apache/qpid/amqp_1_0/codec/FixedOneWriter.java |   79 -
 .../qpid/amqp_1_0/codec/FixedSixteenWriter.java    |  150 -
 .../apache/qpid/amqp_1_0/codec/FixedTwoWriter.java |   96 -
 .../qpid/amqp_1_0/codec/FloatTypeConstructor.java  |   57 -
 .../apache/qpid/amqp_1_0/codec/FloatWriter.java    |   54 -
 .../apache/qpid/amqp_1_0/codec/FrameWriter.java    |  283 --
 .../qpid/amqp_1_0/codec/IntTypeConstructor.java    |   57 -
 .../apache/qpid/amqp_1_0/codec/IntegerWriter.java  |  106 -
 .../org/apache/qpid/amqp_1_0/codec/ListWriter.java |  173 -
 .../qpid/amqp_1_0/codec/LongTypeConstructor.java   |   57 -
 .../org/apache/qpid/amqp_1_0/codec/LongWriter.java |  111 -
 .../org/apache/qpid/amqp_1_0/codec/MapWriter.java  |  102 -
 .../qpid/amqp_1_0/codec/NullTypeConstructor.java   |   43 -
 .../org/apache/qpid/amqp_1_0/codec/NullWriter.java |   70 -
 .../qpid/amqp_1_0/codec/ProtocolHandler.java       |   32 -
 .../qpid/amqp_1_0/codec/ProtocolHeaderHandler.java |  147 -
 .../amqp_1_0/codec/RestrictedTypeValueWriter.java  |   55 -
 .../qpid/amqp_1_0/codec/ShortTypeConstructor.java  |   57 -
 .../apache/qpid/amqp_1_0/codec/ShortWriter.java    |   55 -
 .../amqp_1_0/codec/SimpleVariableWidthWriter.java  |   68 -
 .../qpid/amqp_1_0/codec/SmallIntConstructor.java   |   57 -
 .../qpid/amqp_1_0/codec/SmallLongConstructor.java  |   57 -
 .../qpid/amqp_1_0/codec/SmallUIntConstructor.java  |   57 -
 .../qpid/amqp_1_0/codec/SmallULongConstructor.java |   58 -
 .../qpid/amqp_1_0/codec/StringTypeConstructor.java |   85 -
 .../apache/qpid/amqp_1_0/codec/StringWriter.java   |  146 -
 .../qpid/amqp_1_0/codec/SymbolArrayWriter.java     |  171 -
 .../qpid/amqp_1_0/codec/SymbolTypeConstructor.java |  102 -
 .../apache/qpid/amqp_1_0/codec/SymbolWriter.java   |  102 -
 .../amqp_1_0/codec/TimestampTypeConstructor.java   |   60 -
 .../qpid/amqp_1_0/codec/TimestampWriter.java       |   57 -
 .../qpid/amqp_1_0/codec/TypeConstructor.java       |   33 -
 .../qpid/amqp_1_0/codec/UByteTypeConstructor.java  |   58 -
 .../qpid/amqp_1_0/codec/UIntTypeConstructor.java   |   58 -
 .../qpid/amqp_1_0/codec/ULongTypeConstructor.java  |   60 -
 .../qpid/amqp_1_0/codec/UShortTypeConstructor.java |   59 -
 .../qpid/amqp_1_0/codec/UUIDTypeConstructor.java   |   62 -
 .../org/apache/qpid/amqp_1_0/codec/UUIDWriter.java |   63 -
 .../qpid/amqp_1_0/codec/UnsignedByteWriter.java    |   91 -
 .../qpid/amqp_1_0/codec/UnsignedIntegerWriter.java |  147 -
 .../qpid/amqp_1_0/codec/UnsignedLongWriter.java    |  151 -
 .../qpid/amqp_1_0/codec/UnsignedShortWriter.java   |   56 -
 .../apache/qpid/amqp_1_0/codec/ValueHandler.java   |  160 -
 .../codec/ValueProducingProtocolHandler.java       |   31 -
 .../apache/qpid/amqp_1_0/codec/ValueWriter.java    |   60 -
 .../codec/VariableWidthTypeConstructor.java        |   49 -
 .../qpid/amqp_1_0/codec/VariableWidthWriter.java   |  171 -
 .../amqp_1_0/codec/WrapperTypeValueWriter.java     |   55 -
 .../qpid/amqp_1_0/codec/ZeroListConstructor.java   |   46 -
 .../qpid/amqp_1_0/codec/ZeroUIntConstructor.java   |   44 -
 .../qpid/amqp_1_0/codec/ZeroULongConstructor.java  |   44 -
 .../org/apache/qpid/amqp_1_0/framing/AMQFrame.java |   76 -
 .../framing/AMQPProtocolHeaderHandler.java         |   89 -
 .../qpid/amqp_1_0/framing/ExceptionHandler.java    |   31 -
 .../apache/qpid/amqp_1_0/framing/FrameHandler.java |  355 --
 .../qpid/amqp_1_0/framing/FrameParsingError.java   |   34 -
 .../qpid/amqp_1_0/framing/FrameTypeHandler.java    |   31 -
 .../amqp_1_0/framing/OversizeFrameException.java   |   42 -
 .../apache/qpid/amqp_1_0/framing/SASLFrame.java    |   42 -
 .../qpid/amqp_1_0/framing/SASLFrameHandler.java    |  341 --
 .../framing/SASLProtocolHeaderHandler.java         |   92 -
 .../qpid/amqp_1_0/framing/TransportFrame.java      |   52 -
 .../qpid/amqp_1_0/messaging/MessageAttributes.java |   27 -
 .../qpid/amqp_1_0/messaging/SectionDecoder.java    |   36 -
 .../amqp_1_0/messaging/SectionDecoderImpl.java     |   62 -
 .../qpid/amqp_1_0/messaging/SectionEncoder.java    |   34 -
 .../amqp_1_0/messaging/SectionEncoderImpl.java     |  112 -
 .../qpid/amqp_1_0/transport/BytesProcessor.java    |   27 -
 .../qpid/amqp_1_0/transport/BytesTransport.java    |   38 -
 .../amqp_1_0/transport/CircularBytesBuffer.java    |  174 -
 .../amqp_1_0/transport/ConnectionEndpoint.java     | 1726 ---------
 .../transport/ConnectionEventListener.java         |   51 -
 .../qpid/amqp_1_0/transport/ConnectionState.java   |   32 -
 .../apache/qpid/amqp_1_0/transport/Container.java  |   79 -
 .../apache/qpid/amqp_1_0/transport/Delivery.java   |   92 -
 .../amqp_1_0/transport/DeliveryStateHandler.java   |   28 -
 .../qpid/amqp_1_0/transport/ErrorHandler.java      |   27 -
 .../amqp_1_0/transport/FrameOutputHandler.java     |   36 -
 .../qpid/amqp_1_0/transport/FrameTransport.java    |   37 -
 .../qpid/amqp_1_0/transport/LinkEndpoint.java      |  606 ----
 .../qpid/amqp_1_0/transport/LinkEventListener.java |   31 -
 .../org/apache/qpid/amqp_1_0/transport/Node.java   |   26 -
 .../apache/qpid/amqp_1_0/transport/Predicate.java  |   26 -
 .../transport/ProtocolHeaderTransport.java         |  134 -
 .../amqp_1_0/transport/ReceivingLinkEndpoint.java  |  471 ---
 .../amqp_1_0/transport/ReceivingLinkListener.java  |   43 -
 .../transport/ReceivingSessionHalfEndpoint.java    |   26 -
 .../qpid/amqp_1_0/transport/SASLEndpoint.java      |   39 -
 .../qpid/amqp_1_0/transport/SASLEndpointImpl.java  |  291 --
 .../amqp_1_0/transport/SASLFrameTransport.java     |   78 -
 .../qpid/amqp_1_0/transport/SASLTransport.java     |   85 -
 .../amqp_1_0/transport/SaslServerProvider.java     |   31 -
 .../amqp_1_0/transport/SendingLinkEndpoint.java    |  223 --
 .../amqp_1_0/transport/SendingLinkListener.java    |   41 -
 .../transport/SendingSessionHalfEndpoint.java      |   26 -
 .../qpid/amqp_1_0/transport/SequenceNumber.java    |  110 -
 .../qpid/amqp_1_0/transport/SessionAttachment.java |   92 -
 .../qpid/amqp_1_0/transport/SessionEndpoint.java   |  916 -----
 .../amqp_1_0/transport/SessionEventListener.java   |   47 -
 .../amqp_1_0/transport/SessionHalfEndpoint.java    |   26 -
 .../qpid/amqp_1_0/transport/SessionState.java      |   35 -
 .../amqp_1_0/transport/StateChangeListener.java    |   25 -
 .../qpid/amqp_1_0/transport/UnsettledTransfer.java |   53 -
 .../qpid/amqp_1_0/type/AmqpErrorException.java     |   54 -
 .../java/org/apache/qpid/amqp_1_0/type/Binary.java |  159 -
 .../apache/qpid/amqp_1_0/type/DeliveryState.java   |   26 -
 .../qpid/amqp_1_0/type/DistributionMode.java       |   26 -
 .../apache/qpid/amqp_1_0/type/ErrorCondition.java  |   26 -
 .../org/apache/qpid/amqp_1_0/type/FrameBody.java   |   29 -
 .../org/apache/qpid/amqp_1_0/type/GlobalTxId.java  |   26 -
 .../apache/qpid/amqp_1_0/type/LifetimePolicy.java  |   26 -
 .../org/apache/qpid/amqp_1_0/type/Outcome.java     |   26 -
 .../apache/qpid/amqp_1_0/type/RestrictedType.java  |   26 -
 .../apache/qpid/amqp_1_0/type/SaslFrameBody.java   |   27 -
 .../org/apache/qpid/amqp_1_0/type/Section.java     |   27 -
 .../java/org/apache/qpid/amqp_1_0/type/Source.java |   26 -
 .../java/org/apache/qpid/amqp_1_0/type/Symbol.java |   95 -
 .../java/org/apache/qpid/amqp_1_0/type/Target.java |   26 -
 .../apache/qpid/amqp_1_0/type/TxnCapability.java   |   26 -
 .../java/org/apache/qpid/amqp_1_0/type/TxnId.java  |   23 -
 .../apache/qpid/amqp_1_0/type/UnsignedByte.java    |  134 -
 .../apache/qpid/amqp_1_0/type/UnsignedInteger.java |  149 -
 .../apache/qpid/amqp_1_0/type/UnsignedLong.java    |  162 -
 .../apache/qpid/amqp_1_0/type/UnsignedShort.java   |  132 -
 .../org/apache/qpid/amqp_1_0/type/WrapperType.java |   27 -
 .../type/codec/AMQPDescribedTypeRegistry.java      |  374 --
 .../qpid/amqp_1_0/type/messaging/Accepted.java     |   46 -
 .../qpid/amqp_1_0/type/messaging/AmqpSequence.java |   70 -
 .../qpid/amqp_1_0/type/messaging/AmqpValue.java    |   66 -
 .../type/messaging/ApplicationProperties.java      |   64 -
 .../apache/qpid/amqp_1_0/type/messaging/Data.java  |   68 -
 .../amqp_1_0/type/messaging/DeleteOnClose.java     |   46 -
 .../amqp_1_0/type/messaging/DeleteOnNoLinks.java   |   46 -
 .../type/messaging/DeleteOnNoLinksOrMessages.java  |   46 -
 .../type/messaging/DeleteOnNoMessages.java         |   46 -
 .../type/messaging/DeliveryAnnotations.java        |   64 -
 .../type/messaging/ExactSubjectFilter.java         |   78 -
 .../qpid/amqp_1_0/type/messaging/Filter.java       |   28 -
 .../qpid/amqp_1_0/type/messaging/Footer.java       |   70 -
 .../qpid/amqp_1_0/type/messaging/Header.java       |  161 -
 .../amqp_1_0/type/messaging/JMSSelectorFilter.java |   77 -
 .../type/messaging/MatchingSubjectFilter.java      |   77 -
 .../type/messaging/MessageAnnotations.java         |   64 -
 .../qpid/amqp_1_0/type/messaging/Modified.java     |  112 -
 .../amqp_1_0/type/messaging/NoLocalFilter.java     |   45 -
 .../qpid/amqp_1_0/type/messaging/Properties.java   |  333 --
 .../qpid/amqp_1_0/type/messaging/Received.java     |   88 -
 .../qpid/amqp_1_0/type/messaging/Rejected.java     |   70 -
 .../qpid/amqp_1_0/type/messaging/Released.java     |   46 -
 .../qpid/amqp_1_0/type/messaging/Source.java       |  281 --
 .../qpid/amqp_1_0/type/messaging/StdDistMode.java  |   95 -
 .../qpid/amqp_1_0/type/messaging/Target.java       |  197 -
 .../type/messaging/TerminusDurability.java         |  107 -
 .../type/messaging/TerminusExpiryPolicy.java       |  119 -
 .../type/messaging/codec/AcceptedConstructor.java  |   72 -
 .../type/messaging/codec/AcceptedWriter.java       |  151 -
 .../messaging/codec/AmqpSequenceConstructor.java   |   67 -
 .../type/messaging/codec/AmqpSequenceWriter.java   |   80 -
 .../type/messaging/codec/AmqpValueConstructor.java |   56 -
 .../type/messaging/codec/AmqpValueWriter.java      |   80 -
 .../codec/ApplicationPropertiesConstructor.java    |   67 -
 .../codec/ApplicationPropertiesWriter.java         |   80 -
 .../type/messaging/codec/DataConstructor.java      |   64 -
 .../amqp_1_0/type/messaging/codec/DataWriter.java  |   80 -
 .../messaging/codec/DeleteOnCloseConstructor.java  |   71 -
 .../type/messaging/codec/DeleteOnCloseWriter.java  |  142 -
 .../codec/DeleteOnNoLinksConstructor.java          |   71 -
 .../DeleteOnNoLinksOrMessagesConstructor.java      |   71 -
 .../codec/DeleteOnNoLinksOrMessagesWriter.java     |  142 -
 .../messaging/codec/DeleteOnNoLinksWriter.java     |  142 -
 .../codec/DeleteOnNoMessagesConstructor.java       |   71 -
 .../messaging/codec/DeleteOnNoMessagesWriter.java  |  142 -
 .../codec/DeliveryAnnotationsConstructor.java      |   67 -
 .../messaging/codec/DeliveryAnnotationsWriter.java |   80 -
 .../codec/ExactSubjectFilterConstructor.java       |   64 -
 .../messaging/codec/ExactSubjectFilterWriter.java  |   78 -
 .../type/messaging/codec/FooterConstructor.java    |   67 -
 .../type/messaging/codec/FooterWriter.java         |   80 -
 .../type/messaging/codec/HeaderConstructor.java    |  206 --
 .../type/messaging/codec/HeaderWriter.java         |  182 -
 .../codec/JMSSelectorFilterConstructor.java        |   66 -
 .../messaging/codec/JMSSelectorFilterWriter.java   |   79 -
 .../codec/MatchingSubjectFilterConstructor.java    |   65 -
 .../codec/MatchingSubjectFilterWriter.java         |   79 -
 .../codec/MessageAnnotationsConstructor.java       |   67 -
 .../messaging/codec/MessageAnnotationsWriter.java  |   80 -
 .../type/messaging/codec/ModifiedConstructor.java  |  153 -
 .../type/messaging/codec/ModifiedWriter.java       |  166 -
 .../messaging/codec/NoLocalFilterConstructor.java  |   56 -
 .../type/messaging/codec/NoLocalFilterWriter.java  |   89 -
 .../messaging/codec/PropertiesConstructor.java     |  423 ---
 .../type/messaging/codec/PropertiesWriter.java     |  246 --
 .../type/messaging/codec/ReceivedConstructor.java  |  125 -
 .../type/messaging/codec/ReceivedWriter.java       |  158 -
 .../type/messaging/codec/RejectedConstructor.java  |   99 -
 .../type/messaging/codec/RejectedWriter.java       |  150 -
 .../type/messaging/codec/ReleasedConstructor.java  |   71 -
 .../type/messaging/codec/ReleasedWriter.java       |  142 -
 .../type/messaging/codec/SourceConstructor.java    |  384 --
 .../type/messaging/codec/SourceWriter.java         |  230 --
 .../type/messaging/codec/TargetConstructor.java    |  269 --
 .../type/messaging/codec/TargetWriter.java         |  198 -
 .../qpid/amqp_1_0/type/security/SaslChallenge.java |   74 -
 .../qpid/amqp_1_0/type/security/SaslCode.java      |  131 -
 .../qpid/amqp_1_0/type/security/SaslInit.java      |  116 -
 .../amqp_1_0/type/security/SaslMechanisms.java     |   74 -
 .../qpid/amqp_1_0/type/security/SaslOutcome.java   |   95 -
 .../qpid/amqp_1_0/type/security/SaslResponse.java  |   74 -
 .../security/codec/SaslChallengeConstructor.java   |   98 -
 .../type/security/codec/SaslChallengeWriter.java   |  150 -
 .../type/security/codec/SaslInitConstructor.java   |  152 -
 .../type/security/codec/SaslInitWriter.java        |  166 -
 .../security/codec/SaslMechanismsConstructor.java  |  105 -
 .../type/security/codec/SaslMechanismsWriter.java  |  150 -
 .../security/codec/SaslOutcomeConstructor.java     |  125 -
 .../type/security/codec/SaslOutcomeWriter.java     |  158 -
 .../security/codec/SaslResponseConstructor.java    |   98 -
 .../type/security/codec/SaslResponseWriter.java    |  150 -
 .../amqp_1_0/type/transaction/Coordinator.java     |   70 -
 .../qpid/amqp_1_0/type/transaction/Declare.java    |   66 -
 .../qpid/amqp_1_0/type/transaction/Declared.java   |   67 -
 .../qpid/amqp_1_0/type/transaction/Discharge.java  |   87 -
 .../type/transaction/TransactionErrors.java        |  107 -
 .../type/transaction/TransactionalState.java       |   88 -
 .../amqp_1_0/type/transaction/TxnCapabilities.java |  144 -
 .../amqp_1_0/type/transaction/TxnCapability.java   |  131 -
 .../transaction/codec/CoordinatorConstructor.java  |  116 -
 .../type/transaction/codec/CoordinatorWriter.java  |  150 -
 .../type/transaction/codec/DeclareConstructor.java |   98 -
 .../type/transaction/codec/DeclareWriter.java      |  150 -
 .../transaction/codec/DeclaredConstructor.java     |   98 -
 .../type/transaction/codec/DeclaredWriter.java     |  150 -
 .../transaction/codec/DischargeConstructor.java    |  125 -
 .../type/transaction/codec/DischargeWriter.java    |  158 -
 .../codec/TransactionalStateConstructor.java       |  125 -
 .../codec/TransactionalStateWriter.java            |  158 -
 .../qpid/amqp_1_0/type/transport/AmqpError.java    |  227 --
 .../qpid/amqp_1_0/type/transport/Attach.java       |  366 --
 .../apache/qpid/amqp_1_0/type/transport/Begin.java |  240 --
 .../apache/qpid/amqp_1_0/type/transport/Close.java |   89 -
 .../amqp_1_0/type/transport/ConnectionError.java   |  119 -
 .../qpid/amqp_1_0/type/transport/Detach.java       |  131 -
 .../qpid/amqp_1_0/type/transport/Disposition.java  |  194 -
 .../apache/qpid/amqp_1_0/type/transport/End.java   |   89 -
 .../apache/qpid/amqp_1_0/type/transport/Error.java |  120 -
 .../apache/qpid/amqp_1_0/type/transport/Flow.java  |  302 --
 .../qpid/amqp_1_0/type/transport/LinkError.java    |  131 -
 .../apache/qpid/amqp_1_0/type/transport/Open.java  |  282 --
 .../type/transport/ReceiverSettleMode.java         |   95 -
 .../apache/qpid/amqp_1_0/type/transport/Role.java  |   95 -
 .../amqp_1_0/type/transport/SenderSettleMode.java  |  107 -
 .../qpid/amqp_1_0/type/transport/SessionError.java |  119 -
 .../qpid/amqp_1_0/type/transport/Transfer.java     |  307 --
 .../type/transport/codec/AttachConstructor.java    |  464 ---
 .../type/transport/codec/AttachWriter.java         |  254 --
 .../type/transport/codec/BeginConstructor.java     |  302 --
 .../amqp_1_0/type/transport/codec/BeginWriter.java |  206 --
 .../type/transport/codec/CloseConstructor.java     |   98 -
 .../amqp_1_0/type/transport/codec/CloseWriter.java |  150 -
 .../type/transport/codec/DetachConstructor.java    |  152 -
 .../type/transport/codec/DetachWriter.java         |  166 -
 .../transport/codec/DispositionConstructor.java    |  233 --
 .../type/transport/codec/DispositionWriter.java    |  190 -
 .../type/transport/codec/EndConstructor.java       |   98 -
 .../amqp_1_0/type/transport/codec/EndWriter.java   |  150 -
 .../type/transport/codec/ErrorConstructor.java     |  221 --
 .../amqp_1_0/type/transport/codec/ErrorWriter.java |  166 -
 .../type/transport/codec/FlowConstructor.java      |  369 --
 .../amqp_1_0/type/transport/codec/FlowWriter.java  |  230 --
 .../type/transport/codec/OpenConstructor.java      |  370 --
 .../amqp_1_0/type/transport/codec/OpenWriter.java  |  222 --
 .../type/transport/codec/TransferConstructor.java  |  368 --
 .../type/transport/codec/TransferWriter.java       |  230 --
 .../server/protocol/v1_0/AMQPConnection_1_0.java   |  704 +---
 .../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    |   66 +
 .../qpid/server/protocol/v1_0/ConnectionState.java |   35 +
 .../qpid/server/protocol/v1_0/Connection_1_0.java  |  570 ---
 .../server/protocol/v1_0/ConsumerTarget_1_0.java   |  667 ++--
 .../qpid/server/protocol/v1_0/Container.java       |   79 +
 .../apache/qpid/server/protocol/v1_0/Delivery.java |  210 ++
 .../protocol/v1_0/DeserializationFactories.java    |  332 ++
 .../qpid/server/protocol/v1_0/Destination.java     |   28 -
 .../server/protocol/v1_0/ErrantLinkEndpoint.java   |  183 +
 .../server/protocol/v1_0/ExchangeDestination.java  |  158 -
 .../protocol/v1_0/ExchangeSendingDestination.java  |  436 +++
 .../server/protocol/v1_0/FrameOutputHandler.java   |   33 +
 .../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    |   77 +
 .../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    |  248 +-
 .../protocol/v1_0/MessageConverter_from_1_0.java   |  578 ++-
 .../protocol/v1_0/MessageConverter_to_1_0.java     |  494 ++-
 .../v1_0/MessageConverter_v1_0_to_Internal.java    |  148 +-
 .../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  |  741 ++--
 .../protocol/v1_0/MessageSourceDestination.java    |   56 -
 .../qpid/server/protocol/v1_0/Message_1_0.java     |  170 +-
 .../org/apache/qpid/server/protocol/v1_0/Node.java |   26 +
 .../protocol/v1_0/NodeReceivingDestination.java    |  155 +-
 .../server/protocol/v1_0/NullLinkStoreFactory.java |   96 +
 .../protocol/v1_0/ProtocolEngineCreator_1_0_0.java |   11 +-
 .../v1_0/ProtocolEngineCreator_1_0_0_SASL.java     |   11 +-
 .../server/protocol/v1_0/QueueDestination.java     |   87 -
 .../server/protocol/v1_0/ReceivingDestination.java |   20 +-
 .../protocol/v1_0/ReceivingLinkAttachment.java     |   70 -
 .../server/protocol/v1_0/ReceivingLink_1_0.java    |  314 --
 .../qpid/server/protocol/v1_0/SASLEndpoint.java    |   39 +
 .../server/protocol/v1_0/SendingDestination.java   |    7 +-
 .../protocol/v1_0/SendingLinkAttachment.java       |   64 -
 .../server/protocol/v1_0/SendingLinkEndpoint.java  |  933 +++++
 .../qpid/server/protocol/v1_0/SendingLink_1_0.java |  719 ----
 .../qpid/server/protocol/v1_0/SequenceNumber.java  |  102 +
 .../qpid/server/protocol/v1_0/SessionState.java    |   35 +
 .../qpid/server/protocol/v1_0/Session_1_0.java     | 1652 +++++----
 .../v1_0/StandardReceivingLinkEndpoint.java        |  525 +++
 .../protocol/v1_0/StandardSendingDestination.java  |   79 +
 .../protocol/v1_0/TxnCoordinatorLink_1_0.java      |  217 --
 .../v1_0/TxnCoordinatorReceivingLinkEndpoint.java  |  261 ++
 .../protocol/v1_0/UnknownTransactionException.java |   34 +
 .../qpid/server/protocol/v1_0/UnsettledAction.java |    2 +-
 .../codec/AbstractCompositeTypeConstructor.java    |  317 ++
 .../codec/AbstractDescribedTypeConstructor.java    |   58 +
 .../v1_0/codec/AbstractDescribedTypeWriter.java    |   52 +
 .../protocol/v1_0/codec/AbstractListWriter.java    |   46 +
 .../protocol/v1_0/codec/AbstractMapWriter.java     |   86 +
 .../protocol/v1_0/codec/ArrayTypeConstructor.java  |  121 +
 .../server/protocol/v1_0/codec/BinaryString.java   |  101 +
 .../protocol/v1_0/codec/BinaryTypeConstructor.java |   73 +
 .../server/protocol/v1_0/codec/BinaryWriter.java   |   62 +
 .../protocol/v1_0/codec/BooleanConstructor.java    |   81 +
 .../server/protocol/v1_0/codec/BooleanWriter.java  |   71 +
 .../protocol/v1_0/codec/ByteArrayWriter.java       |   60 +
 .../protocol/v1_0/codec/ByteTypeConstructor.java   |   53 +
 .../server/protocol/v1_0/codec/ByteWriter.java     |   73 +
 .../protocol/v1_0/codec/CharTypeConstructor.java   |   55 +
 .../server/protocol/v1_0/codec/CharWriter.java     |   54 +
 .../server/protocol/v1_0/codec/CompoundWriter.java |  125 +
 .../protocol/v1_0/codec/DecimalConstructor.java    |  230 ++
 .../codec/DefaultDescribedTypeConstructor.java     |   38 +
 .../protocol/v1_0/codec/DelegatingValueWriter.java |   60 +
 .../server/protocol/v1_0/codec/DescribedType.java  |   85 +
 .../v1_0/codec/DescribedTypeConstructor.java       |   32 +
 .../codec/DescribedTypeConstructorRegistry.java    |   35 +
 .../protocol/v1_0/codec/DoubleTypeConstructor.java |   53 +
 .../server/protocol/v1_0/codec/DoubleWriter.java   |   54 +
 .../protocol/v1_0/codec/FixedEightWriter.java      |   49 +
 .../protocol/v1_0/codec/FixedFourWriter.java       |   50 +
 .../server/protocol/v1_0/codec/FixedOneWriter.java |   48 +
 .../protocol/v1_0/codec/FixedSixteenWriter.java    |   64 +
 .../server/protocol/v1_0/codec/FixedTwoWriter.java |   62 +
 .../protocol/v1_0/codec/FloatTypeConstructor.java  |   53 +
 .../server/protocol/v1_0/codec/FloatWriter.java    |   55 +
 .../server/protocol/v1_0/codec/FrameWriter.java    |   82 +
 .../protocol/v1_0/codec/IntTypeConstructor.java    |   53 +
 .../server/protocol/v1_0/codec/IntegerWriter.java  |   81 +
 .../protocol/v1_0/codec/ListConstructor.java       |   94 +
 .../server/protocol/v1_0/codec/ListWriter.java     |  104 +
 .../protocol/v1_0/codec/LongTypeConstructor.java   |   53 +
 .../server/protocol/v1_0/codec/LongWriter.java     |   81 +
 .../server/protocol/v1_0/codec/MapConstructor.java |  142 +
 .../qpid/server/protocol/v1_0/codec/MapWriter.java |   93 +
 .../protocol/v1_0/codec/NullTypeConstructor.java   |   43 +
 .../server/protocol/v1_0/codec/NullWriter.java     |   58 +
 .../protocol/v1_0/codec/ProtocolHandler.java       |   31 +
 .../v1_0/codec/RestrictedTypeValueWriter.java      |   53 +
 .../v1_0/codec/SectionDecoderRegistry.java         |   26 +
 .../protocol/v1_0/codec/ShortTypeConstructor.java  |   54 +
 .../server/protocol/v1_0/codec/ShortWriter.java    |   66 +
 .../v1_0/codec/SimpleVariableWidthWriter.java      |   42 +
 .../protocol/v1_0/codec/SmallIntConstructor.java   |   53 +
 .../protocol/v1_0/codec/SmallLongConstructor.java  |   53 +
 .../protocol/v1_0/codec/SmallUIntConstructor.java  |   54 +
 .../protocol/v1_0/codec/SmallULongConstructor.java |   54 +
 .../protocol/v1_0/codec/StringTypeConstructor.java |   72 +
 .../server/protocol/v1_0/codec/StringWriter.java   |   62 +
 .../protocol/v1_0/codec/SymbolArrayWriter.java     |  147 +
 .../protocol/v1_0/codec/SymbolTypeConstructor.java |   88 +
 .../server/protocol/v1_0/codec/SymbolWriter.java   |   79 +
 .../v1_0/codec/TimestampTypeConstructor.java       |   56 +
 .../protocol/v1_0/codec/TimestampWriter.java       |   57 +
 .../protocol/v1_0/codec/TypeConstructor.java       |   31 +
 .../protocol/v1_0/codec/UByteTypeConstructor.java  |   55 +
 .../protocol/v1_0/codec/UIntTypeConstructor.java   |   56 +
 .../protocol/v1_0/codec/ULongTypeConstructor.java  |   57 +
 .../protocol/v1_0/codec/UShortTypeConstructor.java |   55 +
 .../protocol/v1_0/codec/UUIDTypeConstructor.java   |   57 +
 .../server/protocol/v1_0/codec/UUIDWriter.java     |   73 +
 .../protocol/v1_0/codec/UnsignedByteWriter.java    |   54 +
 .../protocol/v1_0/codec/UnsignedIntegerWriter.java |  111 +
 .../protocol/v1_0/codec/UnsignedLongWriter.java    |  126 +
 .../protocol/v1_0/codec/UnsignedShortWriter.java   |   66 +
 .../server/protocol/v1_0/codec/ValueHandler.java   |  154 +
 .../v1_0/codec/ValueProducingProtocolHandler.java  |   31 +
 .../server/protocol/v1_0/codec/ValueWriter.java    |   52 +
 .../v1_0/codec/VariableWidthTypeConstructor.java   |   38 +
 .../protocol/v1_0/codec/VariableWidthWriter.java   |   73 +
 .../protocol/v1_0/codec/ZeroListConstructor.java   |   46 +
 .../protocol/v1_0/codec/ZeroUIntConstructor.java   |   44 +
 .../protocol/v1_0/codec/ZeroULongConstructor.java  |   44 +
 .../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     |   74 +
 .../server/protocol/v1_0/framing/FrameHandler.java |  254 ++
 .../v1_0/framing/OversizeFrameException.java       |   43 +
 .../server/protocol/v1_0/framing/SASLFrame.java    |   42 +
 .../protocol/v1_0/framing/TransportFrame.java      |   50 +
 .../protocol/v1_0/messaging/SectionDecoder.java    |   32 +
 .../v1_0/messaging/SectionDecoderImpl.java         |   78 +
 .../protocol/v1_0/messaging/SectionEncoder.java    |   32 +
 .../v1_0/messaging/SectionEncoderImpl.java         |   52 +
 .../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     |   60 +
 .../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     |   97 +
 .../server/protocol/v1_0/type/DeliveryState.java   |   26 +
 .../protocol/v1_0/type/DistributionMode.java       |   26 +
 .../protocol/v1_0/type/ErrorCarryingFrameBody.java |   28 +
 .../server/protocol/v1_0/type/ErrorCondition.java  |   26 +
 .../qpid/server/protocol/v1_0/type/FrameBody.java  |   29 +
 .../qpid/server/protocol/v1_0/type/GlobalTxId.java |   26 +
 .../server/protocol/v1_0/type/LifetimePolicy.java  |   26 +
 .../qpid/server/protocol/v1_0/type/Outcome.java    |   27 +
 .../server/protocol/v1_0/type/RestrictedType.java  |   26 +
 .../server/protocol/v1_0/type/SaslFrameBody.java   |   27 +
 .../qpid/server/protocol/v1_0/type/Section.java    |   25 +
 .../qpid/server/protocol/v1_0/type/Symbol.java     |  116 +
 .../server/protocol/v1_0/type/TxnCapability.java   |   26 +
 .../qpid/server/protocol/v1_0/type/TxnId.java      |   23 +
 .../server/protocol/v1_0/type/UnsignedByte.java    |  132 +
 .../server/protocol/v1_0/type/UnsignedInteger.java |  147 +
 .../server/protocol/v1_0/type/UnsignedLong.java    |  160 +
 .../server/protocol/v1_0/type/UnsignedShort.java   |  141 +
 .../server/protocol/v1_0/type/WrapperType.java     |   27 +
 .../v1_0/type/codec/AMQPDescribedTypeRegistry.java |  416 +++
 .../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     |   49 +
 .../protocol/v1_0/type/messaging/AmqpSequence.java |   56 +
 .../v1_0/type/messaging/AmqpSequenceSection.java   |   59 +
 .../protocol/v1_0/type/messaging/AmqpValue.java    |   57 +
 .../v1_0/type/messaging/AmqpValueSection.java      |   57 +
 .../v1_0/type/messaging/ApplicationProperties.java |   84 +
 .../messaging/ApplicationPropertiesSection.java    |   59 +
 .../server/protocol/v1_0/type/messaging/Data.java  |   54 +
 .../protocol/v1_0/type/messaging/DataSection.java  |   58 +
 .../v1_0/type/messaging/DeleteOnClose.java         |   38 +
 .../v1_0/type/messaging/DeleteOnNoLinks.java       |   38 +
 .../type/messaging/DeleteOnNoLinksOrMessages.java  |   38 +
 .../v1_0/type/messaging/DeleteOnNoMessages.java    |   38 +
 .../v1_0/type/messaging/DeliveryAnnotations.java   |   48 +
 .../type/messaging/DeliveryAnnotationsSection.java |   60 +
 .../type/messaging/EncodingRetainingSection.java   |   28 +
 .../v1_0/type/messaging/ExactSubjectFilter.java    |   73 +
 .../protocol/v1_0/type/messaging/Filter.java       |   28 +
 .../protocol/v1_0/type/messaging/Footer.java       |   55 +
 .../v1_0/type/messaging/FooterSection.java         |   59 +
 .../protocol/v1_0/type/messaging/Header.java       |  167 +
 .../v1_0/type/messaging/HeaderSection.java         |   57 +
 .../v1_0/type/messaging/JMSSelectorFilter.java     |   72 +
 .../v1_0/type/messaging/MatchingSubjectFilter.java |   72 +
 .../v1_0/type/messaging/MessageAnnotations.java    |   48 +
 .../type/messaging/MessageAnnotationsSection.java  |   60 +
 .../protocol/v1_0/type/messaging/Modified.java     |  120 +
 .../v1_0/type/messaging/NoLocalFilter.java         |   45 +
 .../messaging/NonEncodingRetainingSection.java     |   28 +
 .../protocol/v1_0/type/messaging/Properties.java   |  342 ++
 .../v1_0/type/messaging/PropertiesSection.java     |   57 +
 .../protocol/v1_0/type/messaging/Received.java     |   89 +
 .../protocol/v1_0/type/messaging/Rejected.java     |   75 +
 .../protocol/v1_0/type/messaging/Released.java     |   51 +
 .../protocol/v1_0/type/messaging/Source.java       |  417 +++
 .../protocol/v1_0/type/messaging/StdDistMode.java  |   89 +
 .../protocol/v1_0/type/messaging/Target.java       |  260 ++
 .../v1_0/type/messaging/TerminusDurability.java    |  106 +
 .../v1_0/type/messaging/TerminusExpiryPolicy.java  |  114 +
 .../messaging/codec/AbstractLazyConstructor.java   |   54 +
 .../v1_0/type/messaging/codec/AcceptedWriter.java  |   57 +
 .../messaging/codec/AmqpSequenceConstructor.java   |   70 +
 .../codec/AmqpSequenceSectionConstructor.java      |   55 +
 .../type/messaging/codec/AmqpSequenceWriter.java   |   58 +
 .../type/messaging/codec/AmqpValueConstructor.java |   57 +
 .../codec/AmqpValueSectionConstructor.java         |  153 +
 .../v1_0/type/messaging/codec/AmqpValueWriter.java |   57 +
 .../codec/ApplicationPropertiesConstructor.java    |   71 +
 .../ApplicationPropertiesSectionConstructor.java   |   56 +
 .../codec/ApplicationPropertiesWriter.java         |   58 +
 .../v1_0/type/messaging/codec/DataConstructor.java |   70 +
 .../messaging/codec/DataSectionConstructor.java    |  129 +
 .../v1_0/type/messaging/codec/DataWriter.java      |   57 +
 .../type/messaging/codec/DeleteOnCloseWriter.java  |   58 +
 .../codec/DeleteOnNoLinksOrMessagesWriter.java     |   58 +
 .../messaging/codec/DeleteOnNoLinksWriter.java     |   57 +
 .../messaging/codec/DeleteOnNoMessagesWriter.java  |   58 +
 .../codec/DeliveryAnnotationsConstructor.java      |   71 +
 .../DeliveryAnnotationsSectionConstructor.java     |   56 +
 .../messaging/codec/DeliveryAnnotationsWriter.java |   59 +
 .../codec/DescribedListSectionConstructor.java     |  117 +
 .../codec/DescribedMapSectionConstructor.java      |  116 +
 .../type/messaging/codec/EncodingRetaining.java    |   34 +
 .../codec/ExactSubjectFilterConstructor.java       |   68 +
 .../messaging/codec/ExactSubjectFilterWriter.java  |   57 +
 .../type/messaging/codec/FooterConstructor.java    |   71 +
 .../messaging/codec/FooterSectionConstructor.java  |   56 +
 .../v1_0/type/messaging/codec/FooterWriter.java    |   58 +
 .../messaging/codec/HeaderSectionConstructor.java  |   56 +
 .../v1_0/type/messaging/codec/HeaderWriter.java    |  149 +
 .../codec/JMSSelectorFilterConstructor.java        |   70 +
 .../messaging/codec/JMSSelectorFilterWriter.java   |   58 +
 .../codec/MatchingSubjectFilterConstructor.java    |   69 +
 .../codec/MatchingSubjectFilterWriter.java         |   58 +
 .../codec/MessageAnnotationsConstructor.java       |   71 +
 .../MessageAnnotationsSectionConstructor.java      |   56 +
 .../messaging/codec/MessageAnnotationsWriter.java  |   58 +
 .../v1_0/type/messaging/codec/ModifiedWriter.java  |  132 +
 .../messaging/codec/NoLocalFilterConstructor.java  |   57 +
 .../type/messaging/codec/NoLocalFilterWriter.java  |   57 +
 .../codec/PropertiesSectionConstructor.java        |   55 +
 .../type/messaging/codec/PropertiesWriter.java     |  212 ++
 .../v1_0/type/messaging/codec/ReceivedWriter.java  |  124 +
 .../v1_0/type/messaging/codec/RejectedWriter.java  |  116 +
 .../v1_0/type/messaging/codec/ReleasedWriter.java  |   57 +
 .../v1_0/type/messaging/codec/SourceWriter.java    |  195 +
 .../v1_0/type/messaging/codec/TargetWriter.java    |  163 +
 .../protocol/v1_0/type/security/SaslChallenge.java |   73 +
 .../protocol/v1_0/type/security/SaslCode.java      |  124 +
 .../protocol/v1_0/type/security/SaslInit.java      |  119 +
 .../v1_0/type/security/SaslMechanisms.java         |   75 +
 .../protocol/v1_0/type/security/SaslOutcome.java   |   95 +
 .../protocol/v1_0/type/security/SaslResponse.java  |   73 +
 .../type/security/codec/SaslChallengeWriter.java   |  115 +
 .../v1_0/type/security/codec/SaslInitWriter.java   |  129 +
 .../type/security/codec/SaslMechanismsWriter.java  |  115 +
 .../type/security/codec/SaslOutcomeWriter.java     |  122 +
 .../type/security/codec/SaslResponseWriter.java    |  116 +
 .../v1_0/type/transaction/Coordinator.java         |   68 +
 .../protocol/v1_0/type/transaction/Declare.java    |   65 +
 .../protocol/v1_0/type/transaction/Declared.java   |   76 +
 .../protocol/v1_0/type/transaction/Discharge.java  |   87 +
 .../v1_0/type/transaction/TransactionError.java    |  101 +
 .../v1_0/type/transaction/TransactionalState.java  |   89 +
 .../v1_0/type/transaction/TxnCapability.java       |  127 +
 .../type/transaction/codec/CoordinatorWriter.java  |  116 +
 .../v1_0/type/transaction/codec/DeclareWriter.java |  115 +
 .../type/transaction/codec/DeclaredWriter.java     |  117 +
 .../type/transaction/codec/DischargeWriter.java    |  124 +
 .../codec/TransactionalStateWriter.java            |  122 +
 .../protocol/v1_0/type/transport/AmqpError.java    |  234 ++
 .../protocol/v1_0/type/transport/Attach.java       |  368 ++
 .../server/protocol/v1_0/type/transport/Begin.java |  232 ++
 .../v1_0/type/transport/ChannelFrameBody.java      |   27 +
 .../server/protocol/v1_0/type/transport/Close.java |   73 +
 .../v1_0/type/transport/ConnectionError.java       |  114 +
 .../protocol/v1_0/type/transport/Detach.java       |  118 +
 .../protocol/v1_0/type/transport/Disposition.java  |  184 +
 .../server/protocol/v1_0/type/transport/End.java   |   73 +
 .../server/protocol/v1_0/type/transport/Error.java |  122 +
 .../server/protocol/v1_0/type/transport/Flow.java  |  296 ++
 .../protocol/v1_0/type/transport/LinkError.java    |  124 +
 .../server/protocol/v1_0/type/transport/Open.java  |  276 ++
 .../v1_0/type/transport/ReceiverSettleMode.java    |   87 +
 .../server/protocol/v1_0/type/transport/Role.java  |   86 +
 .../v1_0/type/transport/SenderSettleMode.java      |   99 +
 .../protocol/v1_0/type/transport/SessionError.java |  113 +
 .../protocol/v1_0/type/transport/Transfer.java     |  330 ++
 .../v1_0/type/transport/codec/AttachWriter.java    |  220 ++
 .../v1_0/type/transport/codec/BeginWriter.java     |  175 +
 .../v1_0/type/transport/codec/CloseWriter.java     |  117 +
 .../v1_0/type/transport/codec/DetachWriter.java    |  132 +
 .../type/transport/codec/DispositionWriter.java    |  158 +
 .../v1_0/type/transport/codec/EndWriter.java       |  115 +
 .../v1_0/type/transport/codec/ErrorWriter.java     |  130 +
 .../v1_0/type/transport/codec/FlowWriter.java      |  197 +
 .../v1_0/type/transport/codec/OpenWriter.java      |  188 +
 .../v1_0/type/transport/codec/TransferWriter.java  |  197 +
 .../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    |  214 +-
 .../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   |  200 +-
 .../v0_10_v1_0/MessageConverter_1_0_to_v0_10.java  |  381 +-
 .../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   |  166 +-
 .../v0_8_v0_10/MessageConverter_0_8_to_0_10.java   |   89 +-
 .../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     |  221 +-
 .../v0_8_v1_0/MessageConverter_1_0_to_v0_8.java    |  348 +-
 .../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                 |   21 +-
 .../store/derby/AbstractDerbyMessageStore.java     |   11 +-
 .../store/derby/DerbyConfigurationStore.java       |  122 +-
 .../qpid/server/store/derby/DerbyMessageStore.java |    4 +-
 .../qpid/server/store/derby/DerbySystemConfig.java |   11 +-
 .../server/store/derby/DerbySystemConfigImpl.java  |    4 +-
 .../apache/qpid/server/store/derby/DerbyUtils.java |   45 +-
 .../server/virtualhost/derby/DerbyVirtualHost.java |   15 +-
 .../virtualhost/derby/DerbyVirtualHostImpl.java    |   48 +-
 .../derby/DerbyVirtualHostNode.java                |   13 +-
 .../derby/DerbyVirtualHostNodeImpl.java            |   50 +-
 .../js/qpid/management/virtualhost/derby/add.js    |   22 +-
 .../js/qpid/management/virtualhost/derby/edit.js   |   31 +-
 .../js/qpid/management/virtualhost/derby/show.js   |   11 +-
 .../qpid/management/virtualhostnode/derby/add.js   |   14 +-
 .../qpid/management/virtualhostnode/derby/edit.js  |   28 +-
 .../qpid/management/virtualhostnode/derby/show.js  |   15 +-
 .../derby/DerbyMessageStoreQuotaEventsTest.java    |    2 +-
 .../server/store/derby/DerbyMessageStoreTest.java  |    2 +-
 .../store/derby/DerbyPreferenceStoreTest.java      |  351 ++
 .../derby/DerbyVirtualHostNodeTest.java            |   13 +-
 broker-plugins/jdbc-provider-bone/pom.xml          |   13 +-
 .../bonecp/BoneCPConnectionProviderFactory.java    |    9 +-
 .../js/qpid/management/store/pool/bonecp/add.js    |    8 +-
 .../js/qpid/management/store/pool/bonecp/edit.js   |   14 +-
 .../js/qpid/management/store/pool/bonecp/show.js   |   84 +-
 broker-plugins/jdbc-store/pom.xml                  |   20 +-
 .../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      |    7 +-
 .../store/jdbc/GenericJDBCConfigurationStore.java  |  234 +-
 .../server/store/jdbc/GenericJDBCMessageStore.java |   53 +-
 .../store/jdbc/JDBCConnectionProviderFactory.java  |   60 +
 .../qpid/server/store/jdbc/JDBCContainer.java      |   31 +
 .../apache/qpid/server/store/jdbc/JDBCDetails.java |   32 +-
 .../qpid/server/store/jdbc/JDBCSettings.java       |    2 +
 .../qpid/server/store/jdbc/JDBCSystemConfig.java   |   22 +
 .../server/store/jdbc/JDBCSystemConfigImpl.java    |   12 +-
 .../apache/qpid/server/store/jdbc/JdbcUtils.java   |   81 +
 .../server/virtualhost/jdbc/JDBCVirtualHost.java   |   26 +-
 .../virtualhost/jdbc/JDBCVirtualHostImpl.java      |   43 +-
 .../virtualhostnode/jdbc/JDBCVirtualHostNode.java  |   27 +-
 .../jdbc/JDBCVirtualHostNodeImpl.java              |   45 +-
 .../js/qpid/management/store/pool/none/add.js      |    5 +-
 .../js/qpid/management/store/pool/none/edit.js     |   14 +-
 .../js/qpid/management/store/pool/none/show.js     |    7 +-
 .../js/qpid/management/virtualhost/jdbc/add.js     |  103 +-
 .../js/qpid/management/virtualhost/jdbc/edit.js    |  111 +-
 .../js/qpid/management/virtualhost/jdbc/show.js    |   81 +-
 .../js/qpid/management/virtualhostnode/jdbc/add.js |  103 +-
 .../qpid/management/virtualhostnode/jdbc/edit.js   |  119 +-
 .../qpid/management/virtualhostnode/jdbc/show.js   |   92 +-
 .../main/java/resources/virtualhost/jdbc/add.html  |   15 +-
 .../java/resources/virtualhostnode/jdbc/add.html   |   15 +-
 .../java/resources/virtualhostnode/jdbc/show.html  |    4 +
 .../jdbc/GenericJDBCConfigurationStoreTest.java    |   69 +
 .../qpid/server/store/jdbc/JDBCDetailsTest.java    |    9 +-
 .../server/store/jdbc/JDBCMessageStoreTest.java    |   41 +-
 .../server/store/jdbc/JDBCSystemConfigTest.java    |   73 +
 .../virtualhost/jdbc/JDBCVirtualHostTest.java      |  111 +
 .../jdbc/JDBCVirtualHostNodeTest.java              |  103 +
 broker-plugins/logging-logback/pom.xml             |   83 +
 .../logging/logback/AbstractBrokerLogger.java      |   63 +
 .../server/logging/logback/AbstractLogger.java     |  210 ++
 .../AbstractNameAndLevelLogInclusionRule.java      |  109 +
 .../logback/AbstractPredicateLogInclusionRule.java |  115 +
 .../logging/logback/AbstractVirtualHostLogger.java |   56 +
 .../qpid/server/logging/logback/AppenderUtils.java |  211 ++
 .../logging/logback/BrokerConsoleLogger.java       |   43 +
 .../logging/logback/BrokerConsoleLoggerImpl.java   |   96 +
 .../server/logging/logback/BrokerFileLogger.java   |   80 +
 .../logging/logback/BrokerFileLoggerImpl.java      |  260 ++
 .../logging/logback/BrokerLogbackSocketLogger.java |   62 +
 .../logback/BrokerLogbackSocketLoggerImpl.java     |  185 +
 .../server/logging/logback/BrokerMemoryLogger.java |   51 +
 .../logging/logback/BrokerMemoryLoggerImpl.java    |  117 +
 .../BrokerNameAndLevelLogInclusionRule.java        |   41 +
 .../BrokerNameAndLevelLogInclusionRuleImpl.java    |   55 +
 .../server/logging/logback/BrokerSyslogLogger.java |   48 +
 .../logging/logback/BrokerSyslogLoggerImpl.java    |   95 +
 .../BrokerUserOrConnectionLogInclusionRule.java    |   51 +
 ...BrokerUserOrConnectionLogInclusionRuleImpl.java |  113 +
 .../server/logging/logback/CompositeFilter.java    |  103 +
 .../logback/ConnectionAndUserPredicate.java        |  110 +
 .../logging/logback/EffectiveLevelFilter.java      |   31 +
 .../server/logging/logback/FileLoggerSettings.java |   46 +
 .../logging/logback/LogBackLogInclusionRule.java   |   32 +
 .../qpid/server/logging/logback/LogRecord.java     |   67 +
 .../qpid/server/logging/logback/LogRecorder.java   |   42 +
 .../logback/Logback1027WorkaroundTurboFilter.java  |  117 +
 .../LogbackLoggingSystemLauncherListener.java      |  101 +
 .../logging/logback/LoggerNameAndLevelFilter.java  |  116 +
 .../server/logging/logback/NoopConfigurator.java   |    0
 .../PredicateAndLoggerNameAndLevelFilter.java      |   79 +
 .../logging/logback/PrincipalLogEventFilter.java   |   64 +
 .../logging/logback/QpidLoggerTurboFilter.java     |  207 ++
 .../logging/logback/RecordEventAppender.java       |   69 +
 .../logging/logback/RollingPolicyDecorator.java    |  333 ++
 .../server/logging/logback/RolloverWatcher.java    |  195 +
 .../server/logging/logback/StartupAppender.java    |  103 +
 .../logging/logback/VirtualHostFileLogger.java     |   78 +
 .../logging/logback/VirtualHostFileLoggerImpl.java |  195 +
 .../VirtualHostLogEventExcludingFilter.java        |   86 +
 .../VirtualHostNameAndLevelLogInclusionRule.java   |   41 +
 ...irtualHostNameAndLevelLogInclusionRuleImpl.java |   55 +
 .../logging/logback/VirtualHostSyslogLogger.java   |   48 +
 .../logback/VirtualHostSyslogLoggerImpl.java       |   96 +
 ...irtualHostUserOrConnectionLogInclusionRule.java |   51 +
 ...alHostUserOrConnectionLogInclusionRuleImpl.java |  113 +
 .../js/qpid/management/logger/FileBrowser.js       |  185 +
 .../js/qpid/management/logger/LogViewer.js         |  246 ++
 .../logger/brokerlogger/brokerlogbacksocket/add.js |   38 +
 .../brokerlogger/brokerlogbacksocket/show.js       |   44 +
 .../management/logger/brokerlogger/console/add.js  |   47 +
 .../management/logger/brokerlogger/console/show.js |   40 +
 .../management/logger/brokerlogger/file/add.js     |   39 +
 .../management/logger/brokerlogger/file/show.js    |   53 +
 .../management/logger/brokerlogger/memory/add.js   |   37 +
 .../management/logger/brokerlogger/memory/show.js  |   44 +
 .../management/logger/brokerlogger/syslog/add.js   |   39 +
 .../management/logger/brokerlogger/syslog/show.js  |   43 +
 .../logger/virtualhostlogger/file/add.js           |   39 +
 .../logger/virtualhostlogger/file/show.js          |   53 +
 .../logger/virtualhostlogger/syslog/add.js         |   39 +
 .../logger/virtualhostlogger/syslog/show.js        |   43 +
 .../brokerloginclusionrule/nameandlevel/add.js     |   49 +
 .../nameandlevel/add.js                            |   49 +
 .../resources/logger/brokerlogbacksocket/add.html  |    0
 .../resources/logger/brokerlogbacksocket/show.html |    0
 .../main/java/resources/logger/console/add.html    |    0
 .../main/java/resources/logger/console/show.html   |    0
 .../src/main/java/resources/logger/file/add.html   |    0
 .../java/resources/logger/file/fileBrowser.html    |    0
 .../src/main/java/resources/logger/file/show.html  |    0
 .../src/main/java/resources/logger/memory/add.html |    0
 .../main/java/resources/logger/memory/show.html    |    0
 .../resources/logger/memory/showLogViewer.html     |    0
 .../src/main/java/resources/logger/syslog/add.html |    0
 .../main/java/resources/logger/syslog/show.html    |    0
 .../ch.qos.logback.classic.spi.Configurator        |    0
 .../server/logging/logback/AppenderUtilsTest.java  |  215 ++
 .../BrokerFileLoggerStatusListenerTest.java        |  106 +
 .../logging/logback/BrokerFileLoggerTest.java      |  132 +
 .../server/logging/logback/BrokerLoggerTest.java   |  257 ++
 .../logging/logback/BrokerMemoryLoggerTest.java    |  150 +
 .../BrokerNameAndLevelLogInclusionRuleTest.java    |  146 +
 .../logging/logback/CompositeFilterTest.java       |  145 +
 .../logback/ConnectionAndUserPredicateTest.java    |  179 +
 .../Logback1027WorkaroundTurboFilterTest.java      |  257 ++
 .../logback/LoggerNameAndLevelFilterTest.java      |  118 +
 .../logback/PrincipalLogEventFilterTest.java       |   96 +
 .../logging/logback/QpidLoggerTurboFilterTest.java |  117 +
 .../logback/RollingPolicyDecoratorTest.java        |  227 ++
 .../logging/logback/RolloverWatcherTest.java       |  290 ++
 .../logging/logback/StartupAppenderTest.java       |  171 +
 .../VirtualHostLogEventExcludingFilterTest.java    |  119 +
 .../logging/logback/VirtualHostLoggerTest.java     |  261 ++
 ...alHostNameAndLevelLogInclusionRuleImplTest.java |  165 +
 broker-plugins/management-amqp/pom.xml             |   10 +-
 .../server/management/amqp/ManagedEntityType.java  |   73 -
 .../management/amqp/ManagementAddressSpace.java    |  454 +++
 .../amqp/ManagementAddressSpaceCreator.java        |   42 +
 .../amqp/ManagementAddressSpacePrincipal.java      |   68 +
 .../management/amqp/ManagementInputConverter.java  |  155 +
 .../server/management/amqp/ManagementNode.java     | 1894 ++++++----
 .../management/amqp/ManagementNodeConsumer.java    |  205 +-
 .../management/amqp/ManagementNodeCreator.java     |    4 +-
 .../management/amqp/ManagementOutputConverter.java |  158 +
 .../server/management/amqp/ManagementResponse.java |   60 +-
 .../server/management/amqp/ProxyMessageSource.java |  423 +++
 broker-plugins/management-http/pom.xml             |  114 +-
 .../main/grammar/ConfiguredObjectFilterParser.jj   |  754 ++++
 .../qpid/server/management/plugin/DojoHelper.java  |   34 +-
 .../management/plugin/GunzipOutputStream.java      |  307 ++
 .../server/management/plugin/HttpManagement.java   |  706 ++--
 .../plugin/HttpManagementConfiguration.java        |   39 +-
 .../management/plugin/HttpManagementUtil.java      |  284 +-
 .../plugin/HttpRequestPreemptiveAuthenticator.java |    1 -
 .../server/management/plugin/RewriteServlet.java   |    2 +
 .../plugin/SessionInvalidatedException.java        |   25 +
 .../auth/AnonymousInteractiveAuthenticator.java    |  134 +
 .../auth/AnonymousPreemptiveAuthenticator.java     |    6 +-
 .../auth/BasicAuthPreemptiveAuthenticator.java     |    8 +-
 .../auth/OAuth2InteractiveAuthenticator.java       |  106 +-
 .../plugin/auth/OAuth2PreemptiveAuthenticator.java |    8 +-
 .../auth/SSLClientCertPreemptiveAuthenticator.java |    8 +-
 .../auth/UsernamePasswordInteractiveLogin.java     |   17 +-
 .../connector/TcpAndSslSelectChannelConnector.java |  378 --
 .../plugin/filter/AuthenticationCheckFilter.java   |  210 ++
 .../plugin/filter/ExceptionHandlingFilter.java     |   50 +-
 .../filter/ForbiddingAuthorisationFilter.java      |   93 -
 .../filter/InteractiveAuthenticationFilter.java    |  108 +
 .../management/plugin/filter/LoggingFilter.java    |   56 +-
 .../management/plugin/filter/RedirectFilter.java   |   59 +
 .../filter/RedirectingAuthorisationFilter.java     |  110 -
 .../RewriteRequestForUncompressedJavascript.java   |   80 +
 .../plugin/portunification/MarkableEndPoint.java   |  275 ++
 .../TlsOrPlainConnectionFactory.java               |  358 ++
 .../plugin/preferences/QueryPreferenceValue.java   |  106 +
 .../preferences/QueryPreferenceValueFactory.java   |   43 +
 .../management/plugin/report/QueueReport.java      |    2 +-
 .../management/plugin/report/ReportRunner.java     |   33 +-
 .../plugin/report/ReportableMessage.java           |    7 +-
 .../plugin/report/ReportableMessageHeader.java     |    5 +-
 .../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  |   28 +
 .../query/ConfiguredObjectExpressionFactory.java   |  372 ++
 .../query/ConfiguredObjectFilterParser.java        | 1504 ++++++++
 .../ConfiguredObjectFilterParserConstants.java     |  140 +
 .../ConfiguredObjectFilterParserTokenManager.java  | 1130 ++++++
 .../servlet/query/ConfiguredObjectQuery.java       |  344 ++
 .../plugin/servlet/query/EvaluationException.java  |   35 +
 .../plugin/servlet/query/NamedExpression.java      |   28 +
 .../plugin/servlet/query/ParseException.java       |  212 ++
 .../plugin/servlet/query/SimpleCharStream.java     |  492 +++
 .../management/plugin/servlet/query/Token.java     |  153 +
 .../plugin/servlet/query/TokenMgrError.java        |  169 +
 .../plugin/servlet/rest/AbstractServlet.java       |  369 +-
 .../plugin/servlet/rest/ApiDocsServlet.java        |  376 +-
 .../plugin/servlet/rest/BrokerQueryServlet.java    |  122 +
 .../rest/ConfiguredObjectToMapConverter.java       |  260 +-
 .../plugin/servlet/rest/JsonValueServlet.java      |    8 +-
 .../plugin/servlet/rest/KeyComparator.java         |   53 -
 .../rest/LoggedOnUserPreferencesServlet.java       |  136 -
 .../plugin/servlet/rest/LogoutServlet.java         |    2 +
 .../plugin/servlet/rest/MapComparator.java         |   74 -
 .../plugin/servlet/rest/MetaDataServlet.java       |   84 +-
 .../plugin/servlet/rest/NotFoundException.java     |   33 +
 .../plugin/servlet/rest/QueryServlet.java          |  140 +
 .../plugin/servlet/rest/QueueReportServlet.java    |   55 +-
 .../plugin/servlet/rest/RequestInfo.java           |  131 +
 .../plugin/servlet/rest/RequestInfoParser.java     |  258 ++
 .../plugin/servlet/rest/RestServlet.java           | 1115 +++---
 .../servlet/rest/RestUserPreferenceHandler.java    |  407 +++
 .../plugin/servlet/rest/SaslServlet.java           |  254 +-
 .../plugin/servlet/rest/StructureServlet.java      |   96 +-
 .../plugin/servlet/rest/TimeZoneServlet.java       |    8 +-
 .../servlet/rest/UserPreferencesServlet.java       |  237 --
 .../servlet/rest/VirtualHostQueryServlet.java      |  199 +
 .../accesscontrolprovider/aclfile/add.html         |   40 +-
 .../accesscontrolprovider/showAclFile.html         |    5 +
 .../java/resources/addAccessControlProvider.html   |   14 +-
 .../java/resources/addAuthenticationProvider.html  |    9 +-
 .../src/main/java/resources/addBinding.html        |   12 +-
 .../src/main/java/resources/addExchange.html       |   27 +-
 .../src/main/java/resources/addGroupProvider.html  |    7 +
 .../src/main/java/resources/addPort.html           |   34 +-
 .../java/resources/addPreferencesProvider.html     |   28 -
 .../src/main/java/resources/addQueue.html          |  315 +-
 .../src/main/java/resources/addStore.html          |    1 +
 .../src/main/java/resources/addVirtualHost.html    |   59 +
 .../main/java/resources/addVirtualHostAlias.html   |   85 +
 .../authenticationprovider/oauth2/add.html         |  145 +
 .../authenticationprovider/oauth2/show.html        |   57 +
 .../authenticationprovider/simpleldap/add.html     |  186 +-
 .../authenticationprovider/simpleldap/show.html    |   69 +-
 .../resources/common/ContextVariablesEditor.html   |    2 +-
 .../src/main/java/resources/common/LoginForm.html  |   47 +
 .../java/resources/common/MessageDialogForm.html   |   44 +
 .../java/resources/common/StatisticsWidget.html    |   35 +
 .../java/resources/common/TimeZoneSelector.html    |   59 +-
 .../src/main/java/resources/css/apidocs.css        |    8 +
 .../src/main/java/resources/css/common.css         |  456 ++-
 .../dashboard/AddWidgetDialogContent.html          |   33 +
 .../dashboard/DashboardCreateDialogForm.html       |   55 +
 .../java/resources/dashboard/DashboardWidget.html  |   56 +
 .../resources/dashboard/QueryWidgetSettings.html   |   66 +
 .../src/main/java/resources/editBroker.html        |   50 +-
 .../src/main/java/resources/editQueue.html         |  300 --
 .../src/main/java/resources/editVirtualHost.html   |   22 +-
 .../src/main/java/resources/footer.html            |    2 +-
 .../cloudfoundrydashboardmanagement/add.html       |   63 +
 .../cloudfoundrydashboardmanagement/show.html      |   33 +
 .../src/main/java/resources/images/minus.svg       |   26 +
 .../main/java/resources/images/notification.svg    |   88 +-
 .../src/main/java/resources/images/plus.svg        |   28 +
 .../main/java/resources/images/qpid-favicon.png    |  Bin 0 -> 9509 bytes
 .../src/main/java/resources/images/question.svg    |   31 +
 .../src/main/java/resources/index.html             |  228 +-
 .../java/resources/js/qpid/addVirtualHostAlias.js  |  236 ++
 .../resources/js/qpid/authorization/checkUser.js   |   45 -
 .../java/resources/js/qpid/authorization/sasl.js   |  332 --
 .../js/qpid/common/CategoryTabExtension.js         |   71 +-
 .../java/resources/js/qpid/common/ConsoleHelper.js |  263 +-
 .../js/qpid/common/ContextVariablesEditor.js       |  837 +++--
 .../resources/js/qpid/common/DestinationChooser.js |  103 +
 .../resources/js/qpid/common/FormWidgetMixin.js    |   52 +-
 .../java/resources/js/qpid/common/HexDumpWidget.js |  135 +
 .../main/java/resources/js/qpid/common/JsonRest.js |   97 +-
 .../java/resources/js/qpid/common/LoginForm.js     |  130 +
 .../java/resources/js/qpid/common/MessageDialog.js |  199 +
 .../resources/js/qpid/common/ResourceWidget.js     |  351 +-
 .../resources/js/qpid/common/StatisticsWidget.js   |  450 +++
 .../java/resources/js/qpid/common/Structure.js     |  165 +
 .../resources/js/qpid/common/TimeZoneSelector.js   |  343 +-
 .../resources/js/qpid/common/TypeTabExtension.js   |   86 +-
 .../resources/js/qpid/common/UpdatableStore.js     |  176 +-
 .../java/resources/js/qpid/common/WarningPane.js   |   82 +-
 .../main/java/resources/js/qpid/common/footer.js   |   18 +-
 .../java/resources/js/qpid/common/formatter.js     |   42 +-
 .../js/qpid/common/grid/ColumnDefDialog.js         |  250 +-
 .../js/qpid/common/grid/EnhancedFilter.js          |  442 +--
 .../js/qpid/common/grid/EnhancedFilterTools.js     |  620 ++--
 .../resources/js/qpid/common/grid/FilterSummary.js |  326 +-
 .../resources/js/qpid/common/grid/GridUpdater.js   |  502 +--
 .../js/qpid/common/grid/RowNumberLimitDialog.js    |  148 +-
 .../resources/js/qpid/common/grid/UpdatableGrid.js |   56 +-
 .../main/java/resources/js/qpid/common/metadata.js |  188 +-
 .../java/resources/js/qpid/common/properties.js    |   12 +-
 .../main/java/resources/js/qpid/common/timezone.js |   58 +-
 .../main/java/resources/js/qpid/common/updater.js  |   76 +-
 .../src/main/java/resources/js/qpid/common/util.js | 1616 +++++----
 .../resources/js/qpid/common/widgetconfigurer.js   |  291 +-
 .../js/qpid/management/AccessControlProvider.js    |  184 +-
 .../js/qpid/management/AuthenticationProvider.js   |  367 +-
 .../java/resources/js/qpid/management/Broker.js    | 1698 +++++----
 .../resources/js/qpid/management/Connection.js     |  541 +--
 .../js/qpid/management/DashboardBrowserTab.js      |  115 +
 .../resources/js/qpid/management/DashboardTab.js   |  202 ++
 .../java/resources/js/qpid/management/Exchange.js  |  559 +--
 .../resources/js/qpid/management/GroupProvider.js  |  382 +-
 .../java/resources/js/qpid/management/KeyStore.js  |  289 +-
 .../java/resources/js/qpid/management/Logger.js    |  489 +--
 .../resources/js/qpid/management/Management.js     | 1053 +++---
 .../java/resources/js/qpid/management/Plugin.js    |  107 +-
 .../main/java/resources/js/qpid/management/Port.js |  461 ++-
 .../resources/js/qpid/management/Preferences.js    |  285 --
 .../js/qpid/management/PreferencesProvider.js      |  186 -
 .../js/qpid/management/QueryBrowserTab.js          |  113 +
 .../java/resources/js/qpid/management/QueryTab.js  |  196 +
 .../java/resources/js/qpid/management/Queue.js     | 1213 ++++---
 .../resources/js/qpid/management/TrustStore.js     |  316 +-
 .../js/qpid/management/UserPreferences.js          |  584 +--
 .../resources/js/qpid/management/VirtualHost.js    | 1045 +++---
 .../js/qpid/management/VirtualHostNode.js          |  475 ++-
 .../management/accesscontrolprovider/AclFile.js    |  117 +-
 .../accesscontrolprovider/aclfile/add.js           |  120 +-
 .../js/qpid/management/addAccessControlProvider.js |  218 +-
 .../qpid/management/addAuthenticationProvider.js   |  217 +-
 .../resources/js/qpid/management/addBinding.js     |  608 ++--
 .../resources/js/qpid/management/addExchange.js    |  196 +-
 .../js/qpid/management/addGroupProvider.js         |  287 +-
 .../js/qpid/management/addLogInclusionRule.js      |  294 +-
 .../java/resources/js/qpid/management/addLogger.js |  196 +-
 .../java/resources/js/qpid/management/addPort.js   |  717 ++--
 .../js/qpid/management/addPreferencesProvider.js   |  111 -
 .../java/resources/js/qpid/management/addQueue.js  |  286 +-
 .../java/resources/js/qpid/management/addStore.js  |  192 +-
 .../resources/js/qpid/management/addVirtualHost.js |  197 +
 .../js/qpid/management/addVirtualHostAlias.js      |  239 ++
 .../management/addVirtualHostNodeAndVirtualHost.js |  675 ++--
 .../PrincipalDatabaseAuthenticationManager.js      |  317 +-
 .../authenticationprovider/anonymous/add.js        |    9 +-
 .../authenticationprovider/anonymous/show.js       |   10 +-
 .../base64md5passwordfile/add.js                   |   31 +-
 .../base64md5passwordfile/show.js                  |   11 +-
 .../authenticationprovider/external/add.js         |   33 +-
 .../authenticationprovider/external/show.js        |   11 +-
 .../authenticationprovider/kerberos/add.js         |    9 +-
 .../authenticationprovider/kerberos/show.js        |   10 +-
 .../management/authenticationprovider/md5/add.js   |    9 +-
 .../management/authenticationprovider/md5/show.js  |   10 +-
 .../authenticationprovider/oauth2/add.js           |   64 +
 .../authenticationprovider/oauth2/show.js          |   49 +
 .../management/authenticationprovider/plain/add.js |    9 +-
 .../authenticationprovider/plain/show.js           |   10 +-
 .../plainpasswordfile/add.js                       |   31 +-
 .../plainpasswordfile/show.js                      |   11 +-
 .../authenticationprovider/scram-sha-1/add.js      |    9 +-
 .../authenticationprovider/scram-sha-1/show.js     |   10 +-
 .../authenticationprovider/scram-sha-256/add.js    |    9 +-
 .../authenticationprovider/scram-sha-256/show.js   |   10 +-
 .../authenticationprovider/simpleldap/add.js       |  178 +-
 .../authenticationprovider/simpleldap/show.js      |   13 +-
 .../resources/js/qpid/management/controller.js     |  326 +-
 .../dashboard/DashboardCreateDialogForm.js         |  116 +
 .../qpid/management/dashboard/DashboardWidget.js   |  499 +++
 .../js/qpid/management/dashboard/widget/query.js   |  333 ++
 .../management/dashboard/widget/unavailable.js     |  116 +
 .../resources/js/qpid/management/editBroker.js     |  243 +-
 .../java/resources/js/qpid/management/editQueue.js |  171 -
 .../js/qpid/management/editVirtualHost.js          |  324 +-
 .../js/qpid/management/editVirtualHostNode.js      |  265 +-
 .../resources/js/qpid/management/group/Group.js    |  352 +-
 .../js/qpid/management/group/addGroupMember.js     |  117 +-
 .../groupprovider/GroupManagingGroupProvider.js    |  231 +-
 .../cloudfoundrydashboardmanagement/add.js         |  229 ++
 .../cloudfoundrydashboardmanagement/show.js        |   54 +
 .../qpid/management/groupprovider/groupfile/add.js |   40 +-
 .../management/groupprovider/groupfile/show.js     |   10 +-
 .../groupprovider/managedgroupprovider/add.js      |   14 +-
 .../groupprovider/managedgroupprovider/show.js     |   10 +-
 .../js/qpid/management/logger/FileBrowser.js       |  264 +-
 .../js/qpid/management/logger/LogViewer.js         |  362 +-
 .../js/qpid/management/logger/brokerlogger/add.js  |   28 +-
 .../logger/brokerlogger/brokerlogbacksocket/add.js |   41 -
 .../brokerlogger/brokerlogbacksocket/show.js       |   40 -
 .../management/logger/brokerlogger/console/add.js  |   47 -
 .../management/logger/brokerlogger/console/show.js |   36 -
 .../management/logger/brokerlogger/file/add.js     |   42 -
 .../management/logger/brokerlogger/file/show.js    |   47 -
 .../management/logger/brokerlogger/memory/add.js   |   39 -
 .../management/logger/brokerlogger/memory/show.js  |   40 -
 .../js/qpid/management/logger/brokerlogger/show.js |   55 +-
 .../management/logger/brokerlogger/syslog/add.js   |   42 -
 .../management/logger/brokerlogger/syslog/show.js  |   41 -
 .../management/logger/virtualhostlogger/add.js     |   24 +-
 .../logger/virtualhostlogger/file/add.js           |   42 -
 .../logger/virtualhostlogger/file/show.js          |   47 -
 .../management/logger/virtualhostlogger/show.js    |   28 +-
 .../logger/virtualhostlogger/syslog/add.js         |   42 -
 .../logger/virtualhostlogger/syslog/show.js        |   41 -
 .../brokerloginclusionrule/nameandlevel/add.js     |   51 -
 .../nameandlevel/add.js                            |   51 -
 .../js/qpid/management/moveCopyMessages.js         |  169 +-
 .../js/qpid/management/plugin/managementhttp.js    |  130 +-
 .../qpid/management/plugin/managementhttp/edit.js  |  172 +-
 .../js/qpid/management/plugin/managementjmx.js     |  104 -
 .../qpid/management/plugin/managementjmx/edit.js   |  124 -
 .../resources/js/qpid/management/port/amqp/show.js |  127 +
 .../resources/js/qpid/management/port/http/show.js |   43 +
 .../preference/PreferenceBrowserWidget.js          |  423 +++
 .../preference/PreferenceSaveDialogContent.js      |  168 +
 .../preferencesprovider/PreferencesProviderForm.js |  207 --
 .../filesystempreferences/add.js                   |   38 -
 .../filesystempreferences/show.js                  |   48 -
 .../js/qpid/management/query/CriteriaPane.js       |  699 ++++
 .../js/qpid/management/query/DropDownSelect.js     |  125 +
 .../js/qpid/management/query/OptionsPanel.js       |  395 ++
 .../qpid/management/query/QueryCreateDialogForm.js |  137 +
 .../js/qpid/management/query/QueryGrid.js          |  255 ++
 .../js/qpid/management/query/QueryStore.js         |  162 +
 .../js/qpid/management/query/QueryWidget.js        |  984 +++++
 .../js/qpid/management/query/SearchTextBox.js      |   57 +
 .../js/qpid/management/query/StoreUpdater.js       |  238 ++
 .../js/qpid/management/query/WhereCriteria.js      |  295 ++
 .../js/qpid/management/query/WhereExpression.js    |  152 +
 .../resources/js/qpid/management/showMessage.js    |  325 +-
 .../qpid/management/store/CertificateGridWidget.js |  261 ++
 .../store/autogeneratedselfsigned/add.js           |   80 +-
 .../store/autogeneratedselfsigned/show.js          |  113 +-
 .../js/qpid/management/store/filekeystore/add.js   |   90 +-
 .../js/qpid/management/store/filekeystore/show.js  |   12 +-
 .../js/qpid/management/store/filetruststore/add.js |   85 +-
 .../qpid/management/store/filetruststore/show.js   |   12 +-
 .../store/managedcertificatestore/show.js          |  146 +-
 .../qpid/management/store/nonjavakeystore/add.js   |   89 +-
 .../qpid/management/store/nonjavakeystore/show.js  |   46 +-
 .../qpid/management/store/nonjavatruststore/add.js |   81 +-
 .../management/store/nonjavatruststore/show.js     |   69 +-
 .../management/store/sitespecifictruststore/add.js |   78 +-
 .../store/sitespecifictruststore/show.js           |   72 +-
 .../java/resources/js/qpid/management/treeView.js  |  664 ++--
 .../userpreference/UserPreferenceForm.js           |  132 +
 .../management/virtualhost/providedstore/add.js    |   25 +-
 .../management/virtualhost/providedstore/edit.js   |   31 +-
 .../management/virtualhost/providedstore/show.js   |   10 +-
 .../virtualhostalias/defaultalias/add.js           |   45 +
 .../virtualhostalias/hostnamealias/add.js          |   47 +
 .../management/virtualhostalias/namealias/add.js   |   45 +
 .../virtualhostalias/patternmatchingalias/add.js   |   47 +
 .../js/qpid/management/virtualhostnode/json/add.js |   16 +-
 .../qpid/management/virtualhostnode/json/edit.js   |   28 +-
 .../qpid/management/virtualhostnode/json/show.js   |   33 +-
 .../java/resources/js/qpid/sasl/Authenticator.js   |  214 ++
 .../js/qpid/sasl/CredentialBasedSaslClient.js      |   41 +
 .../main/java/resources/js/qpid/sasl/SaslClient.js |   93 +
 .../resources/js/qpid/sasl/ScramShaSaslClient.js   |  244 ++
 .../js/qpid/sasl/cram-md5-hex/SaslClient.js        |   45 +
 .../resources/js/qpid/sasl/cram-md5/SaslClient.js  |  105 +
 .../resources/js/qpid/sasl/plain/SaslClient.js     |   85 +
 .../js/qpid/sasl/scram-sha-1/SaslClient.js         |   36 +
 .../js/qpid/sasl/scram-sha-256/SaslClient.js       |   36 +
 .../src/main/java/resources/login.html             |  119 -
 .../src/main/java/resources/logout.html            |   43 +-
 .../java/resources/plugin/managementhttp/edit.html |   61 +-
 .../java/resources/plugin/managementjmx/edit.html  |   58 -
 .../java/resources/plugin/showManagementHttp.html  |   19 +
 .../java/resources/plugin/showManagementJmx.html   |   32 -
 .../src/main/java/resources/port/amqp/show.html    |   29 +
 .../src/main/java/resources/port/http/show.html    |   22 +
 .../preference/PreferenceBrowserWidget.html        |   32 +
 .../preference/PreferenceSaveDialogContent.html    |   77 +
 .../filesystempreferences/add.html                 |   37 -
 .../filesystempreferences/show.html                |   21 -
 .../preferencesProviderForm.html                   |   62 -
 .../main/java/resources/query/CriteriaPane.html    |   42 +
 .../main/java/resources/query/OptionsPanel.html    |   44 +
 .../java/resources/query/QueryCloneDialogForm.html |   55 +
 .../resources/query/QueryCreateDialogForm.html     |   71 +
 .../src/main/java/resources/query/QueryWidget.html |  125 +
 .../main/java/resources/query/WhereCriteria.html   |   75 +
 .../java/resources/showAccessControlProvider.html  |    4 +
 .../src/main/java/resources/showAuthProvider.html  |    4 +-
 .../src/main/java/resources/showBroker.html        |   91 +-
 .../src/main/java/resources/showConnection.html    |   63 +-
 .../java/resources/showDashboardBrowserTab.html    |   21 +
 .../src/main/java/resources/showDashboardTab.html  |   20 +
 .../src/main/java/resources/showExchange.html      |   74 +-
 .../src/main/java/resources/showGroupProvider.html |    2 +-
 .../src/main/java/resources/showMessage.html       |   50 +-
 .../src/main/java/resources/showPort.html          |   17 +-
 .../src/main/java/resources/showPreferences.html   |   79 -
 .../java/resources/showPreferencesProvider.html    |   38 -
 .../main/java/resources/showQueryBrowserTab.html   |   20 +
 .../src/main/java/resources/showQueryTab.html      |   22 +
 .../src/main/java/resources/showQueue.html         |  120 +-
 .../src/main/java/resources/showTrustStore.html    |   57 +
 .../src/main/java/resources/showVirtualHost.html   |   77 +-
 .../main/java/resources/showVirtualHostNode.html   |    4 +-
 .../resources/store/CertificateGridWidget.html     |   34 +
 .../java/resources/store/filetruststore/add.html   |    8 +-
 .../src/main/java/resources/store/keystore.html    |   19 +
 .../store/managedcertificatestore/show.html        |   13 -
 .../java/resources/store/nonjavakeystore/show.html |    4 +-
 .../resources/store/nonjavatruststore/show.html    |    4 -
 .../store/sitespecifictruststore/show.html         |   28 +-
 .../src/main/java/resources/store/truststore.html  |   47 +
 .../userpreference/UserPreferenceForm.html         |   65 +
 .../virtualhostalias/defaultalias/add.html         |   21 +
 .../virtualhostalias/hostnamealias/add.html        |   33 +
 .../resources/virtualhostalias/namealias/add.html  |   21 +
 .../virtualhostalias/patternmatchingalias/add.html |   45 +
 .../src/main/resources-maven/dojoconfig.properties |    2 +
 .../management/plugin/GunzipOutputStreamTest.java  |  108 +
 .../auth/OAuth2InteractiveAuthenticatorTest.java   |  405 +++
 .../auth/OAuth2PreemptiveAuthenticatorTest.java    |  153 +
 .../TlsOrPlainConnectionFactoryTest.java           |  191 +
 .../management/plugin/report/ReportRunnerTest.java |    8 +-
 .../servlet/query/ConfiguredObjectQueryTest.java   |  708 ++++
 .../rest/ConfiguredObjectToMapConverterTest.java   |  255 +-
 .../plugin/servlet/rest/RequestInfoParserTest.java |  343 ++
 .../rest/RestUserPreferenceHandlerTest.java        |  951 +++++
 .../plugin/session/LoginLogoutReporterTest.java    |    3 +-
 broker-plugins/management-jmx/pom.xml              |   76 -
 .../apache/qpid/server/jmx/AMQManagedObject.java   |   84 -
 .../qpid/server/jmx/DefaultManagedObject.java      |  185 -
 .../qpid/server/jmx/JMXManagedObjectRegistry.java  |  541 ---
 .../qpid/server/jmx/JMXManagementPlugin.java       |   35 -
 .../qpid/server/jmx/JMXManagementPluginImpl.java   |  545 ---
 .../apache/qpid/server/jmx/MBeanIntrospector.java  |  400 --
 .../server/jmx/MBeanInvocationHandlerImpl.java     |  384 --
 .../org/apache/qpid/server/jmx/MBeanProvider.java  |   53 -
 .../org/apache/qpid/server/jmx/ManagedObject.java  |   57 -
 .../qpid/server/jmx/ManagedObjectRegistry.java     |   48 -
 .../server/jmx/ManagementLogonLogoffReporter.java  |  140 -
 .../server/jmx/QpidRMIServerSocketFactory.java     |   59 -
 .../server/jmx/QpidSslRMIServerSocketFactory.java  |  135 -
 .../RegistryProtectingRMIServerSocketFactory.java  |   96 -
 .../apache/qpid/server/jmx/UsernameAccessor.java   |   28 -
 .../server/jmx/UsernameCachingRMIJRMPServer.java   |   97 -
 .../mbeans/AbstractStatisticsGatheringMBean.java   |  201 -
 .../qpid/server/jmx/mbeans/ConnectionMBean.java    |  205 --
 .../qpid/server/jmx/mbeans/ExchangeMBean.java      |  330 --
 .../server/jmx/mbeans/LoggingManagementMBean.java  |  350 --
 .../apache/qpid/server/jmx/mbeans/QueueMBean.java  |  717 ----
 .../server/jmx/mbeans/ServerInformationMBean.java  |  113 -
 .../apache/qpid/server/jmx/mbeans/Shutdown.java    |  143 -
 .../qpid/server/jmx/mbeans/ShutdownMBean.java      |   58 -
 .../server/jmx/mbeans/UserManagementMBean.java     |  193 -
 .../qpid/server/jmx/mbeans/VirtualHostMBean.java   |  298 --
 .../server/jmx/mbeans/VirtualHostManagerMBean.java |  318 --
 .../jmx/ManagementLogonLogoffReporterTest.java     |  124 -
 .../qpid/server/jmx/NoopManagedObjectRegistry.java |   46 -
 .../server/jmx/mbeans/ConnectionMBeanTest.java     |  233 --
 .../qpid/server/jmx/mbeans/ExchangeMBeanTest.java  |  233 --
 .../jmx/mbeans/LoggingManagementMBeanTest.java     |  324 --
 .../qpid/server/jmx/mbeans/MBeanTestUtils.java     |   76 -
 .../qpid/server/jmx/mbeans/QueueMBeanTest.java     |  491 ---
 .../jmx/mbeans/ServerInformationMBeanTest.java     |   89 -
 .../server/jmx/mbeans/UserManagementMBeanTest.java |  156 -
 .../jmx/mbeans/VirtualHostManagerMBeanTest.java    |  268 --
 broker-plugins/memory-store/pom.xml                |   12 +-
 .../qpid/server/store/MemorySystemConfigImpl.java  |    7 +-
 .../js/qpid/management/virtualhost/memory/add.js   |   14 +-
 .../js/qpid/management/virtualhost/memory/edit.js  |   18 +-
 .../js/qpid/management/virtualhost/memory/show.js  |   10 +-
 .../qpid/management/virtualhostnode/memory/add.js  |   14 +-
 .../qpid/management/virtualhostnode/memory/edit.js |   18 +-
 .../qpid/management/virtualhostnode/memory/show.js |   12 +-
 broker-plugins/websocket/pom.xml                   |   33 +-
 .../transport/websocket/WebSocketProvider.java     |  480 ++-
 {common => broker}/bin/qpid-run                    |    0
 broker/bin/qpid-server                             |   20 +-
 broker/bin/qpid-server.bat                         |   14 +-
 broker/bin/qpid.stop                               |  225 +-
 broker/etc/broker_example.acl                      |  132 -
 broker/pom.xml                                     |   75 +-
 broker/scripts/resetAlerting.sh                    |  116 -
 broker/src/main/assembly/NOTICE                    |  115 -
 .../dependency-verification/DEPENDENCIES_REFERENCE |  126 -
 broker/src/main/assembly/qpid-broker-bin.xml       |   78 -
 .../src/main/java/org/apache/qpid/server/Main.java |  294 +-
 .../test/java/org/apache/qpid/server/MainTest.java |  156 +-
 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  |   27 -
 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 |   36 -
 client/src/main/assembly/qpid-client-bin.xml       |   70 -
 client/src/main/java/client.bnd                    |   27 -
 .../org/apache/qpid/client/AMQAnyDestination.java  |   95 -
 .../qpid/client/AMQAuthenticationException.java    |   37 -
 .../java/org/apache/qpid/client/AMQConnection.java | 1999 ----------
 .../apache/qpid/client/AMQConnectionDelegate.java  |   89 -
 .../qpid/client/AMQConnectionDelegate_0_10.java    |  677 ----
 .../qpid/client/AMQConnectionDelegate_0_9.java     |   40 -
 .../qpid/client/AMQConnectionDelegate_0_91.java    |   39 -
 .../qpid/client/AMQConnectionDelegate_8_0.java     |  583 ---
 .../apache/qpid/client/AMQConnectionFactory.java   |  412 ---
 .../org/apache/qpid/client/AMQConnectionURL.java   |  387 --
 .../org/apache/qpid/client/AMQDestination.java     | 1081 ------
 .../org/apache/qpid/client/AMQHeadersExchange.java |   51 -
 .../qpid/client/AMQNoConsumersException.java       |   35 -
 .../apache/qpid/client/AMQNoRouteException.java    |   35 -
 .../org/apache/qpid/client/AMQProtocolHandler.java |  933 -----
 .../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    | 3836 --------------------
 .../org/apache/qpid/client/AMQSessionAdapter.java  |  191 -
 .../org/apache/qpid/client/AMQSession_0_10.java    | 1464 --------
 .../org/apache/qpid/client/AMQSession_0_8.java     | 1554 --------
 .../org/apache/qpid/client/AMQTemporaryQueue.java  |   67 -
 .../org/apache/qpid/client/AMQTemporaryTopic.java  |   75 -
 .../main/java/org/apache/qpid/client/AMQTopic.java |  230 --
 .../apache/qpid/client/AMQTopicSessionAdaptor.java |   70 -
 .../qpid/client/AMQUndefinedDestination.java       |   45 -
 .../java/org/apache/qpid/client/AMQXAResource.java |   32 -
 .../apache/qpid/client/BasicMessageConsumer.java   | 1049 ------
 .../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     |  407 ---
 .../qpid/client/BasicMessageProducer_0_8.java      |  500 ---
 .../java/org/apache/qpid/client/BrokerDetails.java |  614 ----
 .../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    |  150 -
 .../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      |  213 --
 .../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 |  257 --
 .../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     |  163 -
 .../client/messaging/address/AddressHelper.java    |  328 --
 .../apache/qpid/client/messaging/address/Link.java |  242 --
 .../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    |  350 --
 .../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    |  138 -
 .../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  |  149 -
 .../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      |   79 -
 .../apache/qpid/client/transport/MockSender.java   |   46 -
 .../client/transport/TestNetworkConnection.java    |  155 -
 .../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                                     |  168 -
 common/readme.txt                                  |    4 -
 common/src/main/grammar/SelectorParser.jj          |  612 ----
 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     |   54 -
 .../org/apache/qpid/bytebuffer/ByteBufferRef.java  |   34 -
 .../qpid/bytebuffer/NonPooledByteBufferRef.java    |   57 -
 .../qpid/bytebuffer/PooledByteBufferRef.java       |   70 -
 .../org/apache/qpid/bytebuffer/QpidByteBuffer.java | 1028 ------
 .../bytebuffer/QpidByteBufferOutputStream.java     |  108 -
 .../java/org/apache/qpid/codec/AMQDecoder.java     |  237 --
 .../java/org/apache/qpid/codec/ClientDecoder.java  |  307 --
 .../org/apache/qpid/codec/MarkableDataInput.java   |   45 -
 .../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       |  324 --
 .../qpid/configuration/CommonProperties.java       |  260 --
 .../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   |  589 ---
 .../org/apache/qpid/filter/ConstantExpression.java |  207 --
 .../java/org/apache/qpid/filter/Expression.java    |   35 -
 .../org/apache/qpid/filter/FilterableMessage.java  |   41 -
 .../org/apache/qpid/filter/LogicExpression.java    |  114 -
 .../org/apache/qpid/filter/PropertyExpression.java |  234 --
 .../qpid/filter/SelectorParsingException.java      |   36 -
 .../org/apache/qpid/filter/UnaryExpression.java    |  340 --
 .../qpid/filter/selector/ParseException.java       |  208 --
 .../qpid/filter/selector/SelectorParser.java       | 1225 -------
 .../filter/selector/SelectorParserConstants.java   |  125 -
 .../selector/SelectorParserTokenManager.java       | 1066 ------
 .../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 |   45 -
 .../java/org/apache/qpid/framing/AMQDataBlock.java |   51 -
 .../java/org/apache/qpid/framing/AMQFrame.java     |  147 -
 .../qpid/framing/AMQFrameDecodingException.java    |   42 -
 .../org/apache/qpid/framing/AMQMethodBody.java     |   74 -
 .../org/apache/qpid/framing/AMQMethodBodyImpl.java |  218 --
 .../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    |  463 ---
 .../main/java/org/apache/qpid/framing/AMQType.java |  845 -----
 .../java/org/apache/qpid/framing/AMQTypeMap.java   |   52 -
 .../org/apache/qpid/framing/AMQTypedValue.java     |  324 --
 .../org/apache/qpid/framing/AccessRequestBody.java |  183 -
 .../apache/qpid/framing/AccessRequestOkBody.java   |  108 -
 .../java/org/apache/qpid/framing/BasicAckBody.java |  126 -
 .../org/apache/qpid/framing/BasicCancelBody.java   |  127 -
 .../org/apache/qpid/framing/BasicCancelOkBody.java |  109 -
 .../org/apache/qpid/framing/BasicConsumeBody.java  |  218 --
 .../apache/qpid/framing/BasicConsumeOkBody.java    |  109 -
 .../qpid/framing/BasicContentHeaderProperties.java |  997 -----
 .../org/apache/qpid/framing/BasicDeliverBody.java  |  169 -
 .../java/org/apache/qpid/framing/BasicGetBody.java |  141 -
 .../org/apache/qpid/framing/BasicGetEmptyBody.java |  108 -
 .../org/apache/qpid/framing/BasicGetOkBody.java    |  167 -
 .../org/apache/qpid/framing/BasicNackBody.java     |  143 -
 .../org/apache/qpid/framing/BasicPublishBody.java  |  170 -
 .../java/org/apache/qpid/framing/BasicQosBody.java |  139 -
 .../org/apache/qpid/framing/BasicQosOkBody.java    |   87 -
 .../org/apache/qpid/framing/BasicRecoverBody.java  |  115 -
 .../apache/qpid/framing/BasicRecoverSyncBody.java  |  115 -
 .../qpid/framing/BasicRecoverSyncOkBody.java       |   87 -
 .../org/apache/qpid/framing/BasicRejectBody.java   |  126 -
 .../org/apache/qpid/framing/BasicReturnBody.java   |  150 -
 .../apache/qpid/framing/ByteArrayDataInput.java    |  203 --
 .../apache/qpid/framing/ByteBufferDataInput.java   |  172 -
 .../qpid/framing/ByteBufferListDataInput.java      |  309 --
 .../org/apache/qpid/framing/ChannelAlertBody.java  |  141 -
 .../org/apache/qpid/framing/ChannelCloseBody.java  |  148 -
 .../apache/qpid/framing/ChannelCloseOkBody.java    |   85 -
 .../org/apache/qpid/framing/ChannelFlowBody.java   |  104 -
 .../org/apache/qpid/framing/ChannelFlowOkBody.java |  106 -
 .../qpid/framing/ChannelMethodProcessor.java       |   44 -
 .../org/apache/qpid/framing/ChannelOpenBody.java   |   95 -
 .../org/apache/qpid/framing/ChannelOpenOkBody.java |  113 -
 .../qpid/framing/ClientChannelMethodProcessor.java |   79 -
 .../qpid/framing/ClientMethodDispatcher.java       |   78 -
 .../apache/qpid/framing/ClientMethodProcessor.java |   39 -
 .../apache/qpid/framing/CompositeAMQDataBlock.java |   92 -
 .../org/apache/qpid/framing/ConfirmSelectBody.java |  105 -
 .../apache/qpid/framing/ConfirmSelectOkBody.java   |   77 -
 .../apache/qpid/framing/ConnectionCloseBody.java   |  145 -
 .../apache/qpid/framing/ConnectionCloseOkBody.java |   81 -
 .../apache/qpid/framing/ConnectionOpenBody.java    |  135 -
 .../apache/qpid/framing/ConnectionOpenOkBody.java  |  108 -
 .../qpid/framing/ConnectionRedirectBody.java       |  120 -
 .../apache/qpid/framing/ConnectionSecureBody.java  |  109 -
 .../qpid/framing/ConnectionSecureOkBody.java       |  107 -
 .../apache/qpid/framing/ConnectionStartBody.java   |  157 -
 .../apache/qpid/framing/ConnectionStartOkBody.java |  146 -
 .../apache/qpid/framing/ConnectionTuneBody.java    |  133 -
 .../apache/qpid/framing/ConnectionTuneOkBody.java  |  133 -
 .../java/org/apache/qpid/framing/ContentBody.java  |  134 -
 .../org/apache/qpid/framing/ContentHeaderBody.java |  212 --
 .../framing/ContentHeaderPropertiesFactory.java    |   61 -
 .../apache/qpid/framing/EncodableAMQDataBlock.java |   35 -
 .../org/apache/qpid/framing/EncodingUtils.java     | 1090 ------
 .../org/apache/qpid/framing/ExchangeBoundBody.java |  138 -
 .../apache/qpid/framing/ExchangeBoundOkBody.java   |  130 -
 .../apache/qpid/framing/ExchangeDeclareBody.java   |  237 --
 .../apache/qpid/framing/ExchangeDeclareOkBody.java |   87 -
 .../apache/qpid/framing/ExchangeDeleteBody.java    |  156 -
 .../apache/qpid/framing/ExchangeDeleteOkBody.java  |   87 -
 .../java/org/apache/qpid/framing/FieldArray.java   |  130 -
 .../java/org/apache/qpid/framing/FieldTable.java   | 1242 -------
 .../org/apache/qpid/framing/FieldTableFactory.java |   38 -
 .../qpid/framing/FrameCreatingMethodProcessor.java |  631 ----
 .../org/apache/qpid/framing/HeartbeatBody.java     |  103 -
 .../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    |  254 --
 .../org/apache/qpid/framing/ProtocolVersion.java   |  203 --
 .../org/apache/qpid/framing/QueueBindBody.java     |  187 -
 .../org/apache/qpid/framing/QueueBindOkBody.java   |   87 -
 .../org/apache/qpid/framing/QueueDeclareBody.java  |  217 --
 .../apache/qpid/framing/QueueDeclareOkBody.java    |  134 -
 .../org/apache/qpid/framing/QueueDeleteBody.java   |  170 -
 .../org/apache/qpid/framing/QueueDeleteOkBody.java |  107 -
 .../org/apache/qpid/framing/QueuePurgeBody.java    |  140 -
 .../org/apache/qpid/framing/QueuePurgeOkBody.java  |  107 -
 .../org/apache/qpid/framing/QueueUnbindBody.java   |  169 -
 .../org/apache/qpid/framing/QueueUnbindOkBody.java |   87 -
 .../qpid/framing/ServerChannelMethodProcessor.java |   93 -
 .../qpid/framing/ServerMethodDispatcher.java       |   73 -
 .../apache/qpid/framing/ServerMethodProcessor.java |   39 -
 .../java/org/apache/qpid/framing/TxCommitBody.java |   80 -
 .../org/apache/qpid/framing/TxCommitOkBody.java    |   78 -
 .../org/apache/qpid/framing/TxRollbackBody.java    |   78 -
 .../org/apache/qpid/framing/TxRollbackOkBody.java  |   79 -
 .../java/org/apache/qpid/framing/TxSelectBody.java |   81 -
 .../org/apache/qpid/framing/TxSelectOkBody.java    |   77 -
 .../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 |  105 -
 .../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    |   33 -
 .../org/apache/qpid/transport/ClientDelegate.java  |  228 --
 .../java/org/apache/qpid/transport/Connection.java |  872 -----
 .../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 |  348 --
 .../java/org/apache/qpid/transport/Method.java     |  232 --
 .../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  |  124 -
 .../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   |  282 --
 .../qpid/transport/network/AggregateTicker.java    |   66 -
 .../apache/qpid/transport/network/Assembler.java   |  287 --
 .../qpid/transport/network/Disassembler.java       |  274 --
 .../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   |  157 -
 .../qpid/transport/network/io/IoReceiver.java      |  268 --
 .../apache/qpid/transport/network/io/IoSender.java |  380 --
 .../qpid/transport/network/security/SSLStatus.java |   49 -
 .../transport/network/security/SecurityLayer.java  |   34 -
 .../network/security/SecurityLayerFactory.java     |  221 --
 .../network/security/sasl/SASLEncryptor.java       |   87 -
 .../network/security/sasl/SASLReceiver.java        |   88 -
 .../network/security/sasl/SASLSender.java          |  118 -
 .../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  |  275 --
 .../transport/network/security/ssl/SSLUtil.java    |  607 ----
 .../org/apache/qpid/transport/util/Functions.java  |  188 -
 .../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  |   96 -
 .../java/org/apache/qpid/url/BindingURLParser.java |  432 ---
 .../main/java/org/apache/qpid/url/URLHelper.java   |  173 -
 .../org/apache/qpid/url/URLSyntaxException.java    |   97 -
 .../org/apache/qpid/util/ByteBufferDataOutput.java |  145 -
 .../apache/qpid/util/ByteBufferInputStream.java    |  100 -
 .../java/org/apache/qpid/util/ByteBufferUtils.java |   71 -
 .../java/org/apache/qpid/util/BytesDataOutput.java |  178 -
 .../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    |  406 ---
 .../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 |  187 -
 .../java/org/apache/qpid/codec/AMQDecoderTest.java |  206 --
 .../qpid/configuration/QpidPropertyTest.java       |  185 -
 .../apache/qpid/framing/AMQShortStringTest.java    |  177 -
 .../framing/BasicContentHeaderPropertiesTest.java  |  194 -
 .../org/apache/qpid/framing/FieldTableTest.java    |  952 -----
 .../abstraction/MessagePublishInfoImplTest.java    |   99 -
 ...ritedAccessControlContextThreadFactoryTest.java |   96 -
 .../org/apache/qpid/ssl/SSLContextFactoryTest.java |  141 -
 .../java/org/apache/qpid/ssl/TrustManagerTest.java |  344 --
 .../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          | 1308 -------
 .../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 -
 debian/changelog                                   |    4 +-
 debian/control                                     |    6 +-
 debian/copyright                                   |    2 +-
 debian/libqpid-broker-java.poms                    |   67 +
 debian/libqpid-java.poms                           |   69 -
 debian/maven.ignoreRules                           |   14 +
 debian/maven.publishedRules                        |    2 -
 debian/maven.rules                                 |   44 +-
 ...ate-expired-certificates-embedded-in-unit.patch | 2352 ------------
 debian/patches/bcel.patch                          |   22 +-
 debian/patches/pom.patch                           |   60 +-
 debian/patches/series                              |    4 +-
 debian/repack.local                                |   20 +
 debian/repack.stub                                 |   92 +
 debian/upstream/signing-key.asc                    |  695 ++++
 debian/watch                                       |    4 +-
 doc/docbook4to5.sh                                 |   21 +-
 doc/java-broker/pom.xml                            |   10 +-
 .../src/docbkx/AMQP-Messaging-Broker-Java-Book.xml |   42 -
 .../src/docbkx/Apache-Qpid-Broker-J-Book.xml       |   44 +
 .../Java-Broker-Appendix-Environment-Variables.xml |    2 +-
 .../docbkx/Java-Broker-Appendix-Miscellaneous.xml  |   47 +-
 ...roker-Appendix-Operational-Logging-Messages.xml |  203 +-
 ...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-Backup-And-Recovery.xml |   31 +-
 .../src/docbkx/Java-Broker-Getting-Started.xml     |   15 +-
 .../src/docbkx/Java-Broker-High-Availability.xml   |   45 +-
 .../docbkx/Java-Broker-Initial-Configuration.xml   |   39 +-
 .../src/docbkx/Java-Broker-Installation.xml        |   27 +-
 .../src/docbkx/Java-Broker-Introduction.xml        |   35 +-
 .../src/docbkx/Java-Broker-Management-Channels.xml |    1 -
 .../Java-Broker-Management-Managing-Entities.xml   |    1 -
 doc/java-broker/src/docbkx/Java-Broker-Runtime.xml |    1 +
 .../src/docbkx/Java-Broker-Security.xml            |    2 +-
 .../concepts/Java-Broker-Concepts-Exchanges.xml    |   14 +-
 .../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    |   77 +-
 ...va-Broker-Management-Channel-REST-Query-API.xml |  285 ++
 .../Java-Broker-Management-Channel-Web-Console.xml |    2 +-
 ...anagement-Managing-Access-Control-Providers.xml |    2 +-
 ...anagement-Managing-Authentication-Providers.xml |    5 +-
 .../Java-Broker-Management-Managing-Broker.xml     |    9 +-
 ...-Broker-Management-Managing-Entities-Matrix.xml |  128 -
 .../Java-Broker-Management-Managing-Exchanges.xml  |   21 +-
 .../Java-Broker-Management-Managing-Keystores.xml  |    4 +-
 ...ava-Broker-Management-Managing-Plugins-HTTP.xml |   12 +
 .../Java-Broker-Management-Managing-Ports.xml      |    6 +
 .../Java-Broker-Management-Managing-Queues.xml     |   31 +-
 ...Java-Broker-Management-Managing-Truststores.xml |   38 +-
 ...Broker-Management-Managing-VirtualhostNodes.xml |    9 +-
 ...ava-Broker-Management-Managing-Virtualhosts.xml |    4 +-
 .../Java-Broker-Runtime-Close-On-No-Route.xml      |   36 +-
 .../runtime/Java-Broker-Runtime-Consumers.xml      |   91 +
 ...Disk-Space-Management-Producer-Flow-Control.xml |  210 +-
 .../runtime/Java-Broker-Runtime-Flow-To-Disk.xml   |   13 +-
 ...ker-Runtime-Handling-Undeliverable-Messages.xml |   54 +-
 .../runtime/Java-Broker-Runtime-Log-Files.xml      |    2 +-
 .../docbkx/runtime/Java-Broker-Runtime-Memory.xml  |   62 +-
 .../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 +-
 ...oker-Security-Authentication-Providers-LDAP.xml |   27 +-
 ...er-Security-Authentication-Providers-OAuth2.xml |   46 +
 ...va-Broker-Security-Authentication-Providers.xml |    5 +-
 .../Java-Broker-Security-Group-Providers.xml       |   19 +-
 doc/java-perftests/pom.xml                         |    6 +-
 .../src/docbkx/JMS-Performance-Test-Framework.xml  |    2 +-
 doc/jms-client-0-10/pom.xml                        |   72 -
 .../src/docbkx/JMS-Client-0-10-Book.xml            | 2372 ------------
 doc/jms-client-0-8/pom.xml                         |   72 -
 .../src/docbkx/JMS-Client-Appendix-Exceptions.xml  |  171 -
 .../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          |  245 --
 doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml  |   47 -
 .../src/docbkx/JMS-Client-Connection-URL.xml       |  366 --
 ...Client-Document-Scope-And-Intended-Audience.xml |   55 -
 .../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-System-Properties.xml    |  616 ----
 .../src/docbkx/JMS-Client-Understanding.xml        |  512 ---
 .../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 +-
 etc/IntelliJ_Copyright_ApacheLicense.xml           |   28 +
 etc/IntelliJ_Qpid_Style.xml                        |   39 +-
 jca/README-GERONIMO.txt                            |   47 -
 jca/README-JBOSS-EAP6.txt                          |  201 -
 jca/README-JBOSS.txt                               |  184 -
 jca/README.txt                                     |  248 --
 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                                        |  129 -
 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                                 |   41 +-
 .../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 +
 management/common/pom.xml                          |   45 -
 .../common/src/main/java/management-common.bnd     |   27 -
 .../management/common/JMXConnnectionFactory.java   |  289 --
 .../common/mbeans/LoggingManagement.java           |  163 -
 .../management/common/mbeans/ManagedBroker.java    |  266 --
 .../common/mbeans/ManagedConnection.java           |  249 --
 .../management/common/mbeans/ManagedExchange.java  |  149 -
 .../management/common/mbeans/ManagedQueue.java     |  535 ---
 .../common/mbeans/ServerInformation.java           |  202 --
 .../management/common/mbeans/UserManagement.java   |  129 -
 .../common/mbeans/annotations/MBeanAttribute.java  |   41 -
 .../mbeans/annotations/MBeanConstructor.java       |   39 -
 .../mbeans/annotations/MBeanDescription.java       |   38 -
 .../common/mbeans/annotations/MBeanOperation.java  |   42 -
 .../annotations/MBeanOperationParameter.java       |   37 -
 .../sasl/CRAMMD5HashedSaslClientFactory.java       |   59 -
 .../management/common/sasl/ClientSaslFactory.java  |   53 -
 .../qpid/management/common/sasl/Constants.java     |   33 -
 .../qpid/management/common/sasl/JCAProvider.java   |   55 -
 .../management/common/sasl/PlainSaslClient.java    |  212 --
 .../qpid/management/common/sasl/SaslProvider.java  |   35 -
 .../common/sasl/UserPasswordCallbackHandler.java   |   79 -
 .../UsernameHashedPasswordCallbackHandler.java     |  109 -
 .../management/common/mbeans/ManagedQueueTest.java |   78 -
 management/example/pom.xml                         |   53 -
 .../apache/qpid/example/jmxexample/AddQueue.java   |  152 -
 .../jmxexample/DeleteMessagesFromTopOfTmp.java     |  119 -
 .../qpid/example/jmxexample/QueueInformation.java  |  370 --
 .../combined_competing_consumers_plain.chartdef    |   48 +
 .../combined_persistent_transaction.chartdef       |   47 -
 .../combined_persistent_transaction_plain.chartdef |   48 +
 .../combined_persistent_transaction_ssl.chartdef   |   48 +
 .../timeseries/combined_transient_autoack.chartdef |   47 -
 .../combined_transient_autoack_plain.chartdef      |   48 +
 .../combined_transient_autoack_ssl.chartdef        |   48 +
 .../combined_transient_transaction_plain.chartdef  |   48 +
 .../combined_transient_transaction_ssl.chartdef    |   48 +
 perftests/etc/json_config_tool.py                  |    4 +-
 perftests/etc/perftests-jndi.properties            |   29 -
 perftests/etc/testdefs/defaultTests.js             |  207 +-
 perftests/pom.xml                                  |  340 +-
 perftests/src/main/assembly/NOTICE                 |   29 +-
 .../dependency-verification/DEPENDENCIES_REFERENCE |   27 +-
 perftests/src/main/assembly/qpid-perftests-bin.xml |   10 +-
 perftests/src/main/java/json2.js                   |  529 +--
 .../org/apache/qpid/disttest/AbstractRunner.java   |    7 +-
 .../org/apache/qpid/disttest/ControllerRunner.java |   15 +-
 .../qpid/disttest/DistributedTestConstants.java    |    5 -
 .../qpid/disttest/client/ConsumerParticipant.java  |    7 +-
 .../client/property/ListPropertyValue.java         |    2 +-
 .../property/NumericGeneratedPropertySupport.java  |    2 +-
 .../client/property/RangePropertyValue.java        |    2 +-
 .../qpid/disttest/controller/Controller.java       |    9 +-
 .../qpid/disttest/controller/HillClimber.java      |  172 +-
 .../controller/HillClimbingTestRunner.java         |    8 +-
 .../disttest/controller/config/SessionConfig.java  |    2 -
 .../apache/qpid/disttest/db/ResultsDbWriter.java   |   12 +-
 .../qpid/disttest/jms/ClientJmsDelegate.java       |   75 +-
 .../qpid/disttest/jms/ControllerJmsDelegate.java   |   61 +-
 .../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 |  338 ++
 .../org/apache/qpid/disttest/jms/QueueCreator.java |    3 +
 .../disttest/results/CompositeResultsWriter.java   |    2 +-
 .../qpid/disttest/results/ResultsCsvWriter.java    |    1 -
 .../disttest/results/formatting/CSVFormatter.java  |    2 +-
 perftests/src/main/java/test-utils.js              |   36 +-
 .../apache/qpid/disttest/ArgumentParserTest.java   |    2 +-
 .../apache/qpid/disttest/ConfigFileHelperTest.java |    1 +
 .../disttest/client/ParticipantExecutorTest.java   |    2 -
 .../disttest/controller/ClientRegistryTest.java    |   16 +-
 .../qpid/disttest/controller/ControllerTest.java   |    8 +-
 .../qpid/disttest/controller/HillClimberTest.java  |   95 +
 .../controller/OrdinaryTestRunnerTest.java         |    2 -
 .../config/ConfigReaderTest-test-config.js         |   45 +-
 .../controller/config/ConfigReaderTest.java        |    1 +
 .../JavaScriptConfigEvaluatorTest-test-config.js   |   29 +-
 .../qpid/disttest/db/ResultsDbWriterTest.java      |    4 +-
 .../disttest/results/ResultsCsvWriterTest.java     |   19 +-
 .../disttest/results/ResultsXmlWriterTest.java     |   20 +-
 .../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 +-
 .../visualisation-jfc/src/main/assembly/NOTICE     |    2 +-
 .../qpid-perftests-visualisation-jfc-bin.xml       |    2 +-
 .../charting/chartbuilder/BaseChartBuilder.java    |   19 +
 .../chartbuilder/XYDataSetBasedChartBuilder.java   |    1 -
 .../charting/definition/ChartingDefinition.java    |   19 +-
 .../definition/ChartingDefinitionCreator.java      |   12 +-
 .../definition/SeriesDefinitionCreator.java        |    2 +-
 .../charting/chartbuilder/ChartProductionTest.java |   13 +-
 .../disttest/charting/writer/ChartWriterTest.java  |    5 +-
 .../src/test/resources/logback-test.xml            |   34 +
 pom.xml                                            |  716 +++-
 qpid-perftests-systests/pom.xml                    |   55 +-
 .../disttest/DistributedTestSystemTestBase.java    |   67 -
 .../systest/disttest/QpidQueueCreatorTest.java     |  100 -
 .../systest/disttest/endtoend/EndToEndTest.java    |   74 +-
 .../qpid/systest/disttest/endtoend/error.json      |    2 +-
 .../qpid/systest/disttest/endtoend/hillclimbing.js |   95 +-
 .../qpid/systest/disttest/endtoend/iterations.json |    6 +-
 .../disttest/endtoend/manyparticipants.json        |   12 +-
 .../systest/disttest/perftests.systests.properties |    2 +-
 qpid-systests-parent/pom.xml                       |   36 +-
 qpid-test-utils/pom.xml                            |    9 +-
 .../utils/LogbackPropertyValueDiscriminator.java   |   65 +
 .../org/apache/qpid/test/utils/PortHelper.java     |   15 +-
 .../org/apache/qpid/test/utils/QpidTestCase.java   |  110 +-
 .../org/apache/qpid/test/utils/TCPTunneler.java    |  104 +-
 .../org/apache/qpid/test/utils/TestFileUtils.java  |    6 +-
 .../apache/qpid/test/utils/TestSSLConstants.java   |    8 +-
 qpid-test-utils/src/main/resources/logback.xml     |    2 +-
 specs/LICENSE                                      |  202 --
 specs/NOTICE                                       |    7 -
 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                  |   19 +-
 systests/pom.xml                                   |  106 +-
 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 |   77 +-
 .../apache/qpid/systest/rest/QpidRestTestCase.java |   42 +-
 .../apache/qpid/systest/rest/RestTestHelper.java   |  243 +-
 .../qpid/test/utils/AbstractBrokerHolder.java      |  261 ++
 .../qpid/test/utils/AmqpManagementFacade.java      |  352 ++
 .../qpid/test/utils/BrokerCommandHelper.java       |    3 +-
 .../org/apache/qpid/test/utils/BrokerHolder.java   |   16 +-
 .../apache/qpid/test/utils/ConnectionBuilder.java  |   43 +
 .../qpid/test/utils/InternalBrokerHolder.java      |  168 +-
 .../org/apache/qpid/test/utils/JMXTestUtils.java   |  452 ---
 .../org/apache/qpid/test/utils/JmsProvider.java    |   96 +
 .../java/org/apache/qpid/test/utils/Piper.java     |    1 +
 .../apache/qpid/test/utils/QpidBrokerTestCase.java | 1445 +++-----
 .../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       |  206 +-
 .../qpid/test/utils/TestBrokerConfiguration.java   |  323 +-
 systests/src/main/resources/logback-test.xml       |    6 +-
 .../qpid/client/AMQQueueDeferredOrderingTest.java  |  145 -
 .../qpid/client/AsynchMessageListenerTest.java     |    6 +-
 .../java/org/apache/qpid/client/HeartbeatTest.java |   37 +-
 .../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 |   72 +
 .../client/failover/FailoverBehaviourTest.java     |  272 +-
 .../failover/MultipleBrokersFailoverTest.java      |   94 +-
 .../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   |  313 +-
 .../org/apache/qpid/jms/xa/XAResourceTest.java     |  154 -
 .../org/apache/qpid/ra/QpidRAConnectionTest.java   |   90 -
 .../org/apache/qpid/ra/QpidRAXAResourceTest.java   |   55 -
 .../ra/admin/QpidConnectionFactoryProxyTest.java   |  113 -
 .../qpid/server/AbruptClientDisconnectTest.java    |   46 +-
 .../org/apache/qpid/server/BrokerStartupTest.java  |   72 +-
 .../qpid/server/SupportedProtocolVersionsTest.java |   17 +-
 .../ReturnUnroutableMandatoryMessageTest.java      |   44 +-
 .../qpid/server/failover/FailoverMethodTest.java   |   28 +-
 .../qpid/server/logging/AbstractTestLogging.java   |    8 +-
 .../server/logging/AccessControlLoggingTest.java   |   96 +-
 .../apache/qpid/server/logging/AlertingTest.java   |   59 +-
 .../qpid/server/logging/BindingLoggingTest.java    |  227 --
 .../qpid/server/logging/BrokerLoggingTest.java     |  101 +-
 .../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      |  113 +-
 .../server/logging/TransientQueueLoggingTest.java  |    1 +
 .../server/logging/VirtualHostLoggingTest.java     |    7 +-
 .../persistent/NoLocalAfterRecoveryTest.java       |   14 +-
 .../qpid/server/queue/ArrivalTimeFilterTest.java   |    3 +-
 .../qpid/server/queue/ConsumerPriorityTest.java    |  183 +
 .../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      |  158 +-
 .../qpid/server/queue/LiveQueueOperationsTest.java |   70 +-
 .../qpid/server/queue/MessageGroupQueueTest.java   |  525 +--
 .../org/apache/qpid/server/queue/ModelTest.java    |  252 +-
 .../queue/MultipleTransactedBatchProducerTest.java |   50 +-
 .../server/queue/NodeAutoCreationPolicyTest.java   |  441 +++
 .../qpid/server/queue/PriorityQueueTest.java       |   66 +-
 .../qpid/server/queue/ProducerFlowControlTest.java |  571 +--
 .../apache/qpid/server/queue/QueueBindTest.java    |    1 +
 .../server/queue/QueueDepthWithSelectorTest.java   |   33 +-
 .../server/queue/QueueMessageDurabilityTest.java   |  188 +-
 .../apache/qpid/server/queue/SortedQueueTest.java  |   84 +-
 .../apache/qpid/server/queue/TimeToLiveTest.java   |   81 +-
 .../routing/AlternateBindingRoutingTest.java       |   88 +
 .../qpid/server/routing/ExchangeRoutingTest.java   |  187 +
 .../server/security/acl/AbstractACLTestCase.java   |  168 +-
 .../security/acl/Amqp0xMessagingACLTest.java       |   56 +
 .../server/security/acl/ExhaustiveACLTest.java     |  216 --
 .../server/security/acl/ExternalACLJMXTest.java    |  320 --
 .../qpid/server/security/acl/ExternalACLTest.java  |  488 ---
 .../qpid/server/security/acl/MessagingACLTest.java |  678 ++++
 .../manager/AbstractAuthenticationManagerTest.java |  102 +
 .../auth/manager/ExternalAuthenticationTest.java   |  298 +-
 .../auth/manager/MD5AuthenticationManagerTest.java |   45 +
 .../MultipleAuthenticationManagersTest.java        |   12 +-
 .../ScramSha1AuthenticationManagerTest.java        |   44 +
 .../ScramSha256AuthenticationManagerTest.java      |   45 +
 .../qpid/server/stats/StatisticsReportingTest.java |  215 +-
 .../qpid/server/store/PersistentStoreTest.java     |   48 +-
 .../apache/qpid/server/store/SplitStoreTest.java   |   15 +-
 .../server/store/VirtualHostMessageStoreTest.java  |  833 -----
 .../apache/qpid/systest/AnonymousProducerTest.java |  116 +
 .../qpid/systest/MessageCompressionTest.java       |  335 +-
 .../apache/qpid/systest/MessageRoutingTest.java    |  186 +
 .../management/amqp/AmqpManagementTest.java        |  874 +++++
 .../management/jmx/BrokerManagementTest.java       |  118 -
 .../management/jmx/ConnectionManagementTest.java   |  320 --
 .../management/jmx/ExchangeManagementTest.java     |  164 -
 .../systest/management/jmx/MBeanLifeCycleTest.java |  133 -
 .../management/jmx/ManagementActorLoggingTest.java |  482 ---
 .../management/jmx/ManagementLoggingTest.java      |  283 --
 .../management/jmx/QueueManagementTest.java        |  867 -----
 .../systest/management/jmx/StatisticsTest.java     |  215 --
 .../systest/management/jmx/UserManagementTest.java |  245 --
 .../UserManagementWithBase64MD5PasswordsTest.java  |   62 -
 .../messageencryption/MessageEncryptionTest.java   |  105 +-
 .../qpid/systest/prefetch/ZeroPrefetchTest.java    |   16 +-
 .../rest/AccessControlProviderRestTest.java        |   61 +-
 .../qpid/systest/rest/AnonymousAccessRestTest.java |   26 +-
 .../rest/AuthenticationProviderRestTest.java       |  151 +-
 .../qpid/systest/rest/BasicAuthRestTest.java       |  122 -
 .../apache/qpid/systest/rest/BindingRestTest.java  |  133 -
 .../systest/rest/BrokerRestHttpAndHttpsTest.java   |  101 +-
 .../rest/BrokerRestHttpsClientCertAuthTest.java    |   29 +-
 .../qpid/systest/rest/BrokerRestHttpsTest.java     |   16 +-
 .../apache/qpid/systest/rest/BrokerRestTest.java   |  124 +-
 .../systest/rest/CompressedResponsesRestTest.java  |   23 +-
 .../qpid/systest/rest/ConnectionRestTest.java      |  297 +-
 .../apache/qpid/systest/rest/ExchangeRestTest.java |   37 +-
 .../systest/rest/ExportImportMessagesRestTest.java |  177 +
 .../qpid/systest/rest/GroupProviderRestTest.java   |   41 +-
 .../apache/qpid/systest/rest/GroupRestTest.java    |   28 +-
 .../qpid/systest/rest/HttpManagementRestTest.java  |   14 +-
 .../apache/qpid/systest/rest/KeyStoreRestTest.java |   28 +-
 .../apache/qpid/systest/rest/MessagesRestTest.java |  322 +-
 .../org/apache/qpid/systest/rest/PortRestTest.java |  193 +-
 .../qpid/systest/rest/PreemtiveAuthRestTest.java   |  207 ++
 .../systest/rest/PreferencesProviderRestTest.java  |  200 -
 .../qpid/systest/rest/PreferencesRestTest.java     |  114 -
 .../qpid/systest/rest/PublishMessageRestTest.java  |  236 ++
 .../apache/qpid/systest/rest/QueryRestTest.java    |   48 +
 .../apache/qpid/systest/rest/QueueRestTest.java    |  218 +-
 .../org/apache/qpid/systest/rest/SaslRestTest.java |   61 +-
 .../apache/qpid/systest/rest/SessionRestTest.java  |  159 +
 .../qpid/systest/rest/StructureRestTest.java       |   21 -
 .../qpid/systest/rest/TrustStoreRestTest.java      |   39 +-
 .../qpid/systest/rest/UserPreferencesRestTest.java |  553 ++-
 .../org/apache/qpid/systest/rest/UserRestTest.java |   37 +-
 .../systest/rest/VirtualHostLoggerRestTest.java    |    6 +-
 .../qpid/systest/rest/VirtualHostNodeRestTest.java |   41 +-
 .../qpid/systest/rest/VirtualHostRestTest.java     |  343 +-
 .../qpid/systest/rest/acl/BrokerACLTest.java       |  151 +-
 .../qpid/systest/rest/acl/ExchangeRestACLTest.java |  159 +-
 .../qpid/systest/rest/acl/GroupRestACLTest.java    |   41 +-
 .../qpid/systest/rest/acl/QueueRestACLTest.java    |   91 +-
 .../rest/acl/UserPreferencesRestACLTest.java       |  197 -
 .../qpid/systest/rest/acl/UserRestACLTest.java     |   29 +-
 .../qpid/systest/rest/acl/VirtualHostACLTest.java  |   35 +-
 .../VirtualHostAccessControlProviderRestTest.java  |  287 ++
 .../systest/rest/acl/VirtualHostNodeACLTest.java   |   14 +-
 .../CloseOnNoRouteForMandatoryMessageTest.java     |  111 +-
 .../qpid/test/client/ConsumerFlowControlTest.java  |  199 +
 .../org/apache/qpid/test/client/DupsOkTest.java    |   36 +-
 .../apache/qpid/test/client/FlowControlTest.java   |  221 --
 .../ImmediateAndMandatoryPublishingTest.java       |   31 +-
 .../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    |   80 +-
 .../destination/AddressBasedDestinationTest.java   |   81 +-
 .../qpid/test/client/failover/FailoverTest.java    |  170 +-
 .../test/client/message/JMSDestinationTest.java    |  107 +-
 .../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  |   26 +-
 .../org/apache/qpid/test/unit/ack/RecoverTest.java |  159 +-
 .../qpid/test/unit/basic/BytesMessageTest.java     |  122 +-
 .../test/unit/basic/FieldTableMessageTest.java     |   94 +-
 .../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    |   83 +-
 .../test/unit/basic/PubSubTwoConnectionTest.java   |   27 +-
 .../qpid/test/unit/basic/SessionStartTest.java     |   91 +-
 .../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     |  198 +-
 .../test/unit/client/MaxDeliveryCountTest.java     |  273 +-
 .../test/unit/client/QueueSessionFactoryTest.java  |    5 +-
 .../test/unit/client/TopicSessionFactoryTest.java  |    3 -
 .../channelclose/CloseWithBlockingReceiveTest.java |    3 +-
 .../BrokerClosesClientConnectionTest.java          |  152 +-
 .../client/connection/ConnectionFactoryTest.java   |    4 +-
 .../client/connection/ConnectionStartTest.java     |   69 +-
 .../unit/client/connection/ConnectionTest.java     |   61 +-
 .../client/connection/ExceptionListenerTest.java   |   24 +-
 .../unit/client/message/ObjectMessageTest.java     |   83 +-
 .../client/temporaryqueue/TemporaryQueueTest.java  |  149 +-
 .../test/unit/close/MessageConsumerCloseTest.java  |   22 +-
 .../test/unit/close/TopicPublisherCloseTest.java   |   13 +-
 .../qpid/test/unit/ct/DurableSubscriberTest.java   |  189 +-
 .../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   |  316 +-
 .../qpid/test/unit/topic/TemporaryTopicTest.java   |   27 +-
 .../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   |  288 +-
 .../qpid/test/unit/transacted/TransactedTest.java  |  175 +-
 .../transacted/TransactionTimeoutDisabledTest.java |    5 +-
 .../unit/transacted/TransactionTimeoutTest.java    |   24 +-
 .../transacted/TransactionTimeoutTestCase.java     |   60 +-
 .../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    | 1742 ---------
 .../qpid/test/utils/BrokerCommandHelperTest.java   |    7 +-
 .../apache/qpid/test/utils/FailoverBaseCase.java   |  133 +-
 .../qpid/test/utils/SpawnedBrokerHolderTest.java   |   38 +
 .../transport/ConnectionEstablishmentTest.java     |  323 ++
 .../apache/qpid/transport/MaxFrameSizeTest.java    |   78 +-
 .../qpid/transport/ProtocolNegotiationTest.java    |  277 +-
 .../java/org/apache/qpid/transport/TestSender.java |   90 +
 .../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                                        |  690 ++++
 .../apache/qpid/tck/ManageQpidJMSResources.java    |  264 ++
 tck/src/test/resources/jms-client/jndi.properties  |   40 +
 .../test/resources/qpid-jms-client/jndi.properties |   41 +
 .../resources/qpid-jms20-client/jndi.properties    |   47 +
 tck/src/test/resources/resources.json              |   93 +
 tck/src/test/resources/ts.jte                      |   44 +
 test-profiles/CPPExcludes                          |  108 +-
 test-profiles/CPPNoPrefetchExcludes                |    1 -
 test-profiles/CPPPrefetchExcludes                  |    1 -
 test-profiles/CPPTransientExcludes                 |    5 -
 test-profiles/ExternalBrokerTests                  |    1 -
 test-profiles/IBMJDKExcludes                       |   10 +
 test-profiles/Java010Excludes                      |   34 +-
 test-profiles/Java10BrokenTestsExcludes            |   64 +
 test-profiles/Java10Excludes                       |  221 ++
 test-profiles/Java10UninvestigatedTestsExcludes    |   28 +
 test-profiles/JavaDerbyExcludes                    |    1 +
 test-profiles/JavaExcludes                         |   12 +-
 test-profiles/JavaPre010Excludes                   |   45 +-
 test-profiles/JavaTransientExcludes                |   21 +-
 test-profiles/XAExcludes                           |   22 -
 test-profiles/apache-ci.test.overridden.properties |   53 +
 test-profiles/cpp.async.excludes                   |    2 -
 test-profiles/cpp.excludes                         |    2 +-
 test-profiles/python_tests/Java010PythonExcludes   |   25 +-
 test-profiles/python_tests/Java10PythonExcludes    |   37 +
 .../python_tests/JavaPre010PythonExcludes          |    9 +-
 test-profiles/test-provider-1-0.properties         |   39 +
 test-profiles/test-provider.properties             |   20 +-
 test-profiles/test_resources/ssl/expired.crt       |   17 +
 .../test_resources/ssl/generate-java-keystores.sh  |    6 +-
 .../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 -
 .../org/apache/qpid/tools/JMXStressTestClient.java |  329 --
 .../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    |  148 +-
 .../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 -
 4215 files changed, 286073 insertions(+), 318914 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 README.md
 delete mode 100644 README.txt
 create mode 100644 apache-qpid-broker-j/pom.xml
 rename {broker => apache-qpid-broker-j}/src/main/assembly/LICENSE (100%)
 create mode 100644 apache-qpid-broker-j/src/main/assembly/NOTICE
 rename {broker => apache-qpid-broker-j}/src/main/assembly/README.txt (100%)
 create mode 100644 apache-qpid-broker-j/src/main/assembly/bin.xml
 create mode 100644 apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
 create mode 100644 apache-qpid-broker-j/src/main/assembly/src.xml
 delete mode 100755 bdbstore/bin/backup.sh
 delete mode 100644 bdbstore/jmx/pom.xml
 delete mode 100644 bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
 delete mode 100644 bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java
 delete mode 100644 bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/ManagedBDBHAMessageStore.java
 delete mode 100644 bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
 delete mode 100644 bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
 create mode 100644 bdbstore/src/main/java/org/apache/qpid/server/JECheck.java
 create mode 100644 bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBPreferenceStore.java
 create mode 100644 bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStore.java
 create mode 100644 bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreFactoryService.java
 create mode 100644 bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/MapBinding.java
 create mode 100644 bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom8To9.java
 create mode 100644 bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha_replica/show.js
 create mode 100644 bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBPreferenceStoreTest.java
 delete mode 100644 bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/NoopConfigurationChangeListener.java
 create mode 100644 bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom8To9Test.java
 create mode 100644 bdbstore/src/test/resources/upgrade/bdbstore-v8/test-store/00000000.jdb
 create mode 100644 bdbstore/src/test/resources/upgrade/bdbstore-v9-amqp10v0/test-store/00000000.jdb
 create mode 100644 bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBAMQP10V0UpgradeTest.java
 delete mode 100644 bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
 create mode 100644 broker-codegen/src/main/java/org/apache/qpid/server/protocol/v1_0/CompositeType.java
 create mode 100644 broker-codegen/src/main/java/org/apache/qpid/server/protocol/v1_0/CompositeTypeConstructorGenerator.java
 create mode 100644 broker-codegen/src/main/java/org/apache/qpid/server/protocol/v1_0/CompositeTypeField.java
 create mode 100644 broker-core/src/main/grammar/SelectorParser.jj
 delete mode 100755 broker-core/src/main/java/broker.bnd
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/AMQException.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/Broker.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/BrokerPrincipal.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/QpidException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/SystemLauncherListener.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/BufferPool.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/ByteBufferRef.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/MultiQpidByteBuffer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/NonPooledByteBufferRef.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/PooledByteBufferRef.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBuffer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferInputStream.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStream.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/bytebuffer/SingleQpidByteBuffer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/common/ServerPropertyNames.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/configuration/CommonProperties.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/connection/AmqpConnectionMetaData.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/connection/StandardConnectionPropertyEnricher.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/connection/SuppliedMapConnectionPropertyEnricher.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerMessageInstancePair.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/consumer/ConsumerOption.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/consumer/ScheduledConsumerTargetSet.java
 create mode 100755 broker-core/src/main/java/org/apache/qpid/server/exchange/DestinationReferrer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchangeImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeDefaults.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeImpl.java
 delete mode 100755 broker-core/src/main/java/org/apache/qpid/server/exchange/ExchangeReferrer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/exchange/FilterManagerReplacementRoutingKeyTuple.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchangeImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/AMQPFilterTypes.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/Expression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/FilterableMessage.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/JMSMessagePropertyExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/OrderByExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/PropertyExpressionFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/SelectorParsingException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/selector/ParseException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParser.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParserConstants.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/selector/SelectorParserTokenManager.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/selector/SimpleCharStream.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/selector/Token.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/filter/selector/TokenMgrError.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/AbstractBrokerLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/AbstractNameAndLevelLogInclusionRule.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/AbstractVirtualHostLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerLogbackSocketLoggerImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRule.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/BrokerSyslogLoggerImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/CompositeFilter.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/EffectiveLevelFilter.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/FileLoggerSettings.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/LogRecord.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/LogRecorder.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilter.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/OperationLogMessage.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/PrincipalLogEventFilter.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/QpidLoggerTurboFilter.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/RecordEventAppender.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/StartupAppender.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilter.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRule.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLogger.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostSyslogLoggerImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/MessageContainer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/MessageInstanceConsumer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/MessageSender.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/MessageSourceConsumer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/RejectType.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/RoutingResult.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/ByteArrayToOctetStream.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/ConversionUtils.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/IdentityConverter.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/MimeContentConverterRegistry.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/MimeContentToObjectConverter.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/ObjectToMimeContentConverter.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/SerializableToJavaObjectStream.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/StringToTextPlain.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/TextPlainToString.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/message/mimecontentconverter/TextXmlToString.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfigurationChangeListener.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/AbstractContainer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/AccessControlSource.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/AlternateBinding.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/BrokerContainerType.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/CommonAccessControlProvider.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ConfigurationExtractor.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ConfigurationSecretEncrypterSource.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectCustomSerialization.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/Container.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ContainerStoreUpgraderAndRecoverer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ContainerType.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ContextProvider.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/DestinationAddress.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/DoOnConfigThread.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/DynamicModel.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/Initialization.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ManageableMessage.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ManagedAttributeValueTypeDerivedMethod.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ManagedContextDependency.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/MemorySystemConfig.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/ModelVersion.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/Named.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/NamedAddressSpace.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/NoopConfigurationChangeListener.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/NotFoundException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/OperationTimeoutException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/OverflowPolicy.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/PermissionedObject.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/Publisher.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/PublishingLink.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/SystemAddressSpaceAlias.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/SystemConfigBootstrapModel.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/SystemPrincipalSource.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/TaskExecutorProvider.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostAccessControlProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractClientAuthCapablePortWithAuthProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPortWithAuthProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/port/ClientAuthCapablePort.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/port/PortWithAuthProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPortImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/GenericPreferenceValue.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/GenericPreferenceValueFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/GenericPrincipal.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/Preference.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/PreferenceFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/PreferenceImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/PreferenceValue.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/PreferenceValueFactoryService.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferences.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/model/preferences/UserPreferencesImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/plugin/ConnectionPropertyEnricher.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/plugin/JDBCConnectionProviderFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/plugin/MessageFormat.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/plugin/SystemAddressSpaceCreator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/properties/ConnectionStartProperties.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/CapacityChecker.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/ConsumerListener.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/ErrorCodes.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/LinkRegistry.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/MessageFormatRegistry.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/ProtocolVersion.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/PublishAuthorisationCache.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/converter/MessageConversionException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQFrameDecodingException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPInvalidClassException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQType.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypeMap.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQTypedValue.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/EncodingUtils.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldArray.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTable.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/FieldTableFactory.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueueEntryList.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/CreatingLinkInfo.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/CreatingLinkInfoImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandler.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/MessageContentJsonConverter.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/MessageGroupType.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/MessageUnacceptableException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/NoneOverflowPolicyHandler.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/OverflowPolicyHandler.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/OverflowPolicyMaximumQueueDepthChangeListener.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandler.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerList.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManager.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNode.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNodeIterator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNodeList.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerNodeListEntry.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryListBase.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueSizeLimitRespectingTransaction.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/QueueStatistics.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/RejectPolicyHandler.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/queue/RingOverflowPolicyHandler.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProvider.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetailsImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/CompoundAccessControl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/CompoundSecurityToken.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/MutableCertificateTrustStore.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/QpidPrincipal.java
 delete mode 100755 broker-core/src/main/java/org/apache/qpid/server/security/SecurityManager.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/SecurityToken.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/SubjectFixedResultAccessControl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/TrustAnchorValidatingTrustManager.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/access/FileAccessControlProviderConstants.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/access/OperationType.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/access/Permission.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/SocketConnectionMetaData.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXConnectionPrincipal.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacher.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/CachingAuthenticationProvider.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2SaslServer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/keycloak/KeycloakOAuth2IdentityResolverService.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/AbstractSaslServerNegotiator.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/AuthenticationProviderInitialiser.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/PasswordSource.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/SaslNegotiator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/SaslSettings.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousNegotiator.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServer.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousSaslServerFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/AbstractCramMd5Negotiator.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedInitialiser.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedSaslServer.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HashedServerFactory.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexSaslServer.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexServerFactory.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5Initialiser.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HashedNegotiator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Base64HexNegotiator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5HashedNegotiator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5HexNegotiator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5Negotiator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiator.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/kerberos/KerberosNegotiator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2Negotiator.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainAdapterSaslServer.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainInitialiser.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiator.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainPasswordCallback.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServer.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiator.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/security/group/GroupManager.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/session/AMQPSession.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/stats/FormattingStatisticsResolver.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsCounter.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTask.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecoverer.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/AbstractJsonFileStore.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/NullUpgrader.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/ResolvedObject.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/Xid.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStore.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreFactoryService.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/NoopPreferenceStoreFactoryService.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceRecord.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceRecordImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStore.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreAttributes.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreAttributesImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreFactoryService.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreProvider.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreUpdater.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreUpdaterImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferencesRecoverer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferencesRoot.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/ProvidedPreferenceStoreFactoryService.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/preferences/UserPreferencesCreator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/MessageStoreSerializer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/MessageStoreSerializerFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/DTXRecord.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Deserializer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageInstanceRecord.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageRecord.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/MessageStoreSerializer_v1.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/QueueMappingRecord.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Record.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/RecordType.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/Serializer.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/store/serializer/v1/VersionRecord.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/streams/CompositeInputStream.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/AggregateTicker.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/ByteBufferSender.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/TransactionTimeoutTicker.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/TransportException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/network/NetworkConnection.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/network/Ticker.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/network/TransportActivity.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/network/TransportEncryption.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidClientX509KeyManager.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidMultipleTrustManager.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/QpidPeersOnlyTrustManager.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtil.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/transport/util/Functions.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/txn/DtxNotSupportedException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/txn/FlowToDiskTransactionObserver.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/txn/TransactionObserver.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/txn/Xid.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesCodes.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentReader.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesContentWriter.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/typedmessage/TypedBytesFormatException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/typedmessage/mimecontentconverter/JmsMapMessageToMap.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/typedmessage/mimecontentconverter/JmsStreamMessageToList.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/typedmessage/mimecontentconverter/ListToJmsStreamMessage.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/typedmessage/mimecontentconverter/MapToJmsMapMessage.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/ByteBufferInputStream.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/CachingUUIDFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/CipherSuiteAndProtocolRestrictingSSLSocketFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/CommandLineParser.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/DataUrlUtils.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/DeleteDeleteTask.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/ExternalServiceException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/ExternalServiceTimeoutException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/FileUtils.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/FixedKeyMapCreator.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/FutureHelper.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/GZIPUtils.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/NameUUIDGen.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/RandomUUIDGen.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/Serial.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/Strings.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/SystemUtils.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/UUIDGen.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/UUIDs.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/classpath/Handler.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractNonConnectionAcceptingVirtualHost.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/ConnectionEstablishmentPolicy.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeExistsException.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/ExchangeIsAlternateException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/LinkRegistryFactory.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/LinkRegistryModel.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/ManagedVirtualHost.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/MessageDestinationIsAlternateException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/NodeAutoCreationPolicy.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/NoopConnectionEstablishmentPolicy.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueExistsException.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
 delete mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConnectionListener.java
 delete mode 100755 broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
 create mode 100644 broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/SystemAddressSpaceAliasImpl.java
 rename common/src/main/resources/qpidversion.properties => broker-core/src/main/resources/qpidbrokerversion.properties (100%)
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/BrokerTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/QpidExceptionTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/SystemLauncherTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/binding/BindingImplTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferOutputStreamTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/bytebuffer/QpidByteBufferTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PreferencesProviderCreationTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/consumer/AbstractConsumerTargetTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/consumer/MockConsumer.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/consumer/TestConsumerTarget.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/AppenderUtilsTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerStatusListenerTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/BrokerMemoryLoggerTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/BrokerNameAndLevelLogInclusionRuleTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/CompositeFilterTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/LoggerNameAndLevelFilterTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/PrincipalLogEventFilterTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/QpidLoggerTurboFilterTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/StartupAppenderTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLogEventExcludingFilterTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerAdapterTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/preferences/GenericPrincipalTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/preferences/PreferenceFactoryTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/preferences/PreferenceTestHelper.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/preferences/UserPreferencesTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/testmodels/TestSecurityManager.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/PreferencesTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQTypeTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/EncodingUtilsTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/queue/ConsumerListTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/queue/FlowToDiskOverflowPolicyHandlerTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/queue/RejectPolicyHandlerTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationProviderTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabaseTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationResultCacherTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2AuthenticationProviderImplTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpoint.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2MockEndpointHolder.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/oauth2/OAuth2SaslServerTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexInitialiserTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/TestPrincipalDatabase.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/anonymous/AnonymousNegotiatorTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/crammd5/CramMd5NegotiatorTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/external/ExternalNegotiatorTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/oauth2/OAuth2NegotiatorTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainNegotiatorTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/scram/ScramNegotiatorTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/ssl/TrustManagerTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/stats/StatisticsCounterTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/store/AbstractConfigurationStoreUpgraderAndRecovererTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/store/ConfiguredObjectRecordConverterTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/store/preferences/PreferencesRecovererTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/streams/CompositeInputStreamTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/transport/TransactionTimeoutTickerTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/transport/network/security/ssl/SSLUtilTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/txn/FlowToDiskTransactionObserverTest.java
 delete mode 100644 broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/util/CachingUUIDFactoryTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/util/CommandLineParserTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/util/FileUtilsTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/util/GZIPUtilsTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/util/SerialTest.java
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/util/StringsTest.java
 rename {common/src/test/java/org/apache/qpid => broker-core/src/test/java/org/apache/qpid/server}/util/default.properties (100%)
 rename {common/src/test/java/org/apache/qpid => broker-core/src/test/java/org/apache/qpid/server}/util/mydefaults.properties (100%)
 create mode 100644 broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeTest.java
 copy test-profiles/test_resources/ssl/java_client_keystore.jks => broker-core/src/test/resources/ssl/test_keystore.jks (100%)
 delete mode 100644 broker-core/src/xsl/qmf.xsl
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclFileParser.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/CachingSecurityToken.java
 delete mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ConfigurationFile.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControl.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyOperation.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectProperties.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectType.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/OperationLoggingDetails.java
 delete mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSetCreator.java
 delete mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
 delete mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProvider.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclRule.java
 delete mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProvider.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedAccessControlProviderImpl.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProvider.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleBasedVirtualHostAccessControlProviderImpl.java
 create mode 100644 broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/RuleOutcome.java
 create mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/AclFileParserTest.java
 create mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapterTest.java
 delete mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
 create mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControlTest.java
 create mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleSetTest.java
 delete mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java
 delete mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java
 create mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderFactoryTest.java
 create mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java
 delete mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
 delete mode 100644 broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
 mode change 100755 => 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java
 create mode 100755 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Constant.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/FrameSizeObserver.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Future.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageFormat_0_10.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEventSender.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SenderException.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionInvoker.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session_0_10.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Waiter.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Acquired.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoder.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoder.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Binary.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionClose.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseCode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionCloseOk.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionException.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionHeartbeat.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpen.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionOpenOk.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionRedirect.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecure.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionSecureOk.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStart.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionStartOk.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTune.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ConnectionTuneOk.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Decoder.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DeliveryProperties.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxCommit.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxEnd.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxForget.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxGetTimeout.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxPrepare.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRecover.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxRollback.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSelect.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxSetTimeout.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxStart.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/DtxXaStatus.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Encodable.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Encoder.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/EncoderUtils.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBind.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBound.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeBoundResult.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDeclare.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeDelete.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQuery.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeQueryResult.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExchangeUnbind.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionErrorCode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionException.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionResult.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ExecutionSync.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Field.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FileReturnCode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/FragmentProperties.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Frame.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/GetTimeoutResult.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Header.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAccept.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcceptMode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquire.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageAcquireMode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCancel.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageCreditUnit.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageDeliveryMode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageDeliveryPriority.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlow.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlowMode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageFlush.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageProperties.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageReject.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRejectCode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageRelease.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResume.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageResumeResult.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSetFlowMode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageStop.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageSubscribe.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MessageTransfer.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Method.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/MethodDelegate.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/NetworkDelegate.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/NetworkEvent.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Option.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolDelegate.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolError.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolEvent.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ProtocolHeader.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDeclare.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueDelete.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueuePurge.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQuery.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/QueueQueryResult.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Range.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSet.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetFactory.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetImpl.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/RecoverResult.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/ReplyTo.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SegmentType.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttach.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionAttached.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionClosedException.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandFragment.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCommandPoint.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionCompleted.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionConfirmed.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetach.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetachCode.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionDetached.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionException.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionExpected.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionFlush.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionGap.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionHeader.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionKnownCompleted.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionRequestTimeout.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/SessionTimeout.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Struct.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/StructFactory.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Track.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxCommit.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxRollback.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/TxSelect.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Type.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/XaResult.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/Xid.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/mimecontentconverter/AmqpListToListConverter.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/mimecontentconverter/AmqpMapToMapConverter.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/mimecontentconverter/ListToAmqpListConverter.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/mimecontentconverter/MapToAmqpMapConverter.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_0_10_to_InternalTest.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_Internal_to_0_10Test.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_0_10_to_InternalTest.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/PropertyConverter_Internal_to_v0_10Test.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/GenTest.java
 create mode 100644 broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/RangeSetTest.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQConnectionException.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQDecoder.java
 delete mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CachedFrame.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/CreditRestorer.java
 delete mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeue.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/FlowCreditManager_0_8.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/InfiniteCreditCreditManager.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConsumerAssociation.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageFormat_0_9_1.java
 delete mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageOnlyCreditManager.java
 delete mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/NoAckCreditManager.java
 delete mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/RecordDeliveryMethod.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ServerDecoder.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQDataBlock.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQFrame.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodBodyImpl.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodEvent.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQMethodListener.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolClassException.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolHeaderException.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolInstanceException.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolVersionException.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQProtocolWriter.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AMQVersionAwareProtocolSession.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/AccessRequestOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicAckBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicCancelOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicConsumeOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicDeliverBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetEmptyBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicGetOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicNackBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicPublishBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicQosOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRecoverSyncOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicRejectBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicReturnBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelAlertBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelCloseOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelFlowOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelMethodProcessor.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ChannelOpenOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientChannelMethodProcessor.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodDispatcher.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ClientMethodProcessor.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/CompositeAMQDataBlock.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConfirmSelectOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionCloseBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionCloseOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionOpenOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionRedirectBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionSecureBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionSecureOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionStartBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionStartOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionTuneBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ConnectionTuneOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ContentHeaderPropertiesFactory.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/EncodableAMQDataBlock.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeBoundOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeclareBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeclareOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeleteBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ExchangeDeleteOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/FrameCreatingMethodProcessor.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/HeartbeatBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfo.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodDispatcher.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodProcessor.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/MethodRegistry.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolInitiation.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ProtocolVersionAware.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueBindOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeclareBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeclareOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeleteBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueDeleteOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueuePurgeBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueuePurgeOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueUnbindBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/QueueUnbindOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ServerChannelMethodProcessor.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ServerMethodDispatcher.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/ServerMethodProcessor.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxCommitBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxCommitOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxRollbackBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxRollbackOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/TxSelectOkBody.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/AMQBindingURL.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURL.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/BindingURLParser.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLHelper.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/url/URLSyntaxException.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQDecoderTest.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ClientDecoder.java
 delete mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_0_8_to_InternalTest.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_Internal_to_0_8Test.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MessageMetaDataFactoryTest.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/Pre0_10CreditManagerTest.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_Internal_to_v0_8Test.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/PropertyConverter_v0_8_to_InternalTest.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderPropertiesTest.java
 create mode 100644 broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java
 create mode 100644 broker-plugins/amqp-1-0-bdb-store/pom.xml
 create mode 100644 broker-plugins/amqp-1-0-bdb-store/src/main/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStore.java
 create mode 100644 broker-plugins/amqp-1-0-bdb-store/src/main/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreFactory.java
 create mode 100644 broker-plugins/amqp-1-0-bdb-store/src/main/java/org/apache/qpid/server/protocol/v1_0/store/bdb/LinkKeyEntryBinding.java
 create mode 100644 broker-plugins/amqp-1-0-bdb-store/src/main/java/org/apache/qpid/server/protocol/v1_0/store/bdb/LinkValue.java
 create mode 100644 broker-plugins/amqp-1-0-bdb-store/src/main/java/org/apache/qpid/server/protocol/v1_0/store/bdb/LinkValueEntryBinding.java
 create mode 100644 broker-plugins/amqp-1-0-bdb-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/bdb/BDBLinkStoreTest.java
 create mode 100644 broker-plugins/amqp-1-0-jdbc-store/pom.xml
 create mode 100644 broker-plugins/amqp-1-0-jdbc-store/src/main/java/org/apache/qpid/server/protocol/v1_0/store/jdbc/JDBCLinkStore.java
 create mode 100644 broker-plugins/amqp-1-0-jdbc-store/src/main/java/org/apache/qpid/server/protocol/v1_0/store/jdbc/JDBCLinkStoreFactory.java
 create mode 100644 broker-plugins/amqp-1-0-jdbc-store/src/test/java/org/apache/qpid/server/protocol/v1_0/store/jdbc/JDBCLinkStoreTest.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractDescribedTypeWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractListWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/AbstractMapWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ArrayWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryString.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/BinaryWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/BooleanWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteArrayWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ByteWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/CharTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/CharWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeAssembler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/CompoundWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DecimalConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DefaultDescribedTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DelegatingValueWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedType.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DescribedTypeConstructorRegistry.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/DoubleWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedEightWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedFourWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedOneWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedSixteenWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FixedTwoWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FloatWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/FrameWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/IntegerWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ListWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/LongWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/MapWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/NullWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ProtocolHeaderHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/RestrictedTypeValueWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ShortWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SimpleVariableWidthWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallIntConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallLongConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallUIntConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SmallULongConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/StringTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/StringWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolArrayWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/SymbolWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TimestampWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/TypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UByteTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UIntTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ULongTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UShortTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UUIDWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedByteWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedIntegerWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedLongWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/UnsignedShortWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueProducingProtocolHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ValueWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthTypeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/VariableWidthWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/WrapperTypeValueWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroListConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroUIntConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/codec/ZeroULongConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQFrame.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/AMQPProtocolHeaderHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/ExceptionHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameParsingError.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/FrameTypeHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/OversizeFrameException.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrame.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLFrameHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/SASLProtocolHeaderHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/framing/TransportFrame.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/MessageAttributes.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoder.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionDecoderImpl.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoder.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/messaging/SectionEncoderImpl.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesProcessor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/BytesTransport.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/CircularBytesBuffer.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEventListener.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionState.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/Container.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/Delivery.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/DeliveryStateHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ErrorHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameOutputHandler.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/FrameTransport.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/LinkEventListener.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/Node.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/Predicate.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ProtocolHeaderTransport.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingLinkListener.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/ReceivingSessionHalfEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLEndpointImpl.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLFrameTransport.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SASLTransport.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SaslServerProvider.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingLinkListener.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SendingSessionHalfEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SequenceNumber.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionAttachment.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionEventListener.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionHalfEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/SessionState.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/StateChangeListener.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/transport/UnsettledTransfer.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/AmqpErrorException.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/DeliveryState.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/DistributionMode.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/ErrorCondition.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/FrameBody.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/GlobalTxId.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/LifetimePolicy.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/Outcome.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/RestrictedType.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/SaslFrameBody.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/Section.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/Source.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/Symbol.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/Target.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/TxnCapability.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/TxnId.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedByte.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedInteger.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedLong.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/UnsignedShort.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/WrapperType.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/codec/AMQPDescribedTypeRegistry.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Accepted.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpSequence.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/AmqpValue.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ApplicationProperties.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Data.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnClose.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinks.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoLinksOrMessages.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeleteOnNoMessages.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/DeliveryAnnotations.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/ExactSubjectFilter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Filter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Footer.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Header.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/JMSSelectorFilter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MatchingSubjectFilter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/MessageAnnotations.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Modified.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/NoLocalFilter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Properties.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Received.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Rejected.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Released.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Source.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/StdDistMode.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/Target.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusDurability.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/TerminusExpiryPolicy.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AcceptedWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpSequenceWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/AmqpValueWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ApplicationPropertiesWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DataWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnCloseWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ExactSubjectFilterWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/FooterWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/HeaderWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/JMSSelectorFilterWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/MessageAnnotationsWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ModifiedWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/NoLocalFilterWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/PropertiesWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReceivedWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/RejectedWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/ReleasedWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/SourceWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/messaging/codec/TargetWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslChallenge.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslCode.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslInit.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslOutcome.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslResponse.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslChallengeWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslInitWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslMechanismsWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslOutcomeWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/security/codec/SaslResponseWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Coordinator.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declare.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Declared.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/Discharge.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionErrors.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TransactionalState.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapabilities.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/TxnCapability.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/CoordinatorWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclareWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DeclaredWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/DischargeWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transaction/codec/TransactionalStateWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/AmqpError.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Attach.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Begin.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Close.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ConnectionError.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Detach.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Disposition.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/End.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Error.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Flow.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/LinkError.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Open.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/ReceiverSettleMode.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Role.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SenderSettleMode.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/SessionError.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/Transfer.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/AttachWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/BeginWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/CloseWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DetachWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/DispositionWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/EndWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/ErrorWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/FlowWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/OpenWriter.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferConstructor.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/amqp_1_0/type/transport/codec/TransferWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractLinkEndpoint.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AbstractReceivingLinkEndpoint.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AnonymousRelayDestination.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConnectionHandler.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConnectionState.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Container.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Delivery.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/DeserializationFactories.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Destination.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeSendingDestination.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/FrameOutputHandler.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/IdentifiedTransaction.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/JmsMessageTypeAnnotation.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkDefinition.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkDefinitionImpl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkImpl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkKey.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkRegistry.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryFactoryImpl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryImpl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageFormat_1_0.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageSourceDestination.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Node.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/NullLinkStoreFactory.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkAttachment.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SASLEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkAttachment.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SequenceNumber.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SessionState.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardSendingDestination.java
 delete mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLinkEndpoint.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/UnknownTransactionException.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractCompositeTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractDescribedTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractDescribedTypeWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractListWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/AbstractMapWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ArrayTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryString.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BinaryWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/BooleanWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteArrayWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ByteWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CharWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/CompoundWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DecimalConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DefaultDescribedTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DelegatingValueWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedType.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DescribedTypeConstructorRegistry.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/DoubleWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedEightWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedFourWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedOneWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedSixteenWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FixedTwoWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FloatWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/IntegerWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ListWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/LongWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/MapWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/NullWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ProtocolHandler.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/RestrictedTypeValueWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SectionDecoderRegistry.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ShortWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SimpleVariableWidthWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallIntConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallLongConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallUIntConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SmallULongConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/StringWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolArrayWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/SymbolWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TimestampWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/TypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UByteTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UIntTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ULongTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UShortTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UUIDWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedByteWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedIntegerWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedLongWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/UnsignedShortWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandler.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueProducingProtocolHandler.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ValueWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthTypeConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/VariableWidthWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroListConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroUIntConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/ZeroULongConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistry.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistryImpl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/UnsettledDelivery.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandler.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/OversizeFrameException.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/SASLFrame.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoder.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionDecoderImpl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoder.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/messaging/SectionEncoderImpl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/AbstractLinkStore.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStore.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreFactory.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreUpdater.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreUpdaterImpl.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreUtils.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/AmqpErrorException.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/AmqpErrorRuntimeException.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/BaseSource.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/BaseTarget.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Binary.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/DeliveryState.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/DistributionMode.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCarryingFrameBody.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/ErrorCondition.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/FrameBody.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/GlobalTxId.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/LifetimePolicy.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Outcome.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/RestrictedType.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/SaslFrameBody.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Section.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/Symbol.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/TxnCapability.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/TxnId.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedByte.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedInteger.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedLong.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/WrapperType.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/codec/AMQPDescribedTypeRegistry.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionConnectionProperties.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionDetectionPolicy.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/extensions/soleconn/SoleConnectionEnforcementPolicy.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AbstractSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Accepted.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequenceSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValue.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValueSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationPropertiesSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DataSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnClose.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoLinks.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoLinksOrMessages.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeleteOnNoMessages.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotations.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotationsSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/EncodingRetainingSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ExactSubjectFilter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Filter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Footer.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/FooterSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Header.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/HeaderSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/JMSSelectorFilter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MatchingSubjectFilter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotations.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotationsSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Modified.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NoLocalFilter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NonEncodingRetainingSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Properties.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/PropertiesSection.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Received.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Rejected.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Released.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Source.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/StdDistMode.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Target.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusDurability.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/TerminusExpiryPolicy.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AbstractLazyConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AcceptedWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnCloseWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksOrMessagesWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoLinksWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeleteOnNoMessagesWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedMapSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/EncodingRetaining.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ExactSubjectFilterWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MatchingSubjectFilterWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ModifiedWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/NoLocalFilterWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReceivedWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/RejectedWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ReleasedWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/SourceWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/TargetWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslCode.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslChallengeWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslInitWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslMechanismsWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslOutcomeWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/codec/SaslResponseWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/Coordinator.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/Declare.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/Declared.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/Discharge.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionError.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TransactionalState.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/TxnCapability.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/CoordinatorWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclareWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DeclaredWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/DischargeWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transaction/codec/TransactionalStateWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/AmqpError.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ChannelFrameBody.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ConnectionError.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Error.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/LinkError.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/ReceiverSettleMode.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Role.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SenderSettleMode.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/SessionError.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/AttachWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/BeginWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/CloseWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DetachWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/DispositionWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/EndWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/ErrorWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/FlowWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/OpenWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/codec/TransferWriter.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0Test.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/LinkRegistryTest.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_1_0Test.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_v1_0_to_InternalTest.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_Internal_to_v1_0Test.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/PropertyConverter_v1_0_to_InternalTest.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/TestLinkStoreFactory.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/codec/ValueHandlerTest.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/framing/FrameHandlerTest.java
 create mode 100644 broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/store/LinkStoreTestCase.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_1_0_to_v0_10Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/PropertyConverter_0_10_to_1_0Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-10-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/PropertyConverter_1_0_to_0_10Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_10_to_0_8Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-8-to-0-10/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/PropertyConverter_0_8_to_0_10Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_0_8_to_1_0Test.java
 create mode 100644 broker-plugins/amqp-msg-conv-0-8-to-1-0/src/test/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/PropertyConverter_1_0_to_0_8Test.java
 create mode 100644 broker-plugins/derby-store/src/test/java/org/apache/qpid/server/store/derby/DerbyPreferenceStoreTest.java
 create mode 100644 broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCConfigurationStore.java
 create mode 100644 broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCMessageStore.java
 create mode 100644 broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/AbstractJDBCPreferenceStore.java
 rename {broker-core => broker-plugins/jdbc-store}/src/main/java/org/apache/qpid/server/store/jdbc/ConnectionProvider.java (100%)
 create mode 100644 broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCConnectionProviderFactory.java
 create mode 100644 broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCContainer.java
 create mode 100644 broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JdbcUtils.java
 create mode 100644 broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStoreTest.java
 create mode 100644 broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigTest.java
 create mode 100644 broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
 create mode 100644 broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeTest.java
 create mode 100644 broker-plugins/logging-logback/pom.xml
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractBrokerLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractNameAndLevelLogInclusionRule.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractPredicateLogInclusionRule.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AbstractVirtualHostLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerConsoleLoggerImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRule.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerSyslogLoggerImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRule.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerUserOrConnectionLogInclusionRuleImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/CompositeFilter.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicate.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/EffectiveLevelFilter.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/FileLoggerSettings.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogBackLogInclusionRule.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecord.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogRecorder.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilter.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LogbackLoggingSystemLauncherListener.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilter.java
 rename {broker-core => broker-plugins/logging-logback}/src/main/java/org/apache/qpid/server/logging/logback/NoopConfigurator.java (100%)
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PredicateAndLoggerNameAndLevelFilter.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilter.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilter.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RecordEventAppender.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/RolloverWatcher.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostFileLoggerImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilter.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRule.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLogger.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostSyslogLoggerImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRule.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostUserOrConnectionLogInclusionRuleImpl.java
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/FileBrowser.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/LogViewer.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/add.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/show.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/add.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/show.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/add.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/add.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/add.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/show.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/add.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/show.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js
 create mode 100644 broker-plugins/logging-logback/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/brokerlogbacksocket/add.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/brokerlogbacksocket/show.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/console/add.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/console/show.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/file/add.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/file/fileBrowser.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/file/show.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/memory/add.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/memory/show.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/memory/showLogViewer.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/syslog/add.html (100%)
 rename broker-plugins/{management-http => logging-logback}/src/main/java/resources/logger/syslog/show.html (100%)
 rename {broker-core => broker-plugins/logging-logback}/src/main/resources/META-INF/services/ch.qos.logback.classic.spi.Configurator (100%)
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerStatusListenerTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerFileLoggerTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerLoggerTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerNameAndLevelLogInclusionRuleTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/CompositeFilterTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/ConnectionAndUserPredicateTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/Logback1027WorkaroundTurboFilterTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/LoggerNameAndLevelFilterTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/PrincipalLogEventFilterTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java
 create mode 100644 broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
 delete mode 100644 broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagedEntityType.java
 create mode 100644 broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
 create mode 100644 broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpaceCreator.java
 create mode 100644 broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpacePrincipal.java
 create mode 100644 broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementInputConverter.java
 create mode 100644 broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementOutputConverter.java
 create mode 100644 broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
 create mode 100644 broker-plugins/management-http/src/main/grammar/ConfiguredObjectFilterParser.jj
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/GunzipOutputStream.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/SessionInvalidatedException.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/auth/AnonymousInteractiveAuthenticator.java
 delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/connector/TcpAndSslSelectChannelConnector.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/AuthenticationCheckFilter.java
 delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/ForbiddingAuthorisationFilter.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/InteractiveAuthenticationFilter.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectFilter.java
 delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RedirectingAuthorisationFilter.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/filter/RewriteRequestForUncompressedJavascript.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/MarkableEndPoint.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactory.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/preferences/QueryPreferenceValue.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/preferences/QueryPreferenceValueFactory.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpression.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectExpressionFactory.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParser.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserConstants.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectFilterParserTokenManager.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectQuery.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/EvaluationException.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/NamedExpression.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/ParseException.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/SimpleCharStream.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/Token.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/query/TokenMgrError.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerQueryServlet.java
 delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/KeyComparator.java
 delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
 delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MapComparator.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/NotFoundException.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/QueryServlet.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RequestInfo.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RequestInfoParser.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java
 delete mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java
 create mode 100644 broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/addVirtualHost.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/addVirtualHostAlias.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/authenticationprovider/oauth2/add.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/authenticationprovider/oauth2/show.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/common/LoginForm.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/common/MessageDialogForm.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/common/StatisticsWidget.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/dashboard/AddWidgetDialogContent.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/dashboard/DashboardCreateDialogForm.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/dashboard/DashboardWidget.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/dashboard/QueryWidgetSettings.html
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/editQueue.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/groupprovider/cloudfoundrydashboardmanagement/add.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/groupprovider/cloudfoundrydashboardmanagement/show.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/images/minus.svg
 create mode 100644 broker-plugins/management-http/src/main/java/resources/images/plus.svg
 create mode 100644 broker-plugins/management-http/src/main/java/resources/images/qpid-favicon.png
 create mode 100644 broker-plugins/management-http/src/main/java/resources/images/question.svg
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/addVirtualHostAlias.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/sasl.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/common/DestinationChooser.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/common/HexDumpWidget.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/common/LoginForm.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/common/MessageDialog.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/common/StatisticsWidget.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/common/Structure.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/DashboardBrowserTab.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/DashboardTab.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/Preferences.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/QueryBrowserTab.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/QueryTab.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHost.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostAlias.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/add.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/authenticationprovider/oauth2/show.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/DashboardCreateDialogForm.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/DashboardWidget.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/query.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/dashboard/widget/unavailable.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/editQueue.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/add.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/groupprovider/cloudfoundrydashboardmanagement/show.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/brokerlogbacksocket/show.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/console/show.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/file/show.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/memory/show.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/brokerlogger/syslog/show.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/file/show.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/logger/virtualhostlogger/syslog/show.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/brokerloginclusionrule/nameandlevel/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/loginclusionrule/virtualhostloginclusionrule/nameandlevel/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/amqp/show.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/port/http/show.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/preference/PreferenceBrowserWidget.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/preference/PreferenceSaveDialogContent.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/add.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/filesystempreferences/show.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/CriteriaPane.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/DropDownSelect.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/OptionsPanel.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryCreateDialogForm.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryGrid.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryStore.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/SearchTextBox.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/StoreUpdater.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereCriteria.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/WhereExpression.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/CertificateGridWidget.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/userpreference/UserPreferenceForm.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/defaultalias/add.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/hostnamealias/add.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/namealias/add.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostalias/patternmatchingalias/add.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/Authenticator.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/CredentialBasedSaslClient.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/SaslClient.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/ScramShaSaslClient.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/cram-md5-hex/SaslClient.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/cram-md5/SaslClient.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/plain/SaslClient.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/scram-sha-1/SaslClient.js
 create mode 100644 broker-plugins/management-http/src/main/java/resources/js/qpid/sasl/scram-sha-256/SaslClient.js
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/login.html
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/plugin/managementjmx/edit.html
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/port/amqp/show.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/port/http/show.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/preference/PreferenceBrowserWidget.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/preference/PreferenceSaveDialogContent.html
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/preferencesprovider/filesystempreferences/add.html
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/preferencesprovider/filesystempreferences/show.html
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/query/CriteriaPane.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/query/OptionsPanel.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/query/QueryCloneDialogForm.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/query/QueryCreateDialogForm.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/query/QueryWidget.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/query/WhereCriteria.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/showDashboardBrowserTab.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/showDashboardTab.html
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/showPreferences.html
 delete mode 100644 broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/showQueryBrowserTab.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/showQueryTab.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/showTrustStore.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/store/CertificateGridWidget.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/store/keystore.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/store/truststore.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/userpreference/UserPreferenceForm.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/virtualhostalias/defaultalias/add.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/virtualhostalias/hostnamealias/add.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/virtualhostalias/namealias/add.html
 create mode 100644 broker-plugins/management-http/src/main/java/resources/virtualhostalias/patternmatchingalias/add.html
 create mode 100644 broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/GunzipOutputStreamTest.java
 create mode 100644 broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
 create mode 100644 broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
 create mode 100644 broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
 create mode 100644 broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectQueryTest.java
 create mode 100644 broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RequestInfoParserTest.java
 create mode 100644 broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandlerTest.java
 delete mode 100644 broker-plugins/management-jmx/pom.xml
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/AMQManagedObject.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanIntrospector.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObject.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameAccessor.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameCachingRMIJRMPServer.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ShutdownMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/NoopManagedObjectRegistry.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/MBeanTestUtils.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java
 delete mode 100644 broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
 rename {common => broker}/bin/qpid-run (100%)
 delete mode 100644 broker/etc/broker_example.acl
 delete mode 100644 broker/scripts/resetAlerting.sh
 delete mode 100644 broker/src/main/assembly/NOTICE
 delete mode 100644 broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
 delete mode 100644 broker/src/main/assembly/qpid-broker-bin.xml
 delete mode 100644 client/README.txt
 delete mode 100644 client/example/README.txt
 delete mode 100644 client/example/pom.xml
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/Drain.java
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/Hello.java
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/ListReceiver.java
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/ListSender.java
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/MapReceiver.java
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/MapSender.java
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/OptionParser.java
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/Spout.java
 delete mode 100644 client/example/src/main/java/org/apache/qpid/example/hello.properties
 delete mode 100644 client/pom.xml
 delete mode 100644 client/src/main/assembly/LICENSE
 delete mode 100644 client/src/main/assembly/NOTICE
 delete mode 100644 client/src/main/assembly/README.txt
 delete mode 100644 client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
 delete mode 100644 client/src/main/assembly/qpid-client-bin.xml
 delete mode 100755 client/src/main/java/client.bnd
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQConnection.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
 delete mode 100755 client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_9.java
 delete mode 100755 client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_91.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQDestination.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQNoConsumersException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQNoRouteException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQQueue.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQQueueSessionAdaptor.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQSession.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQSessionAdapter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQTopic.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQTopicSessionAdaptor.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/AMQXAResource.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/BrokerDetails.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/ChannelToSessionMap.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/Closeable.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/CommonConnection.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/ConnectionTuneParameters.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/FailoverHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/HeartbeatListener.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/JmsNotImplementedException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/MessageConsumerPair.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/PooledConnectionFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/QueueReceiverAdaptor.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/QueueSenderAdapter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/RejectBehaviour.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/UnsupportedAddressSyntaxException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/XASessionImpl.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/failover/ConnectionRedirectException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/failover/FailoverException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/failover/FailoverNoopSupport.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/failover/FailoverProtectedOperation.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/failover/FailoverRetrySupport.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/failover/FailoverState.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/failover/FailoverSupport.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelper.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegateFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/CloseConsumerMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/Encrypted010MessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/Encrypted091MessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/MessageEncryptionHelper.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/ReturnMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_10.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage_0_8.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/messaging/address/AddressHelper.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/messaging/address/Link.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/messaging/address/Node.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/messaging/address/QpidExchangeOptions.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/messaging/address/QpidQueueOptions.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/AMQCallbackHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/DynamicSaslRegistrar.properties
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/JCAProvider.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClient.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/amqplain/AmqPlainSaslClientFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClient.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/anonymous/AnonymousSaslClientFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClient.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/crammd5hashed/CRAMMD5HashedSaslClientFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/oauth2/OAuth2AccessTokenCallbackHandler.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/oauth2/OAuth2SaslClient.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/oauth2/OAuth2SaslClientFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/scram/AbstractScramSaslClient.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/scram/ScramSHA1SaslClient.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/scram/ScramSHA1SaslClientFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/scram/ScramSHA256SaslClient.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/security/scram/ScramSHA256SaslClientFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/state/AMQState.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/state/AMQStateChangedEvent.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/state/AMQStateListener.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/url/URLParser.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/url/URLParser_0_10.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/util/FlowControllingBlockingQueue.java
 delete mode 100644 client/src/main/java/org/apache/qpid/client/util/JMSExceptionHelper.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/ChannelLimitReachedException.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/Connection.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/ConnectionListener.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/FailoverPolicy.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/ListMessage.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/Message.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/MessageConsumer.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/MessageProducer.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/Session.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/failover/FailoverMethod.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jms/failover/NoFailover.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jndi/Example.properties
 delete mode 100644 client/src/main/java/org/apache/qpid/jndi/NameParserImpl.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jndi/ObjectFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
 delete mode 100644 client/src/main/java/org/apache/qpid/jndi/ReadOnlyContext.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/AMQDestinationTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/ConnectionListenerSupport.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/handler/CloseWhenNoRouteSettingsHelperTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/message/AMQPEncodedListMessageUnitTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/message/Encrypted010MessageFactoryTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/message/Encrypted091MessageFactoryTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/messaging/address/AddressHelperTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/security/CallbackHandlerRegistryTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/security/DynamicSaslRegistrarTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/security/UsernameHashedPasswordCallbackHandlerTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/security/UsernamePasswordCallbackHandlerTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/security/oauth2/OAuth2AccessTokenCallbackHandlerTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/security/oauth2/OAuth2SaslClientTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/transport/MockSender.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/transport/TestNetworkConnection.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/client/util/SimplePojo.java
 delete mode 100644 client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/jms/FailoverPolicyTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/jndi/JNDITest.properties
 delete mode 100644 client/src/test/java/org/apache/qpid/jndi/ObjectFactoryTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableKeyEnumeratorTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/basic/FieldTablePropertyTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/channelclose/NoCloseOKStateManager.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/BindingURLTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/message/BytesMessageTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageUnitTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/message/StreamMessageTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
 delete mode 100644 client/src/test/java/org/apache/qpid/test/unit/tests.properties
 delete mode 100644 common/Composite.tpl
 delete mode 100644 common/Constant.tpl
 delete mode 100644 common/Enum.tpl
 delete mode 100644 common/Invoker.tpl
 delete mode 100644 common/MethodDelegate.tpl
 delete mode 100644 common/Option.tpl
 delete mode 100644 common/StructFactory.tpl
 delete mode 100644 common/Type.tpl
 delete mode 100755 common/bin/qpid-jaddr
 delete mode 100644 common/build-generate-sources.xml
 delete mode 100755 common/codegen
 delete mode 100644 common/etc/qpid-run.conf
 delete mode 100644 common/etc/qpid-run.conf.dev
 delete mode 100644 common/genutil.py
 delete mode 100644 common/mllib/__init__.py
 delete mode 100644 common/mllib/dom.py
 delete mode 100644 common/mllib/parsers.py
 delete mode 100644 common/mllib/transforms.py
 delete mode 100644 common/pom.xml
 delete mode 100644 common/readme.txt
 delete mode 100644 common/src/main/grammar/SelectorParser.jj
 delete mode 100755 common/src/main/java/common.bnd
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQChannelClosedException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQChannelException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQConnectionClosedException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQConnectionException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQInternalException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQInvalidArgumentException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQInvalidRoutingKeyException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQPInvalidClassException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQProtocolException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQSecurityException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQTimeoutException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQUndeliveredException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/QpidException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/bytebuffer/BufferPool.java
 delete mode 100644 common/src/main/java/org/apache/qpid/bytebuffer/ByteBufferRef.java
 delete mode 100644 common/src/main/java/org/apache/qpid/bytebuffer/NonPooledByteBufferRef.java
 delete mode 100644 common/src/main/java/org/apache/qpid/bytebuffer/PooledByteBufferRef.java
 delete mode 100644 common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
 delete mode 100644 common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBufferOutputStream.java
 delete mode 100644 common/src/main/java/org/apache/qpid/codec/AMQDecoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/codec/ClientDecoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/codec/MarkableDataInput.java
 delete mode 100644 common/src/main/java/org/apache/qpid/codec/ServerDecoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
 delete mode 100644 common/src/main/java/org/apache/qpid/common/ServerPropertyNames.java
 delete mode 100644 common/src/main/java/org/apache/qpid/configuration/Accessor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
 delete mode 100644 common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
 delete mode 100644 common/src/main/java/org/apache/qpid/configuration/Configured.java
 delete mode 100644 common/src/main/java/org/apache/qpid/configuration/QpidProperty.java
 delete mode 100644 common/src/main/java/org/apache/qpid/configuration/Validator.java
 delete mode 100644 common/src/main/java/org/apache/qpid/dtx/XidImpl.java
 delete mode 100644 common/src/main/java/org/apache/qpid/exchange/ExchangeDefaults.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/Expression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/FilterableMessage.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/LogicExpression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/PropertyExpression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/UnaryExpression.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/selector/ParseException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/selector/SelectorParser.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/selector/SelectorParserConstants.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/selector/SelectorParserTokenManager.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/selector/SimpleCharStream.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/selector/Token.java
 delete mode 100644 common/src/main/java/org/apache/qpid/filter/selector/TokenMgrError.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQDataBlock.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQFrame.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQFrameDecodingException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQProtocolClassException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQShortString.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQType.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicNackBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ByteArrayDataInput.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ByteBufferDataInput.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ByteBufferListDataInput.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ChannelMethodProcessor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ClientChannelMethodProcessor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ClientMethodProcessor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/CompositeAMQDataBlock.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConfirmSelectBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConfirmSelectOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ContentBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/EncodableAMQDataBlock.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/FieldArray.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/FieldTable.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/FieldTableFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/FrameCreatingMethodProcessor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/MessagePublishInfo.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/MethodDispatcher.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/MethodProcessor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ServerChannelMethodProcessor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/ServerMethodProcessor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/Address.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/AddressParser.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/JAddr.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/LexError.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/Lexer.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/Lexicon.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/LineInfo.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/ParseError.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/Parser.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/PyPrint.java
 delete mode 100644 common/src/main/java/org/apache/qpid/messaging/util/Token.java
 delete mode 100644 common/src/main/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
 delete mode 100644 common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
 delete mode 100644 common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
 delete mode 100644 common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
 delete mode 100644 common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
 delete mode 100644 common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
 delete mode 100644 common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
 delete mode 100644 common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/streams/CompositeInputStream.java
 delete mode 100644 common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/thread/LoggingUncaughtExceptionHandler.java
 delete mode 100644 common/src/main/java/org/apache/qpid/thread/QpidThreadExecutor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/thread/ThreadFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/thread/Threading.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Acquired.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Binary.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ByteBufferReceiver.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Connection.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionClose.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionCloseCode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionCloseOk.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionHeartbeat.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionInvoker.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionListener.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionOpen.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionOpenOk.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionRedirect.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionSecure.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionSecureOk.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionStart.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionStartOk.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionTune.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ConnectionTuneOk.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Constant.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DeliveryProperties.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxCommit.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxEnd.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxForget.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxGetTimeout.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxPrepare.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxRecover.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxRollback.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxSelect.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxSetTimeout.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxStart.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/DtxXaStatus.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExceptionHandlingByteBufferReceiver.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExchangeBind.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExchangeBound.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExchangeBoundResult.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExchangeDeclare.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExchangeDelete.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExchangeQuery.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExchangeQueryResult.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExchangeUnbind.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExecutionErrorCode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExecutionException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExecutionResult.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ExecutionSync.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Field.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/FileReturnCode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/FragmentProperties.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/FrameSizeObserver.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Future.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/GetTimeoutResult.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Header.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/LegacyClientProperties.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageAccept.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageAcceptMode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageAcquire.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageAcquireMode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageCancel.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageCreditUnit.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageDeliveryMode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageDeliveryPriority.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageFlow.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageFlowMode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageFlush.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageProperties.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageReject.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageRejectCode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageRelease.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageResume.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageResumeResult.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageSetFlowMode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageStop.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageSubscribe.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MessageTransfer.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Method.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/MethodDelegate.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/NetworkEventReceiver.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/NetworkTransportConfiguration.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Option.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ProtocolDelegate.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ProtocolError.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ProtocolEvent.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ProtocolEventReceiver.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ProtocolEventSender.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ProtocolHeader.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ProtocolVersionException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/QueueDeclare.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/QueueDelete.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/QueuePurge.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/QueueQuery.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/QueueQueryResult.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Range.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/RangeSet.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/RangeSetFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/RangeSetImpl.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/RecoverResult.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ReplyTo.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SegmentType.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SenderClosedException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SenderException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Session.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionAttach.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionAttached.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionClosedException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionCommandFragment.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionCommandPoint.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionCompleted.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionConfirmed.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionDetach.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionDetachCode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionDetached.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionExpected.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionFlush.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionGap.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionHeader.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionInvoker.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionKnownCompleted.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionListener.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionRequestTimeout.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/SessionTimeout.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/StreamReturnCode.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Struct.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/StructFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Track.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/TransportException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/TxCommit.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/TxRollback.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/TxSelect.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Type.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/XaResult.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/Xid.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/codec/AbstractDecoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/codec/BBDecoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/codec/BBEncoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/codec/Encodable.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/AggregateTicker.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/Assembler.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/Frame.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/InputHandler.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/NetworkDelegate.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/NetworkEvent.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/Ticker.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/TransportActivity.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/TransportEncryption.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkConnection.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/SSLStatus.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidMultipleTrustManager.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidPeersOnlyTrustManager.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/util/Functions.java
 delete mode 100644 common/src/main/java/org/apache/qpid/transport/util/Waiter.java
 delete mode 100644 common/src/main/java/org/apache/qpid/typedmessage/TypedBytesCodes.java
 delete mode 100644 common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java
 delete mode 100644 common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentWriter.java
 delete mode 100644 common/src/main/java/org/apache/qpid/typedmessage/TypedBytesFormatException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
 delete mode 100644 common/src/main/java/org/apache/qpid/url/BindingURL.java
 delete mode 100644 common/src/main/java/org/apache/qpid/url/BindingURLParser.java
 delete mode 100644 common/src/main/java/org/apache/qpid/url/URLHelper.java
 delete mode 100644 common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/ByteBufferDataOutput.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/ByteBufferInputStream.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/ByteBufferUtils.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/BytesDataOutput.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/CommandLineParser.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/DataUrlUtils.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/FileUtils.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/GZIPUtils.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/NameUUIDGen.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/RandomUUIDGen.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/Serial.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/Strings.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/SystemUtils.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/UUIDGen.java
 delete mode 100644 common/src/main/java/org/apache/qpid/util/UUIDs.java
 delete mode 100644 common/src/test/java/org/apache/qpid/QpidExceptionTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferOutputStreamTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/bytebuffer/QpidByteBufferTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/configuration/QpidPropertyTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/framing/FieldTableTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/ssl/SSLContextFactoryTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/ssl/TrustManagerTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/streams/CompositeInputStreamTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/GenTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/SessionTimeoutTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/codec/BBEncoderTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/network/ConnectionBinding.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java
 delete mode 100644 common/src/test/java/org/apache/qpid/transport/network/security/ssl/SSLUtilTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/util/ByteBufferInputStreamTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/util/CommandLineParserTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/util/FileUtilsTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/util/GZIPUtilsTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/util/SerialTest.java
 delete mode 100644 common/src/test/java/org/apache/qpid/util/StringsTest.java
 delete mode 100644 common/templates/method/MethodBodyInterface.vm
 delete mode 100644 common/templates/method/version/MethodBodyClass.vm
 delete mode 100644 common/templates/model/ClientMethodDispatcherInterface.vm
 delete mode 100644 common/templates/model/MethodDispatcherInterface.vm
 delete mode 100644 common/templates/model/MethodRegistryClass.vm
 delete mode 100644 common/templates/model/ProtocolVersionListClass.vm
 delete mode 100644 common/templates/model/ServerMethodDispatcherInterface.vm
 delete mode 100644 common/templates/model/version/ClientMethodDispatcherInterface.vm
 delete mode 100644 common/templates/model/version/MethodDispatcherInterface.vm
 delete mode 100644 common/templates/model/version/MethodRegistryClass.vm
 delete mode 100644 common/templates/model/version/ServerMethodDispatcherInterface.vm
 delete mode 100644 common/templating.py
 create mode 100644 debian/libqpid-broker-java.poms
 delete mode 100644 debian/libqpid-java.poms
 delete mode 100644 debian/maven.publishedRules
 delete mode 100644 debian/patches/0001-NO-JIRA-Update-expired-certificates-embedded-in-unit.patch
 create mode 100644 debian/repack.local
 create mode 100644 debian/repack.stub
 delete mode 100644 doc/java-broker/src/docbkx/AMQP-Messaging-Broker-Java-Book.xml
 create mode 100644 doc/java-broker/src/docbkx/Apache-Qpid-Broker-J-Book.xml
 create mode 100644 doc/java-broker/src/docbkx/Java-Broker-Appendix-Queue-Declaration-Arguments.xml
 create mode 100644 doc/java-broker/src/docbkx/Java-Broker-Appendix-Statistics-Reporting.xml
 delete mode 100644 doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-QMF.xml
 create mode 100644 doc/java-broker/src/docbkx/management/channels/Java-Broker-Management-Channel-REST-Query-API.xml
 delete mode 100644 doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml
 create mode 100644 doc/java-broker/src/docbkx/runtime/Java-Broker-Runtime-Consumers.xml
 delete mode 100644 doc/java-broker/src/docbkx/security/Java-Broker-Security-ACLs.xml
 create mode 100644 doc/java-broker/src/docbkx/security/Java-Broker-Security-AccessControlProviders.xml
 create mode 100644 doc/java-broker/src/docbkx/security/Java-Broker-Security-Authentication-Providers-OAuth2.xml
 delete mode 100644 doc/jms-client-0-10/pom.xml
 delete mode 100644 doc/jms-client-0-10/src/docbkx/JMS-Client-0-10-Book.xml
 delete mode 100644 doc/jms-client-0-8/pom.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Exceptions.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Maven.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-PooledConnectionFactory.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Book.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Connection-URL.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Document-Scope-And-Intended-Audience.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Examples.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Getting-And-Dependencies.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-JMS-Extensions.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-JNDI-Properties-Format.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Logging.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-System-Properties.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/JMS-Client-Understanding.xml
 delete mode 100644 doc/jms-client-0-8/src/docbkx/images/JndiOverview.png
 delete mode 100644 doc/jms-client-0-8/src/docbkx/images/JndiOverview.svg
 delete mode 100644 doc/jms-client-0-8/src/docbkx/images/QpidJmsOverview.png
 delete mode 100644 doc/jms-client-0-8/src/docbkx/images/QpidJmsOverview.svg
 create mode 100644 etc/IntelliJ_Copyright_ApacheLicense.xml
 delete mode 100644 jca/README-GERONIMO.txt
 delete mode 100644 jca/README-JBOSS-EAP6.txt
 delete mode 100644 jca/README-JBOSS.txt
 delete mode 100644 jca/README.txt
 delete mode 100644 jca/example/README-EXAMPLE.txt
 delete mode 100644 jca/example/README-GERONIMO.txt
 delete mode 100644 jca/example/README-GLASSFISH.txt
 delete mode 100644 jca/example/README-JBOSS.txt
 delete mode 100644 jca/example/README-JBOSS7.txt
 delete mode 100644 jca/example/build-geronimo-properties.xml
 delete mode 100644 jca/example/build-glassfish-properties.xml
 delete mode 100644 jca/example/build-jboss-properties.xml
 delete mode 100644 jca/example/build-jboss7-properties.xml
 delete mode 100644 jca/example/build-properties.xml.temp
 delete mode 100644 jca/example/build.xml
 delete mode 100644 jca/example/conf/application.xml
 delete mode 100644 jca/example/conf/ejb-jar.xml
 delete mode 100644 jca/example/conf/geronimo-application.xml
 delete mode 100644 jca/example/conf/geronimo-ra.xml
 delete mode 100644 jca/example/conf/glassfish-ejb-jar.xml
 delete mode 100644 jca/example/conf/glassfish-resources.xml
 delete mode 100644 jca/example/conf/glassfish-web.xml
 delete mode 100644 jca/example/conf/jboss-ejb-client.properties
 delete mode 100644 jca/example/conf/jboss-web.xml
 delete mode 100644 jca/example/conf/jboss.xml
 delete mode 100644 jca/example/conf/log4j.properties
 delete mode 100644 jca/example/conf/qpid-jca-ds.xml
 delete mode 100644 jca/example/conf/qpid-standalone.xml
 delete mode 100644 jca/example/conf/web.xml
 delete mode 100644 jca/example/qpid-jca-example-properties.xml
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestUtil.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTest.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestLocal.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestRemote.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidUtil.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidRequestResponseServlet.java
 delete mode 100644 jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidTestServlet.java
 delete mode 100644 jca/pom.xml
 delete mode 100644 jca/rar/pom.xml
 delete mode 100644 jca/rar/src/main/resources/META-INF/jboss-ra.xml
 delete mode 100755 jca/rar/src/main/resources/META-INF/ra.xml
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryObjectFactory.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRABytesMessage.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactory.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactoryImpl.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionManager.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionMetaData.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRACredential.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAException.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRALocalTransaction.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAMCFProperties.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnection.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAMapMessage.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAMessage.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAMessageConsumer.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAMessageListener.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAMessageProducer.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAMetaData.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAObjectMessage.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAQueueBrowser.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAQueueReceiver.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAQueueSender.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRASession.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAStreamMessage.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRATextMessage.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRATopicPublisher.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRATopicSubscriber.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/Util.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/admin/QpidBindingURL.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/admin/QpidDestinationProxy.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/admin/QpidQueue.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/admin/QpidQueueImpl.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/admin/QpidTopic.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/admin/QpidTopicImpl.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/inflow/QpidExceptionHandler.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/inflow/QpidMessageHandler.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/tm/GeronimoTransactionManagerLocator.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/tm/GlassfishTransactionManagerLocator.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/tm/JBossTransactionManagerLocator.java
 delete mode 100644 jca/src/main/java/org/apache/qpid/ra/tm/WLSTransactionManagerLocator.java
 delete mode 100644 jca/src/test/java/org/apache/qpid/ra/QpidActivationSpecTest.java
 delete mode 100644 jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
 create mode 100644 joramtests/src/test/resources/jms-client/surefire.excludes
 create mode 100644 joramtests/src/test/resources/qpid-amqp-1-0-client-jms/surefire.excludes
 create mode 100644 joramtests/src/test/resources/qpid-jms-client/surefire.excludes
 delete mode 100644 management/common/pom.xml
 delete mode 100644 management/common/src/main/java/management-common.bnd
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
 delete mode 100644 management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
 delete mode 100644 management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
 delete mode 100644 management/example/pom.xml
 delete mode 100644 management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java
 delete mode 100644 management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java
 delete mode 100644 management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
 create mode 100644 perftests/etc/chartdefs/timeseries/combined_competing_consumers_plain.chartdef
 delete mode 100644 perftests/etc/chartdefs/timeseries/combined_persistent_transaction.chartdef
 create mode 100644 perftests/etc/chartdefs/timeseries/combined_persistent_transaction_plain.chartdef
 create mode 100644 perftests/etc/chartdefs/timeseries/combined_persistent_transaction_ssl.chartdef
 delete mode 100644 perftests/etc/chartdefs/timeseries/combined_transient_autoack.chartdef
 create mode 100644 perftests/etc/chartdefs/timeseries/combined_transient_autoack_plain.chartdef
 create mode 100644 perftests/etc/chartdefs/timeseries/combined_transient_autoack_ssl.chartdef
 create mode 100644 perftests/etc/chartdefs/timeseries/combined_transient_transaction_plain.chartdef
 create mode 100644 perftests/etc/chartdefs/timeseries/combined_transient_transaction_ssl.chartdef
 delete mode 100644 perftests/etc/perftests-jndi.properties
 delete mode 100644 perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
 create mode 100644 perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreatorFactory.java
 create mode 100644 perftests/src/main/java/org/apache/qpid/disttest/jms/QpidRestAPIQueueCreator.java
 create mode 100644 perftests/src/test/resources/jms-client/jndi.properties
 create mode 100644 perftests/src/test/resources/logback-test.xml
 create mode 100644 perftests/src/test/resources/qpid-jms-client/jndi.properties
 create mode 100644 perftests/visualisation-jfc/src/test/resources/logback-test.xml
 delete mode 100644 qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java
 delete mode 100644 qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java
 create mode 100644 qpid-test-utils/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java
 delete mode 100644 specs/LICENSE
 delete mode 100644 specs/NOTICE
 create mode 100644 systests/end-to-end-conversion-tests/pom.xml
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/ClientInstructionBuilder.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/EndToEndConversionTestBase.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/Client.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/ClientInstruction.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/ClientResult.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/ConfigureDestination.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/ConfigureJndiContext.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessageCreator.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessageDescription.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessageVerifier.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/MessagingInstruction.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/SerializableTestClass.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/client/VerificationException.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/dependency_resolution/Booter.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/dependency_resolution/ClasspathQuery.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/dependency_resolution/ConsoleRepositoryListener.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/dependency_resolution/ConsoleTransferListener.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/dependency_resolution/ManualRepositorySystemFactory.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/java/org/apache/qpid/systests/end_to_end_conversion/utils/LoggingOutputStream.java
 create mode 100644 systests/end-to-end-conversion-tests/src/main/resources/config-end-to-end-conversion-tests.json
 create mode 100644 systests/end-to-end-conversion-tests/src/main/resources/logback-test.xml
 create mode 100644 systests/end-to-end-conversion-tests/src/test/java/org/apache/qpid/systests/end_to_end_conversion/SimpleConversionTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/pom.xml
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameTransport.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/HeaderResponse.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/InputHandler.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/InteractionTransactionalState.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Matchers.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/MessageDecoder.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/MessageEncoder.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/OutputHandler.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/PerformativeResponse.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Response.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/SaslPerformativeResponse.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/SpecificationTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Utils.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketFrameTransport.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/main/resources/config-protocol-tests.json
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/bindmapjms/TemporaryDestinationTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicy.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/MixedPolicy.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicy.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/websocket/WebSocketTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/DeleteOnCloseTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MessageFormat.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/MultiTransferTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/OutcomeTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/TransferTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/DischargeTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/ProtocolHeaderTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/connection/OpenTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/FlowTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java
 create mode 100644 systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/session/BeginTest.java
 create mode 100644 systests/qpid-systests-jms_2.0/pom.xml
 create mode 100644 systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/connection/ConnectionTest.java
 create mode 100644 systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/deliverycount/DeliveryCountTest.java
 create mode 100644 systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/deliverydelay/DeliveryDelayTest.java
 create mode 100644 systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/package-info.java
 create mode 100644 systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
 create mode 100644 systests/src/main/java/org/apache/qpid/test/utils/AbstractBrokerHolder.java
 create mode 100644 systests/src/main/java/org/apache/qpid/test/utils/AmqpManagementFacade.java
 create mode 100644 systests/src/main/java/org/apache/qpid/test/utils/ConnectionBuilder.java
 delete mode 100644 systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
 create mode 100644 systests/src/main/java/org/apache/qpid/test/utils/JmsProvider.java
 create mode 100644 systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClient0xConnectionBuilder.java
 create mode 100644 systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClient0xProvider.java
 create mode 100644 systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClientConnectionBuilder.java
 create mode 100644 systests/src/main/java/org/apache/qpid/test/utils/QpidJmsClientProvider.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/client/connection/ExistingSocketTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/client/message/JmsObjectMessageTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
 create mode 100644 systests/src/test/java/org/apache/qpid/client/message/ObjectMessageClassWhitelistingTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxyTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/server/logging/BindingLoggingTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/queue/ConsumerPriorityTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/queue/FlowToDiskTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/queue/NodeAutoCreationPolicyTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/routing/AlternateBindingRoutingTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/routing/ExchangeRoutingTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/security/acl/Amqp0xMessagingACLTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/security/acl/MessagingACLTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManagerTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/security/auth/manager/MD5AuthenticationManagerTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSha1AuthenticationManagerTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSha256AuthenticationManagerTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/AnonymousProducerTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/MessageRoutingTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/BasicAuthRestTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/BindingRestTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/ExportImportMessagesRestTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/PreemtiveAuthRestTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/PreferencesRestTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/QueryRestTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/SessionRestTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/acl/UserPreferencesRestACLTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/systest/rest/acl/VirtualHostAccessControlProviderRestTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/test/client/ConsumerFlowControlTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/test/client/ProducerFlowControlTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/test/client/queue/LVQTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/test/client/queue/QueueReceiverTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/test/unit/message/ForeignMessageTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSubscriberTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java
 delete mode 100644 systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/test/utils/SpawnedBrokerHolderTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/transport/ConnectionEstablishmentTest.java
 create mode 100644 systests/src/test/java/org/apache/qpid/transport/TestSender.java
 create mode 100644 systests/src/test/java/org/apache/qpid/util/AMQExceptionTestUtil.java
 create mode 100644 systests/systests-utils/pom.xml
 create mode 100644 systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java
 create mode 100644 systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdminFactory.java
 create mode 100644 systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdminUsingTestBase.java
 create mode 100644 systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/EmbeddedBrokerPerClassAdminImpl.java
 create mode 100644 systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ExternalQpidBrokerAdminImpl.java
 create mode 100644 systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/QpidTestRunner.java
 create mode 100644 tck/pom.xml
 create mode 100644 tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java
 create mode 100644 tck/src/test/resources/jms-client/jndi.properties
 create mode 100644 tck/src/test/resources/qpid-jms-client/jndi.properties
 create mode 100644 tck/src/test/resources/qpid-jms20-client/jndi.properties
 create mode 100644 tck/src/test/resources/resources.json
 create mode 100755 tck/src/test/resources/ts.jte
 create mode 100644 test-profiles/Java10BrokenTestsExcludes
 create mode 100644 test-profiles/Java10Excludes
 create mode 100644 test-profiles/Java10UninvestigatedTestsExcludes
 delete mode 100644 test-profiles/XAExcludes
 create mode 100644 test-profiles/apache-ci.test.overridden.properties
 create mode 100644 test-profiles/python_tests/Java10PythonExcludes
 create mode 100644 test-profiles/test-provider-1-0.properties
 create mode 100644 test-profiles/test_resources/ssl/expired.crt
 create mode 100644 test-profiles/test_resources/ssl/java_broker_expired_truststore.jks
 create mode 100644 test-profiles/test_resources/ssl/java_client_expired_keystore.jks
 delete mode 100644 tools/README.txt
 delete mode 100755 tools/bin/Profile-run-from-source
 delete mode 100755 tools/bin/check-qpid-java-env
 delete mode 100755 tools/bin/jms-quick-perf-report
 delete mode 100755 tools/bin/mercury-controller
 delete mode 100755 tools/bin/mercury-start-consumers
 delete mode 100755 tools/bin/mercury-start-producers
 delete mode 100755 tools/bin/qpid-bench
 delete mode 100755 tools/bin/qpid-jms-benchmark
 delete mode 100755 tools/bin/qpid-jms-receive
 delete mode 100755 tools/bin/qpid-jms-send
 delete mode 100755 tools/bin/qpid-python-testkit
 delete mode 100755 tools/bin/run-pub
 delete mode 100755 tools/bin/run-sub
 delete mode 100755 tools/bin/testkit.py
 delete mode 100644 tools/etc/perf-report.gnu
 delete mode 100644 tools/src/main/java/org/apache/qpid/testkit/Client.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/testkit/ErrorHandler.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/testkit/Receiver.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/testkit/Sender.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/Clock.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/JMXStressTestClient.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/JNDICheck.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/JVMArgConfiguration.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/MercuryBase.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/MercuryConsumerController.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/MercuryProducerController.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/MercuryTestController.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/MessageFactory.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/QpidBench.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/QpidReceive.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/QpidSend.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/TestConfiguration.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/report/BasicReporter.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/report/MercuryReporter.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/report/Reporter.java
 delete mode 100644 tools/src/main/java/org/apache/qpid/tools/report/Statistics.java
 create mode 100644 tools/src/main/resources/stress-test-client-qpid-jms-client-0-x.properties
 create mode 100644 tools/src/main/resources/stress-test-client-qpid-jms-client.properties
 delete mode 100644 tools/src/main/resources/stress-test-client.properties

-- 
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