qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1560634 [1/7] - in /qpid/branches/java-broker-bdb-ha: ./ qpid/ qpid/bin/ qpid/cpp/ qpid/cpp/bindings/qmf2/examples/cpp/ qpid/cpp/bindings/qpid/dotnet/src/ qpid/cpp/bindings/qpid/dotnet/src/msvc10/ qpid/cpp/bindings/qpid/dotnet/src/msvc9/ q...
Date Thu, 23 Jan 2014 11:01:08 GMT
Author: kwall
Date: Thu Jan 23 11:01:02 2014
New Revision: 1560634

URL: http://svn.apache.org/r1560634
Log:
Merge changes from the trunk in revisions 1558036:1560619 using

svn merge -r 1558036:1560619 https://svn.apache.org/repos/asf/qpid/trunk


Added:
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Logger.cpp
      - copied unchanged from r1560619, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Logger.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Logger.h
      - copied unchanged from r1560619, qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/Logger.h
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
      - copied unchanged from r1560619, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterSupport.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
      - copied unchanged from r1560619, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/Filterable.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/InstanceProperties.java
      - copied unchanged from r1560619, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/InstanceProperties.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryInstanceProperties.java
      - copied unchanged from r1560619, qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryInstanceProperties.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/util/SystemUtils.java
      - copied unchanged from r1560619, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/SystemUtils.java
    qpid/branches/java-broker-bdb-ha/qpid/java/qpid-test-utils/src/main/resources/
      - copied from r1560619, qpid/trunk/qpid/java/qpid-test-utils/src/main/resources/
Removed:
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FilterSupport.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/InboundMessage.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/Filterable.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/registry/
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/access/
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/rmi/
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/TransferMessageReference.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessageReference.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ContentHeaderBodyAdapter.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/store/
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/systest/
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/systest/
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/CommonContentHeaderProperties.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderProperties.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ContentChunk.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/mina/
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/failure/
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
Modified:
    qpid/branches/java-broker-bdb-ha/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh
    qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
    qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/python/qpid_messaging.i
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/CMakeLists.txt   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/check-abi
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/legacystore.cmake
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/linearstore.cmake
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/amqp/descriptors.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/Exchange.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/PagedQueue.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/PagedQueue.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/QueueFactory.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/Selector.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/System.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Connection.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Session.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Session.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/client/SslConnector.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/client/TCPConnector.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/framing/ProtocolVersion.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/framing/Uuid.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/framing/Uuid.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/BrokerReplicator.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/Membership.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/Primary.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/StatusCheck.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/ha/StatusCheck.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/ISSUES
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/Checksum.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/sys/MemoryMappedFile.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/sys/windows/uuid.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/sys/windows/uuid.h
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/qpid/types/Uuid.cpp
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/CMakeLists.txt
    qpid/branches/java-broker-bdb-ha/qpid/cpp/src/tests/Uuid.cpp
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/java-broker/Java-Broker-Concepts-Exchanges.xml
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/java-broker/Java-Broker-High-Availability.xml
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/java-broker/Java-Broker-Queues-OtherTypes.xml
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/java-broker/commonEntities.xml
    qpid/branches/java-broker-bdb-ha/qpid/doc/book/src/jms-client-0-8/commonEntities.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/jmx/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/systests/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultExchange.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/Exchange.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManager.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/MessageFilter.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/NoConsumerFilter.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/SimpleFilterManager.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacade.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AMQMessageHeader.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageReference.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/AMQSessionModel.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/DefaultUpgraderProvider.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/log4j/LoggingManagementFacadeTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataType.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageConverter_v0_10.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/IncomingMessage.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/SubscriptionImpl.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/MockStoredMessage.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Connection_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ExchangeDestination.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Message_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/derby-store/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/jdbc-store/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-http/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/management-jmx/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/broker/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/client/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
    qpid/branches/java-broker-bdb-ha/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
    qpid/branches/java-broker-bdb-ha/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
    qpid/branches/java-broker-bdb-ha/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java
    qpid/branches/java-broker-bdb-ha/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
    qpid/branches/java-broker-bdb-ha/qpid/java/ivy.nexus.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
    qpid/branches/java-broker-bdb-ha/qpid/java/jca/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/jca/rar/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/perftests/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/qpid-test-utils/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/Java010Excludes
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-8.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-10.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-8.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9-1.testprofile   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-bdb.0-9.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-10.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-8.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9-1.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-mem.0-9.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-8.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby-spawn.0-9.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-10.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-8.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9-1.testprofile   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-dby.0-9.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-8.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms-spawn.0-9.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-10.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-8.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9-1.testprofile   (contents, props changed)
    qpid/branches/java-broker-bdb-ha/qpid/java/test-profiles/java-mms.0-9.testprofile
    qpid/branches/java-broker-bdb-ha/qpid/java/tools/pom.xml
    qpid/branches/java-broker-bdb-ha/qpid/python/   (props changed)
    qpid/branches/java-broker-bdb-ha/qpid/python/qpid/compat.py
    qpid/branches/java-broker-bdb-ha/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py
    qpid/branches/java-broker-bdb-ha/qpid/tools/src/py/qls/jrnl.py

Propchange: qpid/branches/java-broker-bdb-ha/
------------------------------------------------------------------------------
  Merged /qpid/trunk:r1558037-1560619

Propchange: qpid/branches/java-broker-bdb-ha/qpid/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid:r1558037-1560619

Modified: qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/bin/release.sh Thu Jan 23 11:01:02 2014
@@ -258,6 +258,7 @@ if [ "JAVA" == "$JAVA" ] ; then
   cp -a qpid-${VER}/java/jca/release/maven artifacts/
   cp -a qpid-${VER}/java/amqp-1-0-client/release/maven artifacts/
   cp -a qpid-${VER}/java/amqp-1-0-client-jms/release/maven artifacts/
+  cp -a qpid-${VER}/java/amqp-1-0-client-websocket/release/maven artifacts/
   cp -a qpid-${VER}/java/amqp-1-0-common/release/maven artifacts/
   cp -a qpid-${VER}/java/client/release/maven artifacts/
   cp -a qpid-${VER}/java/common/release/maven artifacts/
@@ -279,6 +280,7 @@ if [ "JAVA" == "$JAVA" ] ; then
   cp -a qpid-${VER}/java/broker-plugins/management-http/release/maven artifacts/
   cp -a qpid-${VER}/java/broker-plugins/management-jmx/release/maven artifacts/
   cp -a qpid-${VER}/java/broker-plugins/memory-store/release/maven artifacts/
+  cp -a qpid-${VER}/java/broker-plugins/websocket/release/maven artifacts/
   cp -a qpid-${VER}/java/bdbstore/jmx/release/maven artifacts/
 fi
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0 (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/AMQP_1.0 Thu Jan 23 11:01:02 2014
@@ -163,7 +163,8 @@ warning is logged.
 
 If the node is an exchange, then an outgoing link (i.e. messages to
 travel out from broker) will cause a temporary, link-scoped queue to
-be created on the broker and bound to the exchange.
+be created on the broker and bound to the exchange. [See section on
+'Topics' below]
 
 Outgoing links may have a filter set on their source. The filters
 currently supported by the broker are 'legacy-amqp-direct-binding',
@@ -282,4 +283,27 @@ exchange the 'legacy-amqp-direct-binding
 references a queue or a topic exchange, 'legacy-amqp-topic-binding'
 will be added.
 
+* Topics: a mechanism for controlling subscription queues
+
+As there is no standard or obvious mechanism through which to
+configure subscription queues in AMQP 1.0, a new broker entity of type
+'topic' has been added.
+
+A topic references an existing exchange and additionally specifies the
+queue options to use when creating the subscription queue for any
+receiver link attached to that topic. There can be topics with
+different names all referencing the same exchange where different
+policies should be applied to queues.
+
+Topics can be created and deleted using the qpid-config tool, e.g.
+
+  qpid-config add topic my-topic --argument exchange=amq.topic\
+      --argument qpid.max_count=500 --argument qpid.policy_type=self-destruct
+
+If a receiver is established for address 'my-topic/my-key' over 1.0
+now, it will result in a subscription queue being created with a limit
+of 500 messages, that deletes itself (thus ending the subscription) if
+that limit is exceeded and is bound to 'amq.topic' with the key
+'my-key'.
+
 [1] https://issues.apache.org/jira/browse/QPID-4710

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp Thu Jan 23 11:01:02 2014
@@ -178,6 +178,8 @@ void ExampleAgent::run()
             case AGENT_METHOD:
                 running = method(event);
                 break;
+            default:
+                break;
             }
         }
     }

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp Thu Jan 23 11:01:02 2014
@@ -267,6 +267,56 @@ namespace Messaging {
         }
     }
 
+
+    void Connection::Reconnect(System::String ^ url)
+    {
+        System::Exception ^ newException = nullptr;
+
+        try
+        {
+            msclr::lock lk(privateLock);
+            ThrowIfDisposed();
+
+            std::string nativeUrl = QpidMarshal::ToNative(url);
+            nativeObjPtr->reconnect(nativeUrl);
+        }
+        catch (const ::qpid::types::Exception & error)
+        {
+            String ^ errmsg = gcnew String(error.what());
+            newException    = gcnew QpidException(errmsg);
+        }
+
+        if (newException != nullptr)
+        {
+            throw newException;
+        }
+    }
+
+
+    void Connection::Reconnect()
+    {
+        System::Exception ^ newException = nullptr;
+
+        try
+        {
+            msclr::lock lk(privateLock);
+            ThrowIfDisposed();
+
+            nativeObjPtr->reconnect();
+        }
+        catch (const ::qpid::types::Exception & error)
+        {
+            String ^ errmsg = gcnew String(error.what());
+            newException    = gcnew QpidException(errmsg);
+        }
+
+        if (newException != nullptr)
+        {
+            throw newException;
+        }
+    }
+
+
     //
     // CreateTransactionalSession()
     //

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.h?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.h (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Connection.h Thu Jan 23 11:01:02 2014
@@ -129,6 +129,20 @@ namespace Messaging {
             }
         }
 
+        void Reconnect(System::String ^ url);
+        void Reconnect();
+        
+        property System::String ^ Url
+        {
+            System::String ^ get()
+            {
+                msclr::lock lk(privateLock);
+                ThrowIfDisposed();
+
+                return gcnew System::String(nativeObjPtr->getUrl().c_str());
+            }
+        }
+
         // CreateTransactionalSession()
         Session ^ CreateTransactionalSession();
         Session ^ CreateTransactionalSession(System::String ^ name);

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Duration.h?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Duration.h (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Duration.h Thu Jan 23 11:01:02 2014
@@ -42,14 +42,14 @@ namespace Messaging {
 
     public:
 
-        Duration(const Duration % rhs) :
-            milliseconds(rhs.milliseconds) {}
+        Duration(const Duration % rhs)
+            : milliseconds(rhs.milliseconds) {}
 
-        explicit Duration(System::UInt64 mS) :
-            milliseconds(mS) {}
+        explicit Duration(System::UInt64 mS)
+            : milliseconds(mS) {}
 
-        Duration()                           :
-            milliseconds(System::UInt64::MaxValue) {}
+        Duration()
+            : milliseconds(System::UInt64::MaxValue) {}
 
         property System::UInt64 Milliseconds
         {

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp Thu Jan 23 11:01:02 2014
@@ -404,6 +404,32 @@ namespace Messaging {
         }
     }
 
+    
+    void Message::SetContentObject(System::Object ^ managedObject)
+    {
+        msclr::lock lk(privateLock);
+        ThrowIfDisposed();
+
+        System::Exception ^ newException = nullptr;
+
+        try
+        {
+            ::qpid::types::Variant nativeObjValue;
+            TypeTranslator::ManagedToNativeObject(managedObject, nativeObjValue);
+            nativeObjPtr->setContentObject(nativeObjValue);
+        }
+        catch (const ::qpid::types::Exception & error)
+        {
+            String ^ errmsg = gcnew String(error.what());
+            newException    = gcnew QpidException(errmsg);
+        }
+
+        if (newException != nullptr)
+        {
+            throw newException;
+        }
+    }
+
 
     System::String ^ Message::GetContent()
     {
@@ -539,6 +565,31 @@ namespace Messaging {
     }
 
 
+    void Message::GetContentObject(System::Object ^ managedObject)
+    {
+        msclr::lock lk(privateLock);
+        ThrowIfDisposed();
+
+        System::Exception ^ newException = nullptr;
+
+        try
+        {
+            ::qpid::types::Variant nativeObject = nativeObjPtr->getContentObject();
+
+            managedObject = TypeTranslator::NativeToManagedObject(nativeObject);
+        }
+        catch (const ::qpid::types::Exception & error)
+        {
+            String ^ errmsg = gcnew String(error.what());
+            newException    = gcnew QpidException(errmsg);
+        }
+
+        if (newException != nullptr)
+        {
+            throw newException;
+        }
+    }
+    
     System::String ^ Message::MapAsString(System::Collections::Generic::Dictionary<
         System::String^, System::Object^> ^ dict)
     {

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.h?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.h (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Message.h Thu Jan 23 11:01:02 2014
@@ -29,6 +29,7 @@
 #include "QpidMarshal.h"
 #include "Address.h"
 #include "Duration.h"
+#include "QpidException.h"
 #include "TypeTranslator.h"
 
 namespace Org {
@@ -376,17 +377,27 @@ namespace Messaging {
                 msclr::lock lk(privateLock);
                 ThrowIfDisposed();
 
-                ::qpid::types::Variant::Map map;
+                System::Exception ^ newException = nullptr;
 
-                map = nativeObjPtr->getProperties();
-
-                System::Collections::Generic::Dictionary<
-                    System::String^, System::Object^> ^ dict =
-                    gcnew System::Collections::Generic::Dictionary<
-                    System::String^, System::Object^> ;
+                System::Collections::Generic::Dictionary<System::String^, System::Object^> ^ dict =
+                    gcnew System::Collections::Generic::Dictionary<System::String^, System::Object^> ;
 
+                try
+                {
+                    ::qpid::types::Variant::Map map;
+                    map = nativeObjPtr->getProperties();
+                    TypeTranslator::NativeToManaged(map, dict);
+                }
+                catch (const ::qpid::types::Exception & error)
+                {
+                    String ^ errmsg = gcnew String(error.what());
+                    newException    = gcnew QpidException(errmsg);
+                }
 
-                TypeTranslator::NativeToManaged(map, dict);
+                if (newException != nullptr)
+                {
+                    throw newException;
+                }
 
                 return dict;
             }
@@ -398,10 +409,23 @@ namespace Messaging {
                 msclr::lock lk(privateLock);
                 ThrowIfDisposed();
 
-                for each (System::Collections::Generic::KeyValuePair
-                    <System::String^, System::Object^> kvp in properties)
+                System::Exception ^ newException = nullptr;
+
+                try
+                {
+                    ::qpid::types::Variant::Map variantMap;
+                    TypeTranslator::ManagedToNative(properties, variantMap);
+                    nativeObjPtr->setProperties(variantMap);
+                }
+                catch (const ::qpid::types::Exception & error)
                 {
-                    SetProperty(kvp.Key, kvp.Value);
+                    String ^ errmsg = gcnew String(error.what());
+                    newException    = gcnew QpidException(errmsg);
+                }
+
+                if (newException != nullptr)
+                {
+                    throw newException;
                 }
             }
         }
@@ -413,7 +437,7 @@ namespace Messaging {
 
         void SetContent(cli::array<System::Byte> ^ bytes, int offset, int size);
 
-        //TODO:: void setContent(Bytes{} bytes, offset, length);
+        void SetContentObject(System::Object ^ managedObject);
 
         // get content as string
         System::String ^ GetContent();
@@ -430,6 +454,9 @@ namespace Messaging {
         // get content as bytes
         void GetContent(cli::array<System::Byte> ^ arr);
 
+        // get content as object
+        void GetContentObject(System::Object ^ object);
+
         //
         // ContentSize
         //

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h Thu Jan 23 11:01:02 2014
@@ -29,13 +29,13 @@ using namespace System;
 [Serializable]
 public ref class QpidException : System::Exception
 {
- public:
+public:
 
- QpidException()
-    : System::Exception() {}
+    QpidException()
+        : System::Exception() {}
 
- QpidException(String^ estring)
-    : System::Exception(estring) {}
+    QpidException(String^ estring)
+        : System::Exception(estring) {}
 
 };
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp Thu Jan 23 11:01:02 2014
@@ -29,6 +29,7 @@
 #include "qpid/messaging/exceptions.h"
 
 #include "Receiver.h"
+#include "Address.h"
 #include "Session.h"
 #include "Message.h"
 #include "Duration.h"
@@ -53,8 +54,8 @@ namespace Messaging {
 
     // unmanaged clone
     Receiver::Receiver(const ::qpid::messaging::Receiver & r,
-        Org::Apache::Qpid::Messaging::Session ^ sessRef) :
-    parentSession(sessRef)
+        Org::Apache::Qpid::Messaging::Session ^ sessRef)
+        : parentSession(sessRef)
     {
         System::Exception ^ newException = nullptr;
 
@@ -102,8 +103,8 @@ namespace Messaging {
 
 
     // Copy constructor look-alike (C#)
-    Receiver::Receiver(const Receiver ^ receiver) :
-    parentSession(receiver->parentSession)
+    Receiver::Receiver(const Receiver ^ receiver)
+        : parentSession(receiver->parentSession)
     {
         System::Exception ^ newException = nullptr;
 
@@ -126,8 +127,8 @@ namespace Messaging {
     }
 
     // Copy constructor implicitly dereferenced (C++)
-    Receiver::Receiver(const Receiver % receiver) :
-    parentSession(receiver.parentSession)
+    Receiver::Receiver(const Receiver % receiver)
+        : parentSession(receiver.parentSession)
     {
         System::Exception ^ newException = nullptr;
 
@@ -349,10 +350,10 @@ namespace Messaging {
 
         try
         {
-			msclr::lock lk(privateLock);
-			ThrowIfDisposed();
+            msclr::lock lk(privateLock);
+            ThrowIfDisposed();
 
-			nativeObjPtr->close();
+            nativeObjPtr->close();
         }
         catch (const ::qpid::types::Exception & error)
         {
@@ -374,4 +375,44 @@ namespace Messaging {
             throw newException;
         }
     }
+
+    Org::Apache::Qpid::Messaging::Address ^ Receiver::GetAddress()
+    {
+        msclr::lock lk(privateLock);
+        ThrowIfDisposed();
+
+        System::Exception           ^ newException = nullptr;
+        Messaging::Address          ^ newAddress   = nullptr;
+
+        try
+        {
+            // fetch unmanaged Address
+            ::qpid::messaging::Address addr =
+                nativeObjPtr->getAddress();
+
+            // create a managed Address
+            newAddress = gcnew Address(addr);
+        }
+        catch (const ::qpid::types::Exception & error)
+        {
+            String ^ errmsg = gcnew String(error.what());
+            newException    = gcnew QpidException(errmsg);
+        }
+        finally
+        {
+            if (newException != nullptr)
+            {
+                if (newAddress != nullptr)
+                {
+                    delete newAddress;
+                }
+            }
+        }
+        if (newException != nullptr)
+        {
+            throw newException;
+        }
+
+        return newAddress;
+    }
 }}}}

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h Thu Jan 23 11:01:02 2014
@@ -25,6 +25,7 @@
 #include <limits>
 
 #include "qpid/messaging/Receiver.h"
+#include "qpid/messaging/Address.h"
 #include "qpid/messaging/Session.h"
 #include "qpid/messaging/Message.h"
 #include "qpid/messaging/Duration.h"
@@ -44,6 +45,7 @@ namespace Messaging {
     /// Receiver is a managed wrapper for a ::qpid::messaging::Receiver
     /// </summary>
 
+    ref class Address;
     ref class Session;
     ref class Message;
     ref class Duration;
@@ -232,5 +234,10 @@ namespace Messaging {
                 return parentSession;
             }
         }
+
+        //
+        // Address
+        //
+        Org::Apache::Qpid::Messaging::Address ^ GetAddress();
     };
 }}}}

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp Thu Jan 23 11:01:02 2014
@@ -23,11 +23,13 @@
 #include <string>
 #include <limits>
 
+#include "qpid/messaging/Address.h"
 #include "qpid/messaging/Sender.h"
 #include "qpid/messaging/Session.h"
 #include "qpid/messaging/Message.h"
 
 #include "Sender.h"
+#include "Address.h"
 #include "Message.h"
 #include "QpidException.h"
 
@@ -50,8 +52,8 @@ namespace Messaging {
 
     // unmanaged clone
     Sender::Sender(const ::qpid::messaging::Sender & s,
-        Org::Apache::Qpid::Messaging::Session ^ sessRef) :
-    parentSession(sessRef)
+        Org::Apache::Qpid::Messaging::Session ^ sessRef)
+        : parentSession(sessRef)
     {
         System::Exception ^ newException = nullptr;
 
@@ -199,4 +201,44 @@ namespace Messaging {
             throw newException;
         }
     }
+
+    Org::Apache::Qpid::Messaging::Address ^ Sender::GetAddress()
+    {
+        msclr::lock lk(privateLock);
+        ThrowIfDisposed();
+
+        System::Exception           ^ newException = nullptr;
+        Messaging::Address          ^ newAddress   = nullptr;
+
+        try
+        {
+            // fetch unmanaged Address
+            ::qpid::messaging::Address addr =
+                nativeObjPtr->getAddress();
+
+            // create a managed Address
+            newAddress = gcnew Address(addr);
+        }
+        catch (const ::qpid::types::Exception & error)
+        {
+            String ^ errmsg = gcnew String(error.what());
+            newException    = gcnew QpidException(errmsg);
+        }
+        finally
+        {
+            if (newException != nullptr)
+            {
+                if (newAddress != nullptr)
+                {
+                    delete newAddress;
+                }
+            }
+        }
+        if (newException != nullptr)
+        {
+            throw newException;
+        }
+
+        return newAddress;
+    }
 }}}}

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.h?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.h (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Sender.h Thu Jan 23 11:01:02 2014
@@ -25,6 +25,7 @@
 #include <limits>
 
 #include "qpid/messaging/Sender.h"
+#include "qpid/messaging/Address.h"
 #include "qpid/messaging/Session.h"
 #include "qpid/messaging/Message.h"
 
@@ -43,6 +44,7 @@ namespace Messaging {
     /// Sender is a managed wrapper for a ::qpid::messaging::Sender
     /// </summary>
 
+    ref class Address;
     ref class Session;
     ref class Message;
 
@@ -188,5 +190,10 @@ namespace Messaging {
                 return parentSession;
             }
         }
+
+        //
+        // Address
+        //
+        Org::Apache::Qpid::Messaging::Address ^ GetAddress();
     };
 }}}}

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp Thu Jan 23 11:01:02 2014
@@ -55,8 +55,8 @@ namespace Messaging {
 
     // unmanaged clone
     Session::Session(const ::qpid::messaging::Session & session,
-        Org::Apache::Qpid::Messaging::Connection ^ connRef) :
-    parentConnectionp(connRef)
+        Org::Apache::Qpid::Messaging::Connection ^ connRef)
+        : parentConnectionp(connRef)
     {
         System::Exception ^ newException = nullptr;
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp Thu Jan 23 11:01:02 2014
@@ -42,8 +42,9 @@ namespace Messaging {
     // The given object is a Dictionary.
     // Add its elements to the qpid map.
     //
-    void TypeTranslator::ManagedToNative(QpidMap ^ theDictionary,
-                                         ::qpid::types::Variant::Map & qpidMap)
+    void TypeTranslator::ManagedToNative(
+        QpidMap ^ theDictionary,
+        ::qpid::types::Variant::Map & qpidMap)
     {
         // iterate the items, converting each to a variant and adding to the map
         for each (System::Collections::Generic::KeyValuePair
@@ -107,8 +108,9 @@ namespace Messaging {
     // The given object is a List.
     // Add its elements to the qpid list.
     //
-    void TypeTranslator::ManagedToNative(QpidList ^ theList,
-                                         ::qpid::types::Variant::List & qpidList)
+    void TypeTranslator::ManagedToNative(
+        QpidList ^ theList,
+        ::qpid::types::Variant::List & qpidList)
     {
         // iterate the items, converting each to a variant and adding to the map
         for each (System::Object ^ listObj in theList)
@@ -162,8 +164,9 @@ namespace Messaging {
     // Returns a variant representing simple native type object.
     // Not to be called for Map/List objects.
     //
-    void TypeTranslator::ManagedToNativeObject(System::Object ^ managedValue,
-                               ::qpid::types::Variant & qpidVariant)
+    void TypeTranslator::ManagedToNativeObject(
+        System::Object ^ managedValue,
+        ::qpid::types::Variant & qpidVariant)
     {
         System::Type     ^ typeP    = (*managedValue).GetType();
         System::TypeCode   typeCode = System::Type::GetTypeCode( typeP );
@@ -257,199 +260,161 @@ namespace Messaging {
     // Given a user Dictionary and a qpid map,
     //   extract the qpid elements and put them into the dictionary.
     //
-    void TypeTranslator::NativeToManaged(::qpid::types::Variant::Map & qpidMap,
-                                         QpidMap ^ dict)
+    void TypeTranslator::NativeToManaged(
+        ::qpid::types::Variant::Map & qpidMap,
+        QpidMap ^ dict)
     {
         // For each object in the message map,
         //  create a .NET object and add it to the dictionary.
-        for (::qpid::types::Variant::Map::const_iterator i = qpidMap.begin(); i != qpidMap.end(); ++i) {
-            // Get the name
+        for (::qpid::types::Variant::Map::const_iterator i = qpidMap.begin(); i != qpidMap.end(); ++i)
+        {
             System::String ^ elementName = gcnew String(i->first.c_str());
-
-            ::qpid::types::Variant     variant = i->second;
-            ::qpid::types::VariantType vType   = variant.getType();
-
-            switch (vType)
-            {
-            case ::qpid::types::VAR_VOID:
-                dict[elementName] = nullptr;
-                break;
-
-            case ::qpid::types::VAR_BOOL:
-                dict[elementName] = variant.asBool();
-                break;
-
-            case ::qpid::types::VAR_UINT8:
-                dict[elementName] = variant.asUint8();
-                break;
-
-            case ::qpid::types::VAR_UINT16:
-                dict[elementName] = variant.asUint16();
-                break;
-
-            case ::qpid::types::VAR_UINT32:
-                dict[elementName] = variant.asUint32();
-                break;
-
-            case ::qpid::types::VAR_UINT64:
-                dict[elementName] = variant.asUint64();
-                break;
-
-            case ::qpid::types::VAR_INT8:
-                dict[elementName] = variant.asInt8();
-                break;
-
-            case ::qpid::types::VAR_INT16:
-                dict[elementName] = variant.asInt16();
-                break;
-
-            case ::qpid::types::VAR_INT32:
-                dict[elementName] = variant.asInt32();
-                break;
-
-            case ::qpid::types::VAR_INT64:
-                dict[elementName] = variant.asInt64();
-                break;
-
-            case ::qpid::types::VAR_FLOAT:
-                dict[elementName] = variant.asFloat();
-                break;
-
-            case ::qpid::types::VAR_DOUBLE:
-                dict[elementName] = variant.asDouble();
-                break;
-
-            case ::qpid::types::VAR_STRING:
-                {
-                    System::String ^ elementValue = gcnew System::String(variant.asString().c_str());
-                    dict[elementName] = elementValue;
-                    break;
-                }
-            case ::qpid::types::VAR_MAP:
-                {
-                    QpidMap ^ newDict = gcnew QpidMap();
-
-                    NativeToManaged(variant.asMap(), newDict);
-
-                    dict[elementName] = newDict;
-                    break;
-                }
-
-            case ::qpid::types::VAR_LIST:
-                {
-                    QpidList ^ newList = gcnew QpidList();
-
-                    NativeToManaged(variant.asList(), newList);
-
-                    dict[elementName] = newList;
-                    break;
-                }
-
-            case ::qpid::types::VAR_UUID:
-                {
-                    System::String ^ elementValue = gcnew System::String(variant.asUuid().str().c_str());
-                    System::Guid ^ newGuid = System::Guid(elementValue);
-                    dict[elementName] = newGuid;
-                }
-                break;
-            }
+            ::qpid::types::Variant variant = i->second;
+            dict[elementName] = NativeToManagedObject(variant);
         }
     }
 
 
-    void TypeTranslator::NativeToManaged(::qpid::types::Variant::List & qpidList, QpidList ^ managedList)
+    void TypeTranslator::NativeToManaged(
+        ::qpid::types::Variant::List & qpidList,
+        QpidList ^ managedList)
     {
         // For each object in the qpidList
         //  create a .NET object and add it to the managed List.
         for (::qpid::types::Variant::List::const_iterator i = qpidList.begin(); i != qpidList.end(); ++i)
         {
             ::qpid::types::Variant     variant = *i;
-            ::qpid::types::VariantType vType   = variant.getType();
+            (*managedList).Add( NativeToManagedObject(variant) );
+        }
+    }
+
 
-            switch (vType)
+    System::Object ^ TypeTranslator::NativeToManagedObject(
+        ::qpid::types::Variant & nativeObject)
+    {
+        //  create a .NET object and return it
+        ::qpid::types::VariantType vType   = nativeObject.getType();
+        System::Object ^ managedObject = nullptr;
+
+        switch (vType)
+        {
+        case ::qpid::types::VAR_VOID:
             {
-            case ::qpid::types::VAR_VOID:
-                (*managedList).Add(nullptr);
                 break;
+            }
 
-            case ::qpid::types::VAR_BOOL:
-                (*managedList).Add(variant.asBool());
+        case ::qpid::types::VAR_BOOL:
+            {
+                bool result = nativeObject.asBool();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_UINT8:
-                (*managedList).Add(variant.asUint8());
+        case ::qpid::types::VAR_UINT8:
+            {
+                byte result = nativeObject.asUint8();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_UINT16:
-                (*managedList).Add(variant.asUint16());
+        case ::qpid::types::VAR_UINT16:
+            {
+                unsigned short result = nativeObject.asUint16();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_UINT32:
-                (*managedList).Add(variant.asUint32());
+        case ::qpid::types::VAR_UINT32:
+            {
+                unsigned long result = nativeObject.asUint32();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_UINT64:
-                (*managedList).Add(variant.asUint64());
+        case ::qpid::types::VAR_UINT64:
+            {
+                unsigned __int64 result = nativeObject.asUint64();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_INT8:
-                (*managedList).Add(variant.asInt8());
+        case ::qpid::types::VAR_INT8:
+            {
+                System::SByte result = nativeObject.asInt8();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_INT16:
-                (*managedList).Add(variant.asInt16());
+        case ::qpid::types::VAR_INT16:
+            {
+                short result = nativeObject.asInt16();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_INT32:
-                (*managedList).Add(variant.asInt32());
+        case ::qpid::types::VAR_INT32:
+            {
+                long result = nativeObject.asInt32();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_INT64:
-                (*managedList).Add(variant.asInt64());
+        case ::qpid::types::VAR_INT64:
+            {
+                __int64 result = nativeObject.asInt64();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_FLOAT:
-                (*managedList).Add(variant.asFloat());
+        case ::qpid::types::VAR_FLOAT:
+            {
+                float result = nativeObject.asFloat();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_DOUBLE:
-                (*managedList).Add(variant.asDouble());
+        case ::qpid::types::VAR_DOUBLE:
+            {
+                double result = nativeObject.asDouble();
+                managedObject = result;
                 break;
+            }
 
-            case ::qpid::types::VAR_STRING:
-                {
-                    System::String ^ elementValue = gcnew System::String(variant.asString().c_str());
-                    (*managedList).Add(elementValue);
-                    break;
-                }
-            case ::qpid::types::VAR_MAP:
-                {
-                    QpidMap ^ newDict = gcnew QpidMap();
-
-                    NativeToManaged(variant.asMap(), newDict);
+        case ::qpid::types::VAR_STRING:
+            {
+                System::String ^ elementValue = gcnew System::String(nativeObject.asString().c_str());
+                managedObject = elementValue;
+                break;
+            }
+        case ::qpid::types::VAR_MAP:
+            {
+                QpidMap ^ newDict = gcnew QpidMap();
 
-                    (*managedList).Add(newDict);
-                    break;
-                }
+                NativeToManaged(nativeObject.asMap(), newDict);
 
-            case ::qpid::types::VAR_LIST:
-                {
-                    QpidList ^ newList = gcnew QpidList();
+                managedObject = newDict;
+                break;
+            }
 
-                    NativeToManaged(variant.asList(), newList);
+        case ::qpid::types::VAR_LIST:
+            {
+                QpidList ^ newList = gcnew QpidList();
 
-                    (*managedList).Add(newList);
-                    break;
-                }
+                NativeToManaged(nativeObject.asList(), newList);
 
-            case ::qpid::types::VAR_UUID:
-                {
-                    System::String ^ elementValue = gcnew System::String(variant.asUuid().str().c_str());
-                    System::Guid ^ newGuid = System::Guid(elementValue);
-                    (*managedList).Add(newGuid);
-                }
+                managedObject = newList;
                 break;
             }
+
+        case ::qpid::types::VAR_UUID:
+            {
+                System::String ^ elementValue = gcnew System::String(nativeObject.asUuid().str().c_str());
+                System::Guid ^ newGuid = System::Guid(elementValue);
+                managedObject = newGuid;
+            }
+            break;
         }
+
+        return managedObject;
     }
 }}}}

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h Thu Jan 23 11:01:02 2014
@@ -45,27 +45,37 @@ namespace Messaging {
     public:
         // The given object is a managed Dictionary.
         // Add its elements to the qpid map.
-        static void ManagedToNative(QpidMap ^ theDictionary,
-                                    ::qpid::types::Variant::Map & qpidMap);
+        static void ManagedToNative(
+            QpidMap ^ theDictionary,
+            ::qpid::types::Variant::Map & qpidMap);
 
         // The given object is a managed List.
         // Add its elements to the qpid list.
-        static void ManagedToNative(QpidList ^ theList,
-                                    ::qpid::types::Variant::List & qpidList);
+        static void ManagedToNative(
+            QpidList ^ theList,
+            ::qpid::types::Variant::List & qpidList);
 
         // The given object is a simple managed type (not a Dictionary or List)
         // Returns a variant representing simple native type object.
-        static void ManagedToNativeObject(System::Object ^ managedValue,
-                                          ::qpid::types::Variant & qpidVariant);
+        static void ManagedToNativeObject(
+            System::Object ^ managedValue,
+            ::qpid::types::Variant & qpidVariant);
 
         // The given object is a qpid map.
         // Add its elements to the managed Dictionary.
-        static void NativeToManaged(::qpid::types::Variant::Map & qpidMap,
-                                    QpidMap ^ dict);
+        static void NativeToManaged(
+            ::qpid::types::Variant::Map & qpidMap,
+            QpidMap ^ dict);
 
         // The given object is a qpid list.
         // Add its elements to the managed List.
-        static void NativeToManaged(::qpid::types::Variant::List & qpidList,
-                                    QpidList ^ managedList);
+        static void NativeToManaged(
+            ::qpid::types::Variant::List & qpidList,
+            QpidList ^ managedList);
+
+        // The given object is a qpid Variant
+        // Return it as a managed System::Object
+        static System::Object ^ NativeToManagedObject(
+            ::qpid::types::Variant & nativeObject);
     };
 }}}}

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc10/org.apache.qpid.messaging.vcxproj Thu Jan 23 11:01:02 2014
@@ -300,6 +300,7 @@
     <ClCompile Include="$(QPID_BUILD_ROOT)\src\windows\generated_src\AssemblyInfo.cpp" />
     <ClCompile Include="..\Connection.cpp" />
     <ClCompile Include="..\FailoverUpdates.cpp" />
+    <ClCompile Include="..\Logger.cpp" />
     <ClCompile Include="..\Message.cpp" />
     <ClCompile Include="..\Receiver.cpp" />
     <ClCompile Include="..\Sender.cpp" />
@@ -311,6 +312,7 @@
     <ClInclude Include="..\Connection.h" />
     <ClInclude Include="..\Duration.h" />
     <ClInclude Include="..\FailoverUpdates.h" />
+    <ClInclude Include="..\Logger.h" />
     <ClInclude Include="..\Message.h" />
     <ClInclude Include="..\QpidException.h" />
     <ClInclude Include="..\QpidMarshal.h" />

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj Thu Jan 23 11:01:02 2014
@@ -542,6 +542,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Logger.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\Message.cpp"
 				>
 			</File>
@@ -584,6 +588,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Logger.h"
+				>
+			</File>
+			<File
 				RelativePath="..\Message.h"
 				>
 			</File>

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/python/qpid_messaging.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/python/qpid_messaging.i?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/python/qpid_messaging.i (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/bindings/qpid/python/qpid_messaging.i Thu Jan 23 11:01:02 2014
@@ -146,6 +146,7 @@ QPID_EXCEPTION(UnauthorizedAccess, Sessi
 %rename(_acknowledge_all) qpid::messaging::Session::acknowledge(bool);
 %rename(_acknowledge_msg) qpid::messaging::Session::acknowledge(
     Message &, bool);
+%rename(_next_receiver) qpid::messaging::Session::nextReceiver;
 
 %rename(_fetch) qpid::messaging::Receiver::fetch;
 %rename(unsettled) qpid::messaging::Receiver::getUnsettled;
@@ -245,6 +246,14 @@ QPID_EXCEPTION(UnauthorizedAccess, Sessi
             s = self._sender(target)
             s._setDurable(options.get("durable"))
             return s
+
+         def next_receiver(self, timeout=None) :
+             if timeout is None :
+                 return self._next_receiver()
+             else :
+                 # Python API uses timeouts in seconds,
+                 # but C++ API uses milliseconds
+                 return self._next_receiver(Duration(int(1000*timeout)))
     %}
 }
 

Propchange: qpid/branches/java-broker-bdb-ha/qpid/cpp/src/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/cpp/src:r1558037-1560619

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/src/CMakeLists.txt?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/src/CMakeLists.txt Thu Jan 23 11:01:02 2014
@@ -155,7 +155,12 @@ if (VALGRIND_FOUND)
 endif (VALGRIND_FOUND)
 
 # Do not keep on linking against transitive library dependencies
+# TODO Need to rework CMake files to use INTERFACE_LINK_LIBRARIES target property
+# When that is done we can remove the next 4 lines completely
 set (CMAKE_LINK_INTERFACE_LIBRARIES "")
+if (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS "2.8.12")
+  cmake_policy(SET CMP0022 OLD)
+endif (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS "2.8.12")
 
 if (CMAKE_COMPILER_IS_GNUCXX)
    # Warnings: Enable as many as possible, keep the code clean. Please
@@ -378,7 +383,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Windo
   endif (NOT CLOCK_GETTIME_IN_LIBC)
 
   # Ensure we have uuid library
-  CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID)
+  CHECK_LIBRARY_EXISTS (uuid uuid_generate "" HAVE_UUID)
   CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H)
   if (NOT HAVE_UUID AND NOT HAVE_UUID_H)
     message(FATAL_ERROR "Uuid library and/or header file not found")
@@ -1001,7 +1006,7 @@ add_msvc_version (qpidclient library dll
 
 add_library (qpidclient SHARED ${qpidclient_SOURCES})
 
-target_link_libraries (qpidclient qpidcommon
+target_link_libraries (qpidclient qpidcommon qpidtypes
                        ${Boost_PROGRAM_OPTIONS_LIBRARY}
                        ${ssl_LIBS})
 

Propchange: qpid/branches/java-broker-bdb-ha/qpid/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/cpp/src/CMakeLists.txt:r1558037-1560619

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/src/check-abi
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/src/check-abi?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/src/check-abi (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/src/check-abi Thu Jan 23 11:01:02 2014
@@ -19,12 +19,14 @@
 # under the License.
 #
 
+MKTEMP="mktemp /tmp/tmp.XXXXXXXXXX"
+
 # Ask the compiler the implementation specific type for a standard typedeffed type
 # (int64_t, size_t etc.). Operates by test compiling and using the demangling ABI call.
 #
 # This works for gcc and clang on Unix.
 full_type_of () {
-    prog=$(mktemp)
+    prog=$($MKTEMP)
     trap "rm $prog" EXIT
 
     ${CXX:-g++} -x c++ -o $prog - <<END-FILE
@@ -50,21 +52,24 @@ $prog
 }
 
 rc=0
-syms_desired=$(mktemp)
-syms_library=$(mktemp)
-syms_missing=$(mktemp)
-syms_extra=$(mktemp)
+syms_desired=$($MKTEMP)
+syms_library=$($MKTEMP)
+syms_missing=$($MKTEMP)
+syms_extra=$($MKTEMP)
 
 trap 'rm $syms_desired $syms_library $syms_missing $syms_extra' EXIT
 
 CXX=$1
 export CXX
 
+LC_ALL=C
+export LC_ALL
+
 # Extract exported symbols from library
 nm -DC --defined-only -f s $2 | cut -f1 -d'|' -s | sort -u > $syms_library
 
 # Process API syms (substitute in some typedefs etc.)
-sed $3 -e "
+sed -e "
     s/uint64_t/$(full_type_of uint64_t)/
     s/uint32_t/unsigned int/
     s/uint16_t/unsigned short/
@@ -78,7 +83,7 @@ sed $3 -e "
     s/qpid::types::Variant::List/std::list<qpid::types::Variant, std::allocator<qpid::types::Variant> >/
     /^\$/d
     /^#.*\$/d
-" | sort -u > $syms_desired
+" $3 | sort -u > $syms_desired
 
 comm -23 $syms_desired $syms_library > $syms_missing
 comm -13 $syms_desired $syms_library > $syms_extra

Modified: qpid/branches/java-broker-bdb-ha/qpid/cpp/src/legacystore.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/cpp/src/legacystore.cmake?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/cpp/src/legacystore.cmake (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/cpp/src/legacystore.cmake Thu Jan 23 11:01:02 2014
@@ -37,24 +37,10 @@ else (DEFINED legacystore_force)
             CHECK_INCLUDE_FILES (libaio.h HAVE_AIO_H)
             if (HAVE_AIO AND HAVE_AIO_H)
                 #
-                # find libuuid
+                # allow legacystore to be built
                 #
-                CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID)
-                CHECK_INCLUDE_FILES(uuid/uuid.h HAVE_UUID_H)
-                if (HAVE_UUID AND HAVE_UUID_H)
-                    #
-                    # allow legacystore to be built
-                    #
-                    message(STATUS "BerkeleyDB for C++, libaio and uuid found, Legacystore support enabled")
-                    set (legacystore_default ON)
-                else (HAVE_UUID AND HAVE_UUID_H)
-                    if (NOT HAVE_UUID)
-                        message(STATUS "Legacystore requires uuid which is absent.")
-                    endif (NOT HAVE_UUID)
-                    if (NOT HAVE_UUID_H)
-                        message(STATUS "Legacystore requires uuid.h which is absent.")
-                    endif (NOT HAVE_UUID_H)
-                endif (HAVE_UUID AND HAVE_UUID_H)
+                message(STATUS "BerkeleyDB for C++ and libaio found, Legacystore support enabled")
+                set (legacystore_default ON)
             else (HAVE_AIO AND HAVE_AIO_H)
                 if (NOT HAVE_AIO)
                     message(STATUS "Legacystore requires libaio which is absent.")
@@ -84,12 +70,6 @@ if (BUILD_LEGACYSTORE)
     if (NOT HAVE_AIO_H)
         message(FATAL_ERROR "Legacystore requires libaio.h which is absent.")
     endif (NOT HAVE_AIO_H)
-    if (NOT HAVE_UUID)
-        message(FATAL_ERROR "Legacystore requires uuid which is absent.")
-    endif (NOT HAVE_UUID)
-    if (NOT HAVE_UUID_H)
-        message(FATAL_ERROR "Legacystore requires uuid.h which is absent.")
-    endif (NOT HAVE_UUID_H)
 
     # Journal source files
     set (legacy_jrnl_SOURCES



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message