You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2012/02/27 18:40:49 UTC

svn commit: r1294242 [1/7] - in /qpid/branches/QPID-3799-acl: ./ cpp/ cpp/bindings/qmf/tests/ cpp/bindings/qpid/ cpp/bindings/qpid/dotnet/ cpp/docs/api/ cpp/examples/old_api/tradedemo/ cpp/include/qmf/engine/ cpp/include/qpid/framing/ cpp/include/qpid/...

Author: chug
Date: Mon Feb 27 17:40:42 2012
New Revision: 1294242

URL: http://svn.apache.org/viewvc?rev=1294242&view=rev
Log:
Merge from trunk into branch

Added:
    qpid/branches/QPID-3799-acl/cpp/src/qmf/BrokerImportExport.h
      - copied unchanged from r1294217, qpid/trunk/qpid/cpp/src/qmf/BrokerImportExport.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/MemStat.h
      - copied unchanged from r1294217, qpid/trunk/qpid/cpp/src/qpid/sys/MemStat.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/Probes.h
      - copied unchanged from r1294217, qpid/trunk/qpid/cpp/src/qpid/sys/Probes.h
    qpid/branches/QPID-3799-acl/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/keys/Xid.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/keys/Xid.java
    qpid/branches/QPID-3799-acl/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/records/PreparedTransaction.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/records/PreparedTransaction.java
    qpid/branches/QPID-3799-acl/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/PreparedTransactionTB.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/PreparedTransactionTB.java
    qpid/branches/QPID-3799-acl/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/XidTB.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/XidTB.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AlreadyKnownDtxException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/DtxException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/DtxNotSelectedException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxNotSelectedException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/IncorrectDtxStateException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/JoinAndResumeDtxException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/NotAssociatedDtxException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/RollbackOnlyDtxException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/SuspendAndFailDtxException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/TimeoutDtxException.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java
      - copied unchanged from r1294217, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/UnknownDtxBranchException.java
    qpid/branches/QPID-3799-acl/java/lib/org.apache.felix.main-2.0.5.jar
      - copied unchanged from r1294217, qpid/trunk/qpid/java/lib/org.apache.felix.main-2.0.5.jar
    qpid/branches/QPID-3799-acl/java/lib/poms/org.apache.felix.main-2.0.5.xml
      - copied unchanged from r1294217, qpid/trunk/qpid/java/lib/poms/org.apache.felix.main-2.0.5.xml
    qpid/branches/QPID-3799-acl/tools/src/py/qpid-ha
      - copied unchanged from r1294217, qpid/trunk/qpid/tools/src/py/qpid-ha
Removed:
    qpid/branches/QPID-3799-acl/cpp/include/qpid/sys/MemStat.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/APRBase.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/APRBase.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/APRPool.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/APRPool.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/Condition.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/Mutex.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/Shlib.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/Socket.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/Thread.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/Thread.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/apr/Time.cpp
    qpid/branches/QPID-3799-acl/java/lib/org.apache.felix.framework-2.0.5.jar
    qpid/branches/QPID-3799-acl/java/lib/poms/org.apache.felix.framework-2.0.5.xml
    qpid/branches/QPID-3799-acl/java/lib/poms/org.osgi.core-1.0.0.xml
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
    qpid/branches/QPID-3799-acl/tools/src/py/qpid-ha-tool
Modified:
    qpid/branches/QPID-3799-acl/   (props changed)
    qpid/branches/QPID-3799-acl/cpp/bindings/qmf/tests/run_interop_tests
    qpid/branches/QPID-3799-acl/cpp/bindings/qpid/Makefile.am
    qpid/branches/QPID-3799-acl/cpp/bindings/qpid/dotnet/Makefile.am
    qpid/branches/QPID-3799-acl/cpp/configure.ac
    qpid/branches/QPID-3799-acl/cpp/docs/api/   (props changed)
    qpid/branches/QPID-3799-acl/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj   (props changed)
    qpid/branches/QPID-3799-acl/cpp/include/qmf/engine/Agent.h   (props changed)
    qpid/branches/QPID-3799-acl/cpp/include/qmf/engine/Console.h   (props changed)
    qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceNumber.h
    qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceSet.h
    qpid/branches/QPID-3799-acl/cpp/include/qpid/types/Variant.h
    qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/schema.py
    qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Class.h
    qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Event.h
    qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Package.h
    qpid/branches/QPID-3799-acl/cpp/src/   (props changed)
    qpid/branches/QPID-3799-acl/cpp/src/CMakeLists.txt   (contents, props changed)
    qpid/branches/QPID-3799-acl/cpp/src/Makefile.am
    qpid/branches/QPID-3799-acl/cpp/src/config.h.cmake
    qpid/branches/QPID-3799-acl/cpp/src/qmf.mk
    qpid/branches/QPID-3799-acl/cpp/src/qmf/engine/Agent.cpp   (props changed)
    qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Broker.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/ExchangeRegistry.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Link.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Queue.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/SemanticState.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/client/TCPConnector.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/cluster/UpdateClient.cpp   (props changed)
    qpid/branches/QPID-3799-acl/cpp/src/qpid/cluster/UpdateClient.h   (props changed)
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/Backup.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/BrokerReplicator.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/HaBroker.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/HaBroker.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/HaPlugin.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/QueueReplicator.cpp
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/ReplicatingSubscription.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/Settings.h
    qpid/branches/QPID-3799-acl/cpp/src/qpid/ha/management-schema.xml
    qpid/branches/QPID-3799-acl/cpp/src/qpid/management/ManagementAgent.cpp   (props changed)
    qpid/branches/QPID-3799-acl/cpp/src/qpid/management/ManagementAgent.h   (props changed)
    qpid/branches/QPID-3799-acl/cpp/src/qpid/sys/posix/AsynchIO.cpp
    qpid/branches/QPID-3799-acl/cpp/src/tests/CMakeLists.txt
    qpid/branches/QPID-3799-acl/cpp/src/tests/Makefile.am
    qpid/branches/QPID-3799-acl/cpp/src/tests/acl.py
    qpid/branches/QPID-3799-acl/cpp/src/tests/cli_tests.py
    qpid/branches/QPID-3799-acl/cpp/src/tests/cluster_tests.py   (contents, props changed)
    qpid/branches/QPID-3799-acl/cpp/src/tests/clustered_replication_test
    qpid/branches/QPID-3799-acl/cpp/src/tests/federated_cluster_test
    qpid/branches/QPID-3799-acl/cpp/src/tests/ha_tests.py
    qpid/branches/QPID-3799-acl/cpp/src/tests/ipv6_test
    qpid/branches/QPID-3799-acl/cpp/src/tests/python_tests.ps1
    qpid/branches/QPID-3799-acl/cpp/src/tests/queue_flow_limit_tests.py
    qpid/branches/QPID-3799-acl/cpp/src/tests/reliable_replication_test
    qpid/branches/QPID-3799-acl/cpp/src/tests/replication_test
    qpid/branches/QPID-3799-acl/cpp/src/tests/ring_queue_test
    qpid/branches/QPID-3799-acl/cpp/src/tests/run_acl_tests.ps1
    qpid/branches/QPID-3799-acl/cpp/src/tests/run_federation_tests.ps1
    qpid/branches/QPID-3799-acl/cpp/src/tests/run_header_test.ps1
    qpid/branches/QPID-3799-acl/cpp/src/tests/run_msg_group_tests
    qpid/branches/QPID-3799-acl/cpp/src/tests/run_msg_group_tests_soak
    qpid/branches/QPID-3799-acl/cpp/src/tests/run_store_tests.ps1
    qpid/branches/QPID-3799-acl/cpp/src/tests/run_test.ps1
    qpid/branches/QPID-3799-acl/cpp/src/tests/sasl_fed
    qpid/branches/QPID-3799-acl/cpp/src/tests/sasl_fed_ex
    qpid/branches/QPID-3799-acl/cpp/src/tests/test_env.sh.in
    qpid/branches/QPID-3799-acl/cpp/src/tests/testlib.py
    qpid/branches/QPID-3799-acl/doc/book/src/LVQ.xml
    qpid/branches/QPID-3799-acl/java/   (props changed)
    qpid/branches/QPID-3799-acl/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
    qpid/branches/QPID-3799-acl/java/broker/   (props changed)
    qpid/branches/QPID-3799-acl/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
    qpid/branches/QPID-3799-acl/java/broker/bin/   (props changed)
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/Broker.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/exchange/Exchange.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/logging/messages/TransactionLog_logmessages.properties
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/management/   (props changed)
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/queue/   (props changed)
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/store/MemoryMessageStore.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/store/MessageStore.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/store/TransactionLogRecoveryHandler.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/virtualhost/   (props changed)
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java
    qpid/branches/QPID-3799-acl/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
    qpid/branches/QPID-3799-acl/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
    qpid/branches/QPID-3799-acl/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
    qpid/branches/QPID-3799-acl/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
    qpid/branches/QPID-3799-acl/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
    qpid/branches/QPID-3799-acl/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
    qpid/branches/QPID-3799-acl/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
    qpid/branches/QPID-3799-acl/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
    qpid/branches/QPID-3799-acl/java/build.deps
    qpid/branches/QPID-3799-acl/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
    qpid/branches/QPID-3799-acl/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
    qpid/branches/QPID-3799-acl/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
    qpid/branches/QPID-3799-acl/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
    qpid/branches/QPID-3799-acl/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
    qpid/branches/QPID-3799-acl/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
    qpid/branches/QPID-3799-acl/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
    qpid/branches/QPID-3799-acl/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
    qpid/branches/QPID-3799-acl/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
    qpid/branches/QPID-3799-acl/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
    qpid/branches/QPID-3799-acl/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
    qpid/branches/QPID-3799-acl/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
    qpid/branches/QPID-3799-acl/java/common/src/main/java/org/apache/qpid/transport/Session.java
    qpid/branches/QPID-3799-acl/java/common/src/main/java/org/apache/qpid/transport/codec/AbstractEncoder.java
    qpid/branches/QPID-3799-acl/java/common/src/main/java/org/apache/qpid/transport/network/Assembler.java
    qpid/branches/QPID-3799-acl/java/genpom
    qpid/branches/QPID-3799-acl/java/lib/poms/commons-digester-1.8.1.xml
    qpid/branches/QPID-3799-acl/java/lib/poms/xalan-2.7.0.xml
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/eclipse-plugin/src/   (props changed)
    qpid/branches/QPID-3799-acl/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java   (props changed)
    qpid/branches/QPID-3799-acl/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc   (props changed)
    qpid/branches/QPID-3799-acl/java/module.xml
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/jms/xa/XAResourceTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java   (props changed)
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/client/ImmediateAndMandatoryPublishingTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
    qpid/branches/QPID-3799-acl/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/CPPExcludes   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/Excludes   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/JavaBDBExcludes   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/JavaExcludes   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/JavaPre010Excludes   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/JavaTransientExcludes   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/XAExcludes   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/cpp.async.testprofile   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/cpp.cluster.testprofile   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/cpp.noprefetch.testprofile   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/cpp.ssl.excludes   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/cpp.ssl.testprofile   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/cpp.testprofile   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/java-bdb-spawn.0-8.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-bdb-spawn.0-9-1.testprofile   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/java-bdb-spawn.0-9.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-bdb.0-8.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-bdb.0-9-1.testprofile   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/java-bdb.0-9.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-dby-spawn.0-8.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-dby-spawn.0-9-1.testprofile   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/java-dby-spawn.0-9.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-dby.0-8.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-dby.0-9-1.testprofile   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/java-dby.0-9.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-mms-spawn.0-10.testprofile   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/java-mms-spawn.0-8.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-mms-spawn.0-9-1.testprofile   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/java-mms-spawn.0-9.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-mms.0-8.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/java-mms.0-9-1.testprofile   (contents, props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/java-mms.0-9.testprofile
    qpid/branches/QPID-3799-acl/java/test-profiles/log4j-test.xml   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/python_tests/Java010PythonExcludes
    qpid/branches/QPID-3799-acl/java/test-profiles/test-provider.properties   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/test_resources/   (props changed)
    qpid/branches/QPID-3799-acl/java/test-profiles/testprofile.defaults   (contents, props changed)
    qpid/branches/QPID-3799-acl/packaging/windows/   (props changed)
    qpid/branches/QPID-3799-acl/python/   (props changed)
    qpid/branches/QPID-3799-acl/python/examples/api/spout   (props changed)
    qpid/branches/QPID-3799-acl/python/qpid/concurrency.py   (props changed)
    qpid/branches/QPID-3799-acl/python/qpid/testlib.py
    qpid/branches/QPID-3799-acl/python/qpid/tests/messaging/endpoints.py
    qpid/branches/QPID-3799-acl/tests/src/py/qpid_tests/broker_0_10/msg_groups.py
    qpid/branches/QPID-3799-acl/tests/src/py/qpid_tests/broker_0_10/new_api.py
    qpid/branches/QPID-3799-acl/tests/src/py/qpid_tests/broker_0_9/queue.py   (props changed)
    qpid/branches/QPID-3799-acl/tools/setup.py
    qpid/branches/QPID-3799-acl/tools/src/py/qpid-config
    qpid/branches/QPID-3799-acl/tools/src/py/qpid-stat
    qpid/branches/QPID-3799-acl/tools/src/py/qpidtoollibs/broker.py
    qpid/branches/QPID-3799-acl/tools/src/py/qpidtoollibs/disp.py

Propchange: qpid/branches/QPID-3799-acl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -4,3 +4,4 @@
 /qpid/branches/java-network-refactor/qpid:805429-825319
 /qpid/branches/qpid-2935/qpid:1061302-1072333
 /qpid/branches/qpid-3346/qpid:1144319-1179855
+/qpid/trunk/qpid:1291399-1294217

Modified: qpid/branches/QPID-3799-acl/cpp/bindings/qmf/tests/run_interop_tests
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/bindings/qmf/tests/run_interop_tests?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/bindings/qmf/tests/run_interop_tests (original)
+++ qpid/branches/QPID-3799-acl/cpp/bindings/qmf/tests/run_interop_tests Mon Feb 27 17:40:42 2012
@@ -24,6 +24,7 @@ MY_DIR=`dirname \`which $0\``
 QPID_DIR=${MY_DIR}/../../../..
 BUILD_DIR=../../..
 PYTHON_DIR=${QPID_DIR}/python
+TOOLS_PY_DIR=${QPID_DIR}/tools/src/py
 QMF_DIR=${QPID_DIR}/extras/qmf
 QMF_DIR_PY=${QMF_DIR}/src/py
 BROKER_DIR=${BUILD_DIR}/src
@@ -68,7 +69,7 @@ TESTS_FAILED=0
 if test -d ${PYTHON_DIR} ;  then
     start_broker
     echo "Running qmf interop tests using broker on port $BROKER_PORT"
-    PYTHONPATH=${PYTHON_DIR}:${QMF_DIR_PY}:${MY_DIR}
+    PYTHONPATH=${PYTHON_DIR}:${QMF_DIR_PY}:${MY_DIR}:${TOOLS_PY_DIR}
     export PYTHONPATH
 
     if test -d ${PYTHON_LIB_DIR} ; then

Modified: qpid/branches/QPID-3799-acl/cpp/bindings/qpid/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/bindings/qpid/Makefile.am?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/bindings/qpid/Makefile.am (original)
+++ qpid/branches/QPID-3799-acl/cpp/bindings/qpid/Makefile.am Mon Feb 27 17:40:42 2012
@@ -35,7 +35,7 @@ if HAVE_PERL_DEVEL
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src -I$(PERL_INC)
 
-EXTRA_DIST += perl/perl.i
+EXTRA_DIST += perl/perl.i perl/CMakeLists.txt
 BUILT_SOURCES = perl/cqpid_perl.cpp
 SWIG_FLAGS = -w362,401
 

Modified: qpid/branches/QPID-3799-acl/cpp/bindings/qpid/dotnet/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/bindings/qpid/dotnet/Makefile.am?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/bindings/qpid/dotnet/Makefile.am (original)
+++ qpid/branches/QPID-3799-acl/cpp/bindings/qpid/dotnet/Makefile.am Mon Feb 27 17:40:42 2012
@@ -80,7 +80,6 @@ EXTRA_DIST = configure-windows.ps1 \
    examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj \
    examples/msvc9/csharp.map.receiver/csharp.map.receiver.csproj \
    examples/msvc9/csharp.map.sender/csharp.map.sender.csproj \
-   extra_dist.txt \
    Makefile.am \
    msvc10/org.apache.qpid.messaging.sessionreceiver.sln \
    msvc10/org.apache.qpid.messaging.sln \
@@ -93,7 +92,6 @@ EXTRA_DIST = configure-windows.ps1 \
    src/AssemblyInfo.cpp \
    src/Connection.cpp \
    src/Connection.h \
-   src/Duration.cpp \
    src/Duration.h \
    src/FailoverUpdates.cpp \
    src/FailoverUpdates.h \

Modified: qpid/branches/QPID-3799-acl/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/configure.ac?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/configure.ac (original)
+++ qpid/branches/QPID-3799-acl/cpp/configure.ac Mon Feb 27 17:40:42 2012
@@ -448,7 +448,7 @@ AC_ARG_WITH([poller],
  [AS_HELP_STRING([--with-poller], [The low level poller implementation: poll/solaris-ecf/epoll])],
  [case ${withval} in
   poll)
-   AC_CHECK_HEADERS([sys/poll.h],[poller=no],[AC_MSG_ERROR([Can't find poll.h header file for poll])])
+   AC_CHECK_HEADERS([sys/poll.h],[poller=poll],[AC_MSG_ERROR([Can't find poll.h header file for poll])])
    ;;
   solaris-ecf)
    AC_CHECK_HEADERS([port.h],[poller=solaris-ecf],[AC_MSG_ERROR([Can't find port.h header file for solaris-ecf])])
@@ -458,14 +458,17 @@ AC_ARG_WITH([poller],
    ;;
  esac],
  [
-  AC_CHECK_HEADERS([sys/poll.h],[poller=no],)
-  AC_CHECK_HEADERS([port.h],[poller=solaris-ecf],)
+  # We check for poll first so that it is overridden
+  AC_CHECK_HEADERS([sys/poll.h],[poller=poll],)
+  # Not currently supported - WIP
+  #AC_CHECK_HEADERS([port.h],[poller=solaris-ecf],)
   AC_CHECK_HEADERS([sys/epoll.h],[poller=epoll],)
  ]
 )
 
-AM_CONDITIONAL([HAVE_ECF], [test x$poller = xsolaris-ecf])
-AM_CONDITIONAL([HAVE_EPOLL], [test x$poller = xepoll])
+AM_CONDITIONAL([USE_ECF], [test x$poller = xsolaris-ecf])
+AM_CONDITIONAL([USE_POLL], [test x$poller = xpoll])
+AM_CONDITIONAL([USE_EPOLL], [test x$poller = xepoll])
 
 #Filter not implemented or invalid mechanisms
 if test $poller = xno; then
@@ -480,6 +483,24 @@ case "$host" in
 esac
 AM_CONDITIONAL([SUNOS], [test x$arch = xsolaris])
 
+# Check whether we've got the header for dtrace static probes
+AC_ARG_WITH([probes],
+ [AS_HELP_STRING([--with-probes], [Build with dtrace/systemtap static probes])],
+ [case ${withval} in
+  yes)
+   AC_CHECK_HEADERS([sys/sdt.h])
+   ;;
+  no)
+   ;;
+  *)
+   AC_MSG_ERROR([Bad value for --with-probes: ${withval}])
+   ;;
+  esac],
+  [
+   AC_CHECK_HEADERS([sys/sdt.h])
+  ]
+)
+
 # Check for some syslog capabilities not present in all systems
 AC_TRY_COMPILE([#include <sys/syslog.h>], 
                [int v = LOG_AUTHPRIV;],

Propchange: qpid/branches/QPID-3799-acl/cpp/docs/api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -4,3 +4,4 @@
 /qpid/branches/0.6-release-windows-installer/qpid/cpp/docs/api:926803,927233
 /qpid/branches/java-network-refactor/qpid/cpp/docs/api:805429-825319
 /qpid/branches/qpid-2935/qpid/cpp/docs/api:1061302-1072333
+/qpid/trunk/qpid/cpp/docs/api:1291399-1294217

Propchange: qpid/branches/QPID-3799-acl/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -3,3 +3,4 @@
 /qpid/branches/0.6-release-windows-installer/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803,927218,927233
 /qpid/branches/java-network-refactor/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:805429-825319
 /qpid/branches/qpid-2935/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:1061302-1072333
+/qpid/trunk/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj:1291399-1294217

Propchange: qpid/branches/QPID-3799-acl/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -1 +1,2 @@
 /qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Agent.h:1061302-1072333
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1291399-1294217

Propchange: qpid/branches/QPID-3799-acl/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -1 +1,2 @@
 /qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Console.h:1061302-1072333
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1291399-1294217

Modified: qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceNumber.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceNumber.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceNumber.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceNumber.h Mon Feb 27 17:40:42 2012
@@ -52,9 +52,9 @@ boost::equality_comparable<
     uint32_t getValue() const { return uint32_t(value); }
     operator uint32_t() const { return uint32_t(value); }
 
-    void encode(Buffer& buffer) const;
-    void decode(Buffer& buffer);
-    uint32_t encodedSize() const;
+    QPID_COMMON_EXTERN void encode(Buffer& buffer) const;
+    QPID_COMMON_EXTERN void decode(Buffer& buffer);
+    QPID_COMMON_EXTERN uint32_t encodedSize() const;
 
     template <class S> void serialize(S& s) { s(value); }
 

Modified: qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceSet.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceSet.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceSet.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/include/qpid/framing/SequenceSet.h Mon Feb 27 17:40:42 2012
@@ -38,9 +38,9 @@ class QPID_COMMON_CLASS_EXTERN SequenceS
     SequenceSet(const SequenceNumber& start, const SequenceNumber finish) { add(start,finish); }
 
 
-    void encode(Buffer& buffer) const;
-    void decode(Buffer& buffer);
-    uint32_t encodedSize() const;
+    QPID_COMMON_EXTERN void encode(Buffer& buffer) const;
+    QPID_COMMON_EXTERN void decode(Buffer& buffer);
+    QPID_COMMON_EXTERN uint32_t encodedSize() const;
 
     QPID_COMMON_EXTERN bool contains(const SequenceNumber& s) const;
     QPID_COMMON_EXTERN void add(const SequenceNumber& s);

Modified: qpid/branches/QPID-3799-acl/cpp/include/qpid/types/Variant.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/include/qpid/types/Variant.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/include/qpid/types/Variant.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/include/qpid/types/Variant.h Mon Feb 27 17:40:42 2012
@@ -60,9 +60,9 @@ enum VariantType {
     VAR_UUID
 };
 
-std::string getTypeName(VariantType type);
+QPID_TYPES_EXTERN std::string getTypeName(VariantType type);
 
-bool isIntegerType(VariantType type);
+QPID_TYPES_EXTERN bool isIntegerType(VariantType type);
 
 class VariantImpl;
 

Modified: qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/schema.py
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/schema.py?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/schema.py (original)
+++ qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/schema.py Mon Feb 27 17:40:42 2012
@@ -1471,7 +1471,7 @@ class SchemaClass:
   def genMethodIdDeclarations (self, stream, variables):
     number = 1
     for method in self.methods:
-      stream.write ("    static const uint32_t METHOD_" + method.getName().upper() +\
+      stream.write ("    QPID_BROKER_EXTERN static const uint32_t METHOD_" + method.getName().upper() +\
                     " = %d;\n" % number)
       number = number + 1
 

Modified: qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Class.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Class.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Class.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Class.h Mon Feb 27 17:40:42 2012
@@ -24,6 +24,7 @@
 /*MGEN:Root.Disclaimer*/
 
 #include "qpid/management/ManagementObject.h"
+#include "qmf/BrokerImportExport.h"
 
 namespace qpid {
     namespace management {
@@ -34,7 +35,7 @@ namespace qpid {
 namespace qmf {
 /*MGEN:Class.OpenNamespaces*/
 
-class /*MGEN:Class.NameCap*/ : public ::qpid::management::ManagementObject
+QPID_BROKER_CLASS_EXTERN class /*MGEN:Class.NameCap*/ : public ::qpid::management::ManagementObject
 {
   private:
 
@@ -72,25 +73,25 @@ class /*MGEN:Class.NameCap*/ : public ::
     void aggregatePerThreadStats(struct PerThreadStats*) const;
 /*MGEN:ENDIF*/
   public:
-    static void writeSchema(std::string& schema);
-    void mapEncodeValues(::qpid::types::Variant::Map& map,
-                         bool includeProperties=true,
-                         bool includeStatistics=true);
-    void mapDecodeValues(const ::qpid::types::Variant::Map& map);
-    void doMethod(std::string&           methodName,
-                  const ::qpid::types::Variant::Map& inMap,
-                  ::qpid::types::Variant::Map& outMap,
-                  const std::string& userId);
-    std::string getKey() const;
+    QPID_BROKER_EXTERN static void writeSchema(std::string& schema);
+    QPID_BROKER_EXTERN void mapEncodeValues(::qpid::types::Variant::Map& map,
+                                          bool includeProperties=true,
+                                          bool includeStatistics=true);
+    QPID_BROKER_EXTERN void mapDecodeValues(const ::qpid::types::Variant::Map& map);
+    QPID_BROKER_EXTERN void doMethod(std::string&           methodName,
+                                   const ::qpid::types::Variant::Map& inMap,
+                                   ::qpid::types::Variant::Map& outMap,
+                                   const std::string& userId);
+    QPID_BROKER_EXTERN std::string getKey() const;
 /*MGEN:IF(Root.GenQMFv1)*/
-    uint32_t writePropertiesSize() const;
-    void readProperties(const std::string& buf);
-    void writeProperties(std::string& buf) const;
-    void writeStatistics(std::string& buf, bool skipHeaders = false);
-    void doMethod(std::string& methodName,
-                  const std::string& inBuf,
-                  std::string& outBuf,
-                  const std::string& userId);
+    QPID_BROKER_EXTERN uint32_t writePropertiesSize() const;
+    QPID_BROKER_EXTERN void readProperties(const std::string& buf);
+    QPID_BROKER_EXTERN void writeProperties(std::string& buf) const;
+    QPID_BROKER_EXTERN void writeStatistics(std::string& buf, bool skipHeaders = false);
+    QPID_BROKER_EXTERN void doMethod(std::string& methodName,
+                                   const std::string& inBuf,
+                                   std::string& outBuf,
+                                   const std::string& userId);
 /*MGEN:ENDIF*/
 
     writeSchemaCall_t getWriteSchemaCall() { return writeSchema; }
@@ -100,13 +101,17 @@ class /*MGEN:Class.NameCap*/ : public ::
     bool hasInst() { return false; }
 /*MGEN:ENDIF*/
 
-    /*MGEN:Class.NameCap*/(::qpid::management::ManagementAgent* agent,
-                            ::qpid::management::Manageable* coreObject/*MGEN:Class.ParentArg*//*MGEN:Class.ConstructorArgs*/);
-    ~/*MGEN:Class.NameCap*/();
+    QPID_BROKER_EXTERN /*MGEN:Class.NameCap*/(
+        ::qpid::management::ManagementAgent* agent,
+        ::qpid::management::Manageable* coreObject/*MGEN:Class.ParentArg*//*MGEN:Class.ConstructorArgs*/);
+
+    QPID_BROKER_EXTERN ~/*MGEN:Class.NameCap*/();
 
     /*MGEN:Class.SetGeneralReferenceDeclaration*/
 
-    static void registerSelf(::qpid::management::ManagementAgent* agent);
+    QPID_BROKER_EXTERN static void registerSelf(
+        ::qpid::management::ManagementAgent* agent);
+
     std::string& getPackageName() const { return packageName; }
     std::string& getClassName() const { return className; }
     uint8_t* getMd5Sum() const { return md5Sum; }

Modified: qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Event.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Event.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Event.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Event.h Mon Feb 27 17:40:42 2012
@@ -24,11 +24,12 @@
 /*MGEN:Root.Disclaimer*/
 
 #include "qpid/management/ManagementEvent.h"
+#include "qmf/BrokerImportExport.h"
 
 namespace qmf {
 /*MGEN:Event.OpenNamespaces*/
 
-class Event/*MGEN:Event.NameCap*/ : public ::qpid::management::ManagementEvent
+QPID_BROKER_CLASS_EXTERN class Event/*MGEN:Event.NameCap*/ : public ::qpid::management::ManagementEvent
 {
   private:
     static void writeSchema (std::string& schema);
@@ -41,18 +42,18 @@ class Event/*MGEN:Event.NameCap*/ : publ
   public:
     writeSchemaCall_t getWriteSchemaCall(void) { return writeSchema; }
 
-    Event/*MGEN:Event.NameCap*/(/*MGEN:Event.ConstructorArgs*/);
-    ~Event/*MGEN:Event.NameCap*/() {};
+    QPID_BROKER_EXTERN Event/*MGEN:Event.NameCap*/(/*MGEN:Event.ConstructorArgs*/);
+    QPID_BROKER_EXTERN ~Event/*MGEN:Event.NameCap*/() {};
 
     static void registerSelf(::qpid::management::ManagementAgent* agent);
     std::string& getPackageName() const { return packageName; }
     std::string& getEventName() const { return eventName; }
     uint8_t* getMd5Sum() const { return md5Sum; }
     uint8_t getSeverity() const { return /*MGEN:Event.Severity*/; }
-    void encode(std::string& buffer) const;
-    void mapEncode(::qpid::types::Variant::Map& map) const;
+    QPID_BROKER_EXTERN void encode(std::string& buffer) const;
+    QPID_BROKER_EXTERN void mapEncode(::qpid::types::Variant::Map& map) const;
 
-    static bool match(const std::string& evt, const std::string& pkg);
+    QPID_BROKER_EXTERN static bool match(const std::string& evt, const std::string& pkg);
 };
 
 }/*MGEN:Event.CloseNamespaces*/

Modified: qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Package.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Package.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Package.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/managementgen/qmfgen/templates/Package.h Mon Feb 27 17:40:42 2012
@@ -24,6 +24,7 @@
 /*MGEN:Root.Disclaimer*/
 
 #include "qpid//*MGEN:Class.AgentHeaderLocation*//ManagementAgent.h"
+#include "qmf/BrokerImportExport.h"
 
 namespace qmf {
 /*MGEN:Class.OpenNamespaces*/
@@ -31,8 +32,8 @@ namespace qmf {
 class Package
 {
   public:
-    Package (::qpid::management::ManagementAgent* agent);
-    ~Package () {}
+    QPID_BROKER_EXTERN Package (::qpid::management::ManagementAgent* agent);
+    QPID_BROKER_EXTERN ~Package () {}
 };
 
 }/*MGEN:Class.CloseNamespaces*/

Propchange: qpid/branches/QPID-3799-acl/cpp/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -5,3 +5,4 @@
 /qpid/branches/java-network-refactor/qpid/cpp/src:805429-825319
 /qpid/branches/qpid-2935/qpid/cpp/src:1061302-1072333
 /qpid/branches/qpid-3346/qpid/cpp/src:1144319-1179855
+/qpid/trunk/qpid/cpp/src:1291399-1294217

Modified: qpid/branches/QPID-3799-acl/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/CMakeLists.txt?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/CMakeLists.txt Mon Feb 27 17:40:42 2012
@@ -477,6 +477,29 @@ else (NOT CLOCK_GETTIME_IN_RT)
   set(QPID_HAS_CLOCK_GETTIME YES CACHE BOOL "Platform has clock_gettime")
 endif (NOT CLOCK_GETTIME_IN_RT)
 
+# Check for header file for dtrace static probes
+check_include_files(sys/sdt.h HAVE_SYS_SDT_H)
+if (HAVE_SYS_SDT_H)
+  set(probes_default ON)
+endif (HAVE_SYS_SDT_H)
+option(BUILD_PROBES "Build with DTrace/systemtap static probes" ${probes_default})
+if (NOT BUILD_PROBES)
+  set (HAVE_SYS_SDT_H 0)
+endif (NOT BUILD_PROBES)
+
+# Check for poll/epoll header files
+check_include_files(sys/poll.h HAVE_POLL)
+check_include_files(sys/epoll.h HAVE_EPOLL)
+
+# Set default poller implementation (check from general to specific to allow overriding)
+if (HAVE_POLL)
+  set(poller_default poll)
+endif (HAVE_POLL)
+if (HAVE_EPOLL)
+  set(poller_default epoll)
+endif (HAVE_EPOLL)
+set(POLLER ${poller_default} CACHE STRING "Poller implementation (poll/epoll)")
+
 # If not windows ensure that we have uuid library
 if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
   CHECK_LIBRARY_EXISTS (uuid uuid_compare "" HAVE_UUID)
@@ -740,9 +763,18 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
 
   # POSIX (Non-Windows) platforms have a lot of overlap in sources; the only
   # major difference is the poller module.
-  if (CMAKE_SYSTEM_NAME STREQUAL Linux)
+  if (POLLER STREQUAL poll)
+    set (qpid_poller_module
+      qpid/sys/posix/PosixPoller.cpp
+    )
+  elseif (POLLER STREQUAL epoll)
     set (qpid_poller_module
       qpid/sys/epoll/EpollPoller.cpp
+    )
+  endif (POLLER STREQUAL poll)
+
+  if (CMAKE_SYSTEM_NAME STREQUAL Linux)
+    set (qpid_system_module
       qpid/sys/posix/SystemInfo.cpp
     )
     add_definitions(-pthread)
@@ -754,13 +786,12 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
 
   set (qpidtypes_platform_SOURCES)
   set (qpidtypes_platform_LIBS
-    uuid
-    ${Boost_SYSTEM_LIBRARY}
+       uuid
+       ${Boost_SYSTEM_LIBRARY}
   )
 
   if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
-    set (qpid_poller_module
-      qpid/sys/posix/PosixPoller.cpp
+    set (qpid_system_module
       qpid/sys/solaris/SystemInfo.cpp
     )
 #   On Sun we want -lpthread -lthread as the 2nd last and last libs passed to linker
@@ -789,6 +820,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
     qpid/sys/posix/Time.cpp
     qpid/SaslFactory.cpp
 
+    ${qpid_system_module}
     ${qpid_poller_module}
   )
   set (qpidcommon_platform_LIBS

Propchange: qpid/branches/QPID-3799-acl/cpp/src/CMakeLists.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -5,3 +5,4 @@
 /qpid/branches/java-network-refactor/qpid/cpp/src/CMakeLists.txt:805429-825319
 /qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt:1061302-1072333
 /qpid/branches/qpid-3346/qpid/cpp/src/CMakeLists.txt:1144319-1179855
+/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1291399-1294217

Modified: qpid/branches/QPID-3799-acl/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/Makefile.am?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/Makefile.am (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/Makefile.am Mon Feb 27 17:40:42 2012
@@ -102,15 +102,16 @@ $(srcdir)/rubygen.cmake: $(rgen_generato
 
 # Management generator.
 mgen_dir=$(top_srcdir)/managementgen
-mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
-	-c $(srcdir)/managementgen.cmake -q -b -o qmf \
-	$(top_srcdir)/../specs/management-schema.xml \
+mgen_xml=$(top_srcdir)/../specs/management-schema.xml \
 	$(srcdir)/qpid/acl/management-schema.xml \
 	$(srcdir)/qpid/cluster/management-schema.xml \
 	$(srcdir)/qpid/ha/management-schema.xml
+mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
+	-c $(srcdir)/managementgen.cmake -q -b -o qmf \
+	$(mgen_xml)
 
 $(srcdir)/managementgen.mk $(mgen_broker_cpp) $(dist_qpid_management_HEADERS): mgen.timestamp
-mgen.timestamp: $(mgen_generator)
+mgen.timestamp: $(mgen_generator) $(mgen_xml)
 	$(mgen_cmd); touch $@
 $(mgen_generator):
 
@@ -183,11 +184,15 @@ nobase_include_HEADERS +=			\
   ../include/qpid/sys/posix/Time.h		\
   ../include/qpid/sys/posix/check.h
 
-if HAVE_EPOLL
+if USE_EPOLL
   poller = qpid/sys/epoll/EpollPoller.cpp
 endif
 
-if HAVE_ECF
+if USE_POLL
+  poller = qpid/sys/posix/PosixPoller.cpp
+endif
+
+if USE_ECF
   poller = qpid/sys/solaris/ECFPoller.cpp
 endif
 
@@ -481,12 +486,14 @@ libqpidcommon_la_SOURCES +=			\
   qpid/sys/Fork.h				\
   qpid/sys/LockFile.h				\
   qpid/sys/LockPtr.h				\
+  qpid/sys/MemStat.h				\
   qpid/sys/OutputControl.h			\
   qpid/sys/OutputTask.h				\
   qpid/sys/PipeHandle.h				\
   qpid/sys/PollableCondition.h			\
   qpid/sys/PollableQueue.h			\
   qpid/sys/Poller.h				\
+  qpid/sys/Probes.h				\
   qpid/sys/ProtocolFactory.h			\
   qpid/sys/Runnable.cpp				\
   qpid/sys/ScopedIncrement.h			\
@@ -632,7 +639,6 @@ libqpidbroker_la_SOURCES = \
   qpid/broker/QueuedMessage.h \
   qpid/broker/QueueFlowLimit.h \
   qpid/broker/QueueFlowLimit.cpp \
-  qpid/broker/RateFlowcontrol.h \
   qpid/broker/RecoverableConfig.h \
   qpid/broker/RecoverableExchange.h \
   qpid/broker/RecoverableMessage.h \

Modified: qpid/branches/QPID-3799-acl/cpp/src/config.h.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/config.h.cmake?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/config.h.cmake (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/config.h.cmake Mon Feb 27 17:40:42 2012
@@ -60,6 +60,7 @@
 #cmakedefine HAVE_OPENAIS_CPG_H ${HAVE_OPENAIS_CPG_H}
 #cmakedefine HAVE_COROSYNC_CPG_H ${HAVE_COROSYNC_CPG_H}
 #cmakedefine HAVE_LIBCMAN_H ${HAVE_LIBCMAN_H}
+#cmakedefine HAVE_SYS_SDT_H ${HAVE_SYS_SDT_H}
 #cmakedefine HAVE_LOG_AUTHPRIV
 #cmakedefine HAVE_LOG_FTP
 

Modified: qpid/branches/QPID-3799-acl/cpp/src/qmf.mk
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qmf.mk?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qmf.mk (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qmf.mk Mon Feb 27 17:40:42 2012
@@ -96,6 +96,7 @@ libqmf2_la_SOURCES = 		\
   qmf/AgentSessionImpl.h	\
   qmf/AgentSubscription.cpp	\
   qmf/AgentSubscription.h	\
+  qmf/BrokerImportExport.h	\
   qmf/ConsoleEvent.cpp		\
   qmf/ConsoleEventImpl.h	\
   qmf/ConsoleSession.cpp	\

Propchange: qpid/branches/QPID-3799-acl/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -1 +1,2 @@
 /qpid/branches/qpid-2935/qpid/cpp/src/qmf/engine/Agent.cpp:1061302-1072333
+/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:1291399-1294217

Modified: qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Broker.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Broker.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Broker.h Mon Feb 27 17:40:42 2012
@@ -205,7 +205,7 @@ public:
     ConsumerFactories consumerFactories;
 
   public:
-    virtual ~Broker();
+    QPID_BROKER_EXTERN virtual ~Broker();
 
     QPID_BROKER_EXTERN Broker(const Options& configuration);
     static QPID_BROKER_EXTERN boost::intrusive_ptr<Broker> create(const Options& configuration);
@@ -217,16 +217,16 @@ public:
      * port, which will be different if the configured port is
      * 0.
      */
-    virtual uint16_t getPort(const std::string& name) const;
+    QPID_BROKER_EXTERN virtual uint16_t getPort(const std::string& name) const;
 
     /**
      * Run the broker. Implements Runnable::run() so the broker
      * can be run in a separate thread.
      */
-    virtual void run();
+    QPID_BROKER_EXTERN virtual void run();
 
     /** Shut down the broker */
-    virtual void shutdown();
+    QPID_BROKER_EXTERN virtual void shutdown();
 
     QPID_BROKER_EXTERN void setStore (boost::shared_ptr<MessageStore>& store);
     MessageStore& getStore() { return *store; }
@@ -246,14 +246,14 @@ public:
     SessionManager& getSessionManager() { return sessionManager; }
     const std::string& getFederationTag() const { return federationTag; }
 
-    management::ManagementObject*     GetManagementObject (void) const;
-    management::Manageable*           GetVhostObject      (void) const;
-    management::Manageable::status_t  ManagementMethod (uint32_t methodId,
-                                                        management::Args& args,
-                                                        std::string& text);
+    QPID_BROKER_EXTERN management::ManagementObject* GetManagementObject() const;
+    QPID_BROKER_EXTERN management::Manageable* GetVhostObject() const;
+    QPID_BROKER_EXTERN management::Manageable::status_t ManagementMethod(
+        uint32_t methodId, management::Args& args, std::string& text);
 
     /** Add to the broker's protocolFactorys */
-    void registerProtocolFactory(const std::string& name, boost::shared_ptr<sys::ProtocolFactory>);
+    QPID_BROKER_EXTERN void registerProtocolFactory(
+        const std::string& name, boost::shared_ptr<sys::ProtocolFactory>);
 
     /** Accept connections */
     QPID_BROKER_EXTERN void accept();
@@ -271,15 +271,17 @@ public:
     /** Move messages from one queue to another.
         A zero quantity means to move all messages
     */
-    uint32_t queueMoveMessages( const std::string& srcQueue,
-			    const std::string& destQueue,
-                uint32_t  qty,
-                const qpid::types::Variant::Map& filter);
+    QPID_BROKER_EXTERN uint32_t queueMoveMessages(
+        const std::string& srcQueue,
+        const std::string& destQueue,
+        uint32_t  qty,
+        const qpid::types::Variant::Map& filter);
 
-    boost::shared_ptr<sys::ProtocolFactory> getProtocolFactory(const std::string& name = TCP_TRANSPORT) const;
+    QPID_BROKER_EXTERN boost::shared_ptr<sys::ProtocolFactory> getProtocolFactory(
+        const std::string& name = TCP_TRANSPORT) const;
 
     /** Expose poller so plugins can register their descriptors. */
-    boost::shared_ptr<sys::Poller> getPoller();
+    QPID_BROKER_EXTERN boost::shared_ptr<sys::Poller> getPoller();
 
     boost::shared_ptr<sys::ConnectionCodec::Factory> getConnectionFactory() { return factory; }
     void setConnectionFactory(boost::shared_ptr<sys::ConnectionCodec::Factory> f) { factory = f; }
@@ -289,7 +291,7 @@ public:
 
     /** Timer for tasks that must be synchronized if we are in a cluster */
     sys::Timer& getClusterTimer() { return clusterTimer.get() ? *clusterTimer : timer; }
-    void setClusterTimer(std::auto_ptr<sys::Timer>);
+    QPID_BROKER_EXTERN void setClusterTimer(std::auto_ptr<sys::Timer>);
 
     boost::function<std::vector<Url> ()> getKnownBrokers;
 
@@ -320,15 +322,14 @@ public:
      * context.
      *@return true if delivery of a message should be deferred.
      */
-    boost::function<bool (const std::string& queue,
-                          const boost::intrusive_ptr<Message>& msg)> deferDelivery;
+    boost::function<bool (const std::string& queue, const boost::intrusive_ptr<Message>& msg)> deferDelivery;
 
     bool isAuthenticating ( ) { return config.auth; }
     bool isTimestamping() { return config.timestampRcvMsgs; }
 
     typedef boost::function1<void, boost::shared_ptr<Queue> > QueueFunctor;
 
-    std::pair<boost::shared_ptr<Queue>, bool> createQueue(
+    QPID_BROKER_EXTERN std::pair<boost::shared_ptr<Queue>, bool> createQueue(
         const std::string& name,
         bool durable,
         bool autodelete,
@@ -337,30 +338,39 @@ public:
         const qpid::framing::FieldTable& arguments,
         const std::string& userId,
         const std::string& connectionId);
-    void deleteQueue(const std::string& name,
-                     const std::string& userId,
-                     const std::string& connectionId,
-                     QueueFunctor check = QueueFunctor());
-    std::pair<Exchange::shared_ptr, bool> createExchange(
+
+    QPID_BROKER_EXTERN void deleteQueue(
+        const std::string& name,
+        const std::string& userId,
+        const std::string& connectionId,
+        QueueFunctor check = QueueFunctor());
+
+    QPID_BROKER_EXTERN std::pair<Exchange::shared_ptr, bool> createExchange(
         const std::string& name,
         const std::string& type,
         bool durable,
         const std::string& alternateExchange,
         const qpid::framing::FieldTable& args,
         const std::string& userId, const std::string& connectionId);
-    void deleteExchange(const std::string& name, const std::string& userId,
-                        const std::string& connectionId);
-    void bind(const std::string& queue,
-              const std::string& exchange,
-              const std::string& key,
-              const qpid::framing::FieldTable& arguments,
-              const std::string& userId,
-              const std::string& connectionId);
-    void unbind(const std::string& queue,
-                const std::string& exchange,
-                const std::string& key,
-                const std::string& userId,
-                const std::string& connectionId);
+
+    QPID_BROKER_EXTERN void deleteExchange(
+        const std::string& name, const std::string& userId,
+        const std::string& connectionId);
+
+    QPID_BROKER_EXTERN void bind(
+        const std::string& queue,
+        const std::string& exchange,
+        const std::string& key,
+        const qpid::framing::FieldTable& arguments,
+        const std::string& userId,
+        const std::string& connectionId);
+
+    QPID_BROKER_EXTERN void unbind(
+        const std::string& queue,
+        const std::string& exchange,
+        const std::string& key,
+        const std::string& userId,
+        const std::string& connectionId);
 
     ConsumerFactories&  getConsumerFactories() { return consumerFactories; }
     ConnectionObservers& getConnectionObservers() { return connectionObservers; }

Modified: qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/ExchangeRegistry.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/ExchangeRegistry.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/ExchangeRegistry.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/ExchangeRegistry.h Mon Feb 27 17:40:42 2012
@@ -54,7 +54,7 @@ class ExchangeRegistry{
        bool durable,
        const qpid::framing::FieldTable& args = framing::FieldTable());
     QPID_BROKER_EXTERN void destroy(const std::string& name);
-    Exchange::shared_ptr getDefault();
+    QPID_BROKER_EXTERN Exchange::shared_ptr getDefault();
 
     /**
      * Find the named exchange. Return 0 if not found.
@@ -75,7 +75,7 @@ class ExchangeRegistry{
     /** Register an exchange instance.
      *@return true if registered, false if exchange with same name is already  registered.
      */
-    bool registerExchange(const Exchange::shared_ptr&);
+    QPID_BROKER_EXTERN bool registerExchange(const Exchange::shared_ptr&);
 
     QPID_BROKER_EXTERN void registerType(const std::string& type, FactoryFunction);
 
@@ -85,7 +85,7 @@ class ExchangeRegistry{
         for (ExchangeMap::const_iterator i = exchanges.begin(); i != exchanges.end(); ++i)
             f(i->second);
     }
-        
+
   private:
     typedef std::map<std::string, Exchange::shared_ptr> ExchangeMap;
     typedef std::map<std::string, FactoryFunction > FunctionMap;

Modified: qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Link.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Link.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Link.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Link.h Mon Feb 27 17:40:42 2012
@@ -24,9 +24,11 @@
 
 #include <boost/shared_ptr.hpp>
 #include "qpid/Url.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/broker/MessageStore.h"
 #include "qpid/broker/PersistableConfig.h"
 #include "qpid/broker/Bridge.h"
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/management/Manageable.h"
@@ -94,6 +96,13 @@ class Link : public PersistableConfig, p
     bool tryFailoverLH();            // Called during maintenance visit
     bool hideManagement() const;
 
+    void established(Connection*); // Called when connection is create
+    void opened();      // Called when connection is open (after create)
+    void closed(int, std::string);   // Called when connection goes away
+    void reconnectLH(const Address&); //called by LinkRegistry
+
+  friend class LinkRegistry; // to call established, opened, closed
+
   public:
     typedef boost::shared_ptr<Link> shared_ptr;
 
@@ -119,13 +128,9 @@ class Link : public PersistableConfig, p
     uint nextChannel();
     void add(Bridge::shared_ptr);
     void cancel(Bridge::shared_ptr);
-    void setUrl(const Url&); // Set URL for reconnection.
 
-    void established(Connection*); // Called when connection is create
-    void opened();      // Called when connection is open (after create)
-    void closed(int, std::string);   // Called when connection goes away
-    void reconnectLH(const Address&); //called by LinkRegistry
-    void close();       // Close the link from within the broker.
+    QPID_BROKER_EXTERN void setUrl(const Url&); // Set URL for reconnection.
+    QPID_BROKER_EXTERN void close(); // Close the link from within the broker.
 
     std::string getAuthMechanism() { return authMechanism; }
     std::string getUsername()      { return username; }

Modified: qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.cpp?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.cpp (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.cpp Mon Feb 27 17:40:42 2012
@@ -25,7 +25,9 @@
 #include <iostream>
 #include <boost/format.hpp>
 
-using namespace qpid::broker;
+namespace qpid {
+namespace broker {
+
 using namespace qpid::sys;
 using std::string;
 using std::pair;
@@ -45,16 +47,15 @@ LinkRegistry::LinkRegistry () :
 {
 }
 
-namespace {
-struct ConnectionObserverImpl : public ConnectionObserver {
+class LinkRegistryConnectionObserver : public ConnectionObserver {
     LinkRegistry& links;
-    ConnectionObserverImpl(LinkRegistry& l) : links(l) {}
+  public:
+    LinkRegistryConnectionObserver(LinkRegistry& l) : links(l) {}
     void connection(Connection& c) { links.notifyConnection(c.getMgmtId(), &c); }
     void opened(Connection& c) { links.notifyOpened(c.getMgmtId()); }
     void closed(Connection& c) { links.notifyClosed(c.getMgmtId()); }
     void forced(Connection& c, const string& text) { links.notifyConnectionForced(c.getMgmtId(), text); }
 };
-}
 
 LinkRegistry::LinkRegistry (Broker* _broker) :
     broker(_broker),
@@ -62,7 +63,7 @@ LinkRegistry::LinkRegistry (Broker* _bro
     realm(broker->getOptions().realm)
 {
     broker->getConnectionObservers().add(
-        boost::shared_ptr<ConnectionObserver>(new ConnectionObserverImpl(*this)));
+        boost::shared_ptr<ConnectionObserver>(new LinkRegistryConnectionObserver(*this)));
 }
 
 LinkRegistry::~LinkRegistry() {}
@@ -368,3 +369,4 @@ void LinkRegistry::eachBridge(boost::fun
     for (BridgeMap::iterator i = bridges.begin(); i != bridges.end(); ++i) f(i->second);
 }
 
+}} // namespace qpid::broker

Modified: qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/LinkRegistry.h Mon Feb 27 17:40:42 2012
@@ -23,6 +23,7 @@
  */
 
 #include <map>
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/broker/Bridge.h"
 #include "qpid/broker/MessageStore.h"
 #include "qpid/Address.h"
@@ -56,43 +57,50 @@ namespace broker {
         static std::string createKey(const Address& address);
         static std::string createKey(const std::string& host, uint16_t port);
 
+        // Methods called by the connection observer.
+        void notifyConnection (const std::string& key, Connection* c);
+        void notifyOpened     (const std::string& key);
+        void notifyClosed     (const std::string& key);
+        void notifyConnectionForced    (const std::string& key, const std::string& text);
+      friend class LinkRegistryConnectionObserver;
+
     public:
-        LinkRegistry (); // Only used in store tests
-        LinkRegistry (Broker* _broker);
-        ~LinkRegistry();
-
-        std::pair<boost::shared_ptr<Link>, bool>
-            declare(const std::string& host,
-                    uint16_t     port,
-                    const std::string& transport,
-                    bool         durable,
-                    const std::string& authMechanism,
-                    const std::string& username,
-                    const std::string& password);
-
-        std::pair<Bridge::shared_ptr, bool>
-            declare(const std::string& host,
-                    uint16_t     port,
-                    bool         durable,
-                    const std::string& src,
-                    const std::string& dest,
-                    const std::string& key,
-                    bool         isQueue,
-                    bool         isLocal,
-                    const std::string& id,
-                    const std::string& excludes,
-                    bool         dynamic,
-                    uint16_t     sync,
-                    Bridge::InitializeCallback=0
-            );
-
-        void destroy(const std::string& host, const uint16_t port);
-
-        void destroy(const std::string& host,
-                     const uint16_t     port,
-                     const std::string& src,
-                     const std::string& dest,
-                     const std::string& key);
+        QPID_BROKER_EXTERN LinkRegistry (); // Only used in store tests
+        QPID_BROKER_EXTERN LinkRegistry (Broker* _broker);
+        QPID_BROKER_EXTERN ~LinkRegistry();
+
+        QPID_BROKER_EXTERN std::pair<boost::shared_ptr<Link>, bool>
+        declare(const std::string& host,
+                uint16_t     port,
+                const std::string& transport,
+                bool         durable,
+                const std::string& authMechanism,
+                const std::string& username,
+                const std::string& password);
+
+        QPID_BROKER_EXTERN std::pair<Bridge::shared_ptr, bool>
+        declare(const std::string& host,
+                uint16_t     port,
+                bool         durable,
+                const std::string& src,
+                const std::string& dest,
+                const std::string& key,
+                bool         isQueue,
+                bool         isLocal,
+                const std::string& id,
+                const std::string& excludes,
+                bool         dynamic,
+                uint16_t     sync,
+                Bridge::InitializeCallback=0
+        );
+
+        QPID_BROKER_EXTERN void destroy(const std::string& host, const uint16_t port);
+
+        QPID_BROKER_EXTERN void destroy(const std::string& host,
+                                        const uint16_t     port,
+                                        const std::string& src,
+                                        const std::string& dest,
+                                        const std::string& key);
 
         /**
          * Register the manageable parent for declared queues
@@ -102,24 +110,20 @@ namespace broker {
         /**
          * Set the store to use.  May only be called once.
          */
-        void setStore (MessageStore*);
+        QPID_BROKER_EXTERN void setStore (MessageStore*);
 
         /**
          * Return the message store used.
          */
-        MessageStore* getStore() const;
+        QPID_BROKER_EXTERN MessageStore* getStore() const;
 
-        void notifyConnection (const std::string& key, Connection* c);
-        void notifyOpened     (const std::string& key);
-        void notifyClosed     (const std::string& key);
-        void notifyConnectionForced    (const std::string& key, const std::string& text);
-        std::string getAuthMechanism   (const std::string& key);
-        std::string getAuthCredentials (const std::string& key);
-        std::string getAuthIdentity    (const std::string& key);
-        std::string getUsername        (const std::string& key);
-        std::string getPassword        (const std::string& key);
-        std::string getHost            (const std::string& key);
-        uint16_t    getPort            (const std::string& key);
+        QPID_BROKER_EXTERN std::string getAuthMechanism   (const std::string& key);
+        QPID_BROKER_EXTERN std::string getAuthCredentials (const std::string& key);
+        QPID_BROKER_EXTERN std::string getAuthIdentity    (const std::string& key);
+        QPID_BROKER_EXTERN std::string getUsername        (const std::string& key);
+        QPID_BROKER_EXTERN std::string getPassword        (const std::string& key);
+        QPID_BROKER_EXTERN std::string getHost            (const std::string& key);
+        QPID_BROKER_EXTERN uint16_t    getPort            (const std::string& key);
 
         /**
          * Called by links failing over to new address
@@ -132,13 +136,13 @@ namespace broker {
          * updated but links won't actually establish connections and
          * bridges won't therefore pull or push any messages.
          */
-        void setPassive(bool);
-        bool isPassive() { return passive; }
+        QPID_BROKER_EXTERN void setPassive(bool);
+        QPID_BROKER_EXTERN bool isPassive() { return passive; }
 
         /** Iterate over each link in the registry. Used for cluster updates. */
-        void eachLink(boost::function<void(boost::shared_ptr<Link>)> f);
+        QPID_BROKER_EXTERN void eachLink(boost::function<void(boost::shared_ptr<Link>)> f);
         /** Iterate over each bridge in the registry. Used for cluster updates. */
-        void eachBridge(boost::function<void(boost::shared_ptr< Bridge>)> f);
+        QPID_BROKER_EXTERN void eachBridge(boost::function<void(boost::shared_ptr< Bridge>)> f);
     };
 }
 }

Modified: qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Queue.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Queue.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/Queue.h Mon Feb 27 17:40:42 2012
@@ -235,8 +235,9 @@ class Queue : public boost::enable_share
     /**
      * Bind self to specified exchange, and record that binding for unbinding on delete.
      */
-    bool bind(boost::shared_ptr<Exchange> exchange, const std::string& key,
-              const qpid::framing::FieldTable& arguments=qpid::framing::FieldTable());
+    QPID_BROKER_EXTERN bool bind(
+        boost::shared_ptr<Exchange> exchange, const std::string& key,
+        const qpid::framing::FieldTable& arguments=qpid::framing::FieldTable());
 
     /** Acquire the message at the given position if it is available for acquire.  Not to
      * be used by clients, but used by the broker for queue management.
@@ -271,28 +272,29 @@ class Queue : public boost::enable_share
                                     bool exclusive = false);
     QPID_BROKER_EXTERN void cancel(Consumer::shared_ptr c);
 
-    uint32_t purge(const uint32_t purge_request=0,  //defaults to all messages
+    QPID_BROKER_EXTERN uint32_t purge(const uint32_t purge_request=0,  //defaults to all messages
                    boost::shared_ptr<Exchange> dest=boost::shared_ptr<Exchange>(),
                    const ::qpid::types::Variant::Map *filter=0);
     QPID_BROKER_EXTERN void purgeExpired(sys::Duration);
 
     //move qty # of messages to destination Queue destq
-    uint32_t move(const Queue::shared_ptr destq, uint32_t qty,
-                  const qpid::types::Variant::Map *filter=0);
+    QPID_BROKER_EXTERN uint32_t move(
+        const Queue::shared_ptr destq, uint32_t qty,
+        const qpid::types::Variant::Map *filter=0);
 
     QPID_BROKER_EXTERN uint32_t getMessageCount() const;
     QPID_BROKER_EXTERN uint32_t getEnqueueCompleteMessageCount() const;
     QPID_BROKER_EXTERN uint32_t getConsumerCount() const;
     inline const std::string& getName() const { return name; }
-    bool isExclusiveOwner(const OwnershipToken* const o) const;
-    void releaseExclusiveOwnership();
-    bool setExclusiveOwner(const OwnershipToken* const o);
-    bool hasExclusiveConsumer() const;
-    bool hasExclusiveOwner() const;
+    QPID_BROKER_EXTERN bool isExclusiveOwner(const OwnershipToken* const o) const;
+    QPID_BROKER_EXTERN void releaseExclusiveOwnership();
+    QPID_BROKER_EXTERN bool setExclusiveOwner(const OwnershipToken* const o);
+    QPID_BROKER_EXTERN bool hasExclusiveConsumer() const;
+    QPID_BROKER_EXTERN bool hasExclusiveOwner() const;
     inline bool isDurable() const { return store != 0; }
     inline const framing::FieldTable& getSettings() const { return settings; }
     inline bool isAutoDelete() const { return autodelete; }
-    bool canAutoDelete() const;
+    QPID_BROKER_EXTERN bool canAutoDelete() const;
     const QueueBindings& getBindings() const { return bindings; }
 
     /**
@@ -301,8 +303,8 @@ class Queue : public boost::enable_share
     QPID_BROKER_EXTERN void setLastNodeFailure();
     QPID_BROKER_EXTERN void clearLastNodeFailure();
 
-    bool enqueue(TransactionContext* ctxt, boost::intrusive_ptr<Message>& msg, bool suppressPolicyCheck = false);
-    void enqueueAborted(boost::intrusive_ptr<Message> msg);
+    QPID_BROKER_EXTERN bool enqueue(TransactionContext* ctxt, boost::intrusive_ptr<Message>& msg, bool suppressPolicyCheck = false);
+    QPID_BROKER_EXTERN void enqueueAborted(boost::intrusive_ptr<Message> msg);
     /**
      * dequeue from store (only done once messages is acknowledged)
      */
@@ -311,7 +313,7 @@ class Queue : public boost::enable_share
      * Inform the queue that a previous transactional dequeue
      * committed.
      */
-    void dequeueCommitted(const QueuedMessage& msg);
+    QPID_BROKER_EXTERN void dequeueCommitted(const QueuedMessage& msg);
 
     /**
      * Inform queue of messages that were enqueued, have since
@@ -319,7 +321,7 @@ class Queue : public boost::enable_share
      * thus are still logically on the queue) - used in
      * clustered broker.
      */
-    void updateEnqueued(const QueuedMessage& msg);
+    QPID_BROKER_EXTERN void updateEnqueued(const QueuedMessage& msg);
 
     /**
      * Test whether the specified message (identified by its
@@ -328,7 +330,7 @@ class Queue : public boost::enable_share
      * have been delievered to a subscriber who has not yet
      * accepted it).
      */
-    bool isEnqueued(const QueuedMessage& msg);
+    QPID_BROKER_EXTERN bool isEnqueued(const QueuedMessage& msg);
 
     /**
      * Acquires the next available (oldest) message
@@ -338,17 +340,17 @@ class Queue : public boost::enable_share
     /** Get the message at position pos, returns true if found and sets msg */
     QPID_BROKER_EXTERN bool find(framing::SequenceNumber pos, QueuedMessage& msg ) const;
 
-    const QueuePolicy* getPolicy();
+    QPID_BROKER_EXTERN const QueuePolicy* getPolicy();
 
-    void setAlternateExchange(boost::shared_ptr<Exchange> exchange);
-    boost::shared_ptr<Exchange> getAlternateExchange();
-    bool isLocal(boost::intrusive_ptr<Message>& msg);
+    QPID_BROKER_EXTERN void setAlternateExchange(boost::shared_ptr<Exchange> exchange);
+    QPID_BROKER_EXTERN boost::shared_ptr<Exchange> getAlternateExchange();
+    QPID_BROKER_EXTERN bool isLocal(boost::intrusive_ptr<Message>& msg);
 
     //PersistableQueue support:
-    uint64_t getPersistenceId() const;
-    void setPersistenceId(uint64_t persistenceId) const;
-    void encode(framing::Buffer& buffer) const;
-    uint32_t encodedSize() const;
+    QPID_BROKER_EXTERN uint64_t getPersistenceId() const;
+    QPID_BROKER_EXTERN void setPersistenceId(uint64_t persistenceId) const;
+    QPID_BROKER_EXTERN void encode(framing::Buffer& buffer) const;
+    QPID_BROKER_EXTERN uint32_t encodedSize() const;
 
     /**
      * Restores a queue from encoded data (used in recovery)
@@ -362,15 +364,15 @@ class Queue : public boost::enable_share
     virtual void setExternalQueueStore(ExternalQueueStore* inst);
 
     // Increment the rejected-by-consumer counter.
-    void countRejected() const;
-    void countFlowedToDisk(uint64_t size) const;
-    void countLoadedFromDisk(uint64_t size) const;
+    QPID_BROKER_EXTERN void countRejected() const;
+    QPID_BROKER_EXTERN void countFlowedToDisk(uint64_t size) const;
+    QPID_BROKER_EXTERN void countLoadedFromDisk(uint64_t size) const;
 
     // Manageable entry points
-    management::ManagementObject* GetManagementObject (void) const;
+    QPID_BROKER_EXTERN management::ManagementObject* GetManagementObject (void) const;
     management::Manageable::status_t
-    ManagementMethod (uint32_t methodId, management::Args& args, std::string& text);
-    void query(::qpid::types::Variant::Map&) const;
+    QPID_BROKER_EXTERN ManagementMethod (uint32_t methodId, management::Args& args, std::string& text);
+    QPID_BROKER_EXTERN void query(::qpid::types::Variant::Map&) const;
 
     /** Apply f to each Message on the queue. */
     template <class F> void eachMessage(F f) {
@@ -396,31 +398,31 @@ class Queue : public boost::enable_share
     /** return current position sequence number for the next message on the queue.
      */
     QPID_BROKER_EXTERN framing::SequenceNumber getPosition();
-    void addObserver(boost::shared_ptr<QueueObserver>);
-    void removeObserver(boost::shared_ptr<QueueObserver>);
+    QPID_BROKER_EXTERN void addObserver(boost::shared_ptr<QueueObserver>);
+    QPID_BROKER_EXTERN void removeObserver(boost::shared_ptr<QueueObserver>);
     QPID_BROKER_EXTERN void insertSequenceNumbers(const std::string& key);
     /**
      * Notify queue that recovery has completed.
      */
-    void recoveryComplete(ExchangeRegistry& exchanges);
+    QPID_BROKER_EXTERN void recoveryComplete(ExchangeRegistry& exchanges);
 
     // For cluster update
-    QueueListeners& getListeners();
-    Messages& getMessages();
-    const Messages& getMessages() const;
+    QPID_BROKER_EXTERN QueueListeners& getListeners();
+    QPID_BROKER_EXTERN Messages& getMessages();
+    QPID_BROKER_EXTERN const Messages& getMessages() const;
 
     /**
      * Reserve space in policy for an enqueued message that
      * has been recovered in the prepared state (dtx only)
      */
-    void recoverPrepared(boost::intrusive_ptr<Message>& msg);
+    QPID_BROKER_EXTERN void recoverPrepared(boost::intrusive_ptr<Message>& msg);
 
-    void flush();
+    QPID_BROKER_EXTERN void flush();
 
-    Broker* getBroker();
+    QPID_BROKER_EXTERN Broker* getBroker();
 
     uint32_t getDequeueSincePurge() { return dequeueSincePurge.get(); }
-    void setDequeueSincePurge(uint32_t value);
+    QPID_BROKER_EXTERN void setDequeueSincePurge(uint32_t value);
 };
 }
 }

Modified: qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/SemanticState.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/SemanticState.h?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/SemanticState.h (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qpid/broker/SemanticState.h Mon Feb 27 17:40:42 2012
@@ -22,6 +22,7 @@
  *
  */
 
+#include "qpid/broker/BrokerImportExport.h"
 #include "qpid/broker/Consumer.h"
 #include "qpid/broker/Credit.h"
 #include "qpid/broker/Deliverable.h"
@@ -98,42 +99,44 @@ class SemanticState : private boost::non
         bool haveCredit();
 
       protected:
-        virtual bool doDispatch();
+        QPID_BROKER_EXTERN virtual bool doDispatch();
         size_t unacked() { return parent->unacked.size(); }
 
       public:
         typedef boost::shared_ptr<ConsumerImpl> shared_ptr;
 
-        ConsumerImpl(SemanticState* parent,
-                     const std::string& name, boost::shared_ptr<Queue> queue,
-                     bool ack, bool acquire, bool exclusive,
-                     const std::string& tag, const std::string& resumeId, uint64_t resumeTtl, const framing::FieldTable& arguments);
-        virtual ~ConsumerImpl();
-        OwnershipToken* getSession();
-        virtual bool deliver(QueuedMessage& msg);
-        bool filter(boost::intrusive_ptr<Message> msg);
-        bool accept(boost::intrusive_ptr<Message> msg);
-        void cancel() {}
-
-        void disableNotify();
-        void enableNotify();
-        void notify();
-        bool isNotifyEnabled() const;
-
-        void requestDispatch();
-
-        void setWindowMode();
-        void setCreditMode();
-        void addByteCredit(uint32_t value);
-        void addMessageCredit(uint32_t value);
-        void flush();
-        void stop();
-        void complete(DeliveryRecord&);
+        QPID_BROKER_EXTERN ConsumerImpl(
+            SemanticState* parent,
+            const std::string& name, boost::shared_ptr<Queue> queue,
+            bool ack, bool acquire, bool exclusive,
+            const std::string& tag, const std::string& resumeId, uint64_t resumeTtl,
+            const framing::FieldTable& arguments);
+        QPID_BROKER_EXTERN virtual ~ConsumerImpl();
+        QPID_BROKER_EXTERN OwnershipToken* getSession();
+        QPID_BROKER_EXTERN virtual bool deliver(QueuedMessage& msg);
+        QPID_BROKER_EXTERN bool filter(boost::intrusive_ptr<Message> msg);
+        QPID_BROKER_EXTERN bool accept(boost::intrusive_ptr<Message> msg);
+        QPID_BROKER_EXTERN void cancel() {}
+
+        QPID_BROKER_EXTERN void disableNotify();
+        QPID_BROKER_EXTERN void enableNotify();
+        QPID_BROKER_EXTERN void notify();
+        QPID_BROKER_EXTERN bool isNotifyEnabled() const;
+
+        QPID_BROKER_EXTERN void requestDispatch();
+
+        QPID_BROKER_EXTERN void setWindowMode();
+        QPID_BROKER_EXTERN void setCreditMode();
+        QPID_BROKER_EXTERN void addByteCredit(uint32_t value);
+        QPID_BROKER_EXTERN void addMessageCredit(uint32_t value);
+        QPID_BROKER_EXTERN void flush();
+        QPID_BROKER_EXTERN void stop();
+        QPID_BROKER_EXTERN void complete(DeliveryRecord&);
         boost::shared_ptr<Queue> getQueue() const { return queue; }
         bool isBlocked() const { return blocked; }
         bool setBlocked(bool set) { std::swap(set, blocked); return set; }
 
-        bool doOutput();
+        QPID_BROKER_EXTERN bool doOutput();
 
         Credit& getCredit() { return credit; }
         const Credit& getCredit() const { return credit; }
@@ -151,8 +154,11 @@ class SemanticState : private boost::non
         void acknowledged(const broker::QueuedMessage&) {}
 
         // manageable entry points
-        management::ManagementObject* GetManagementObject (void) const;
-        management::Manageable::status_t ManagementMethod (uint32_t methodId, management::Args& args, std::string& text);
+        QPID_BROKER_EXTERN management::ManagementObject*
+        GetManagementObject(void) const;
+
+        QPID_BROKER_EXTERN management::Manageable::status_t
+        ManagementMethod(uint32_t methodId, management::Args& args, std::string& text);
     };
 
     typedef std::map<std::string, DtxBuffer::shared_ptr> DtxBufferMap;

Modified: qpid/branches/QPID-3799-acl/cpp/src/qpid/client/TCPConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-3799-acl/cpp/src/qpid/client/TCPConnector.cpp?rev=1294242&r1=1294241&r2=1294242&view=diff
==============================================================================
--- qpid/branches/QPID-3799-acl/cpp/src/qpid/client/TCPConnector.cpp (original)
+++ qpid/branches/QPID-3799-acl/cpp/src/qpid/client/TCPConnector.cpp Mon Feb 27 17:40:42 2012
@@ -97,7 +97,7 @@ void TCPConnector::connect(const std::st
         boost::bind(&TCPConnector::connected, this, _1),
         boost::bind(&TCPConnector::connectFailed, this, _3));
     closed = false;
-    identifier = str(format("[%1%]") % socket.getFullAddress());
+
     connector->start(poller);
 }
 
@@ -120,6 +120,8 @@ void TCPConnector::start(sys::AsynchIO* 
     for (int i = 0; i < 4; i++) {
         aio->queueReadBuffer(new Buff(maxFrameSize));
     }
+
+    identifier = str(format("[%1%]") % socket.getFullAddress());
 }
 
 void TCPConnector::initAmqp() {
@@ -129,7 +131,7 @@ void TCPConnector::initAmqp() {
 
 void TCPConnector::connectFailed(const std::string& msg) {
     connector = 0;
-    QPID_LOG(warning, "Connect failed: " << msg << " " << identifier);
+    QPID_LOG(warning, "Connect failed: " << msg);
     socket.close();
     if (!closed)
         closed = true;
@@ -183,7 +185,7 @@ sys::ShutdownHandler* TCPConnector::getS
     return shutdownHandler;
 }
 
-const std::string& TCPConnector::getIdentifier() const {
+const std::string& TCPConnector::getIdentifier() const { 
     return identifier;
 }
 

Propchange: qpid/branches/QPID-3799-acl/cpp/src/qpid/cluster/UpdateClient.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -1,2 +1,3 @@
 /qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1061302-1072333
 /qpid/branches/qpid-3346/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1144319-1179855
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp:1291399-1294217

Propchange: qpid/branches/QPID-3799-acl/cpp/src/qpid/cluster/UpdateClient.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 17:40:42 2012
@@ -1 +1,2 @@
 /qpid/branches/qpid-2935/qpid/cpp/src/qpid/cluster/UpdateClient.h:1061302-1072333
+/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h:1291399-1294217



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org