You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2010/03/23 19:00:56 UTC
svn commit: r926686 [1/6] - in /qpid/branches/qmf-devel0.7a/qpid: ./ cpp/
cpp/docs/api/ cpp/docs/src/ cpp/examples/ cpp/examples/messaging/
cpp/examples/pub-sub/ cpp/include/qmf/engine/ cpp/include/qpid/agent/
cpp/include/qpid/client/amqp0_10/ cpp/incl...
Author: kgiusti
Date: Tue Mar 23 18:00:49 2010
New Revision: 926686
URL: http://svn.apache.org/viewvc?rev=926686&view=rev
Log:
merge r919024:926606 trunk into this branch
Added:
qpid/branches/qmf-devel0.7a/qpid/QPID_VERSION.txt
- copied unchanged from r926606, qpid/trunk/qpid/QPID_VERSION.txt
qpid/branches/qmf-devel0.7a/qpid/cpp/.gitignore
- copied unchanged from r926606, qpid/trunk/qpid/cpp/.gitignore
qpid/branches/qmf-devel0.7a/qpid/cpp/bld-winsdk.ps1
- copied unchanged from r926606, qpid/trunk/qpid/cpp/bld-winsdk.ps1
qpid/branches/qmf-devel0.7a/qpid/cpp/docs/src/
- copied from r926606, qpid/trunk/qpid/cpp/docs/src/
qpid/branches/qmf-devel0.7a/qpid/cpp/docs/src/CONTENTS
- copied unchanged from r926606, qpid/trunk/qpid/cpp/docs/src/CONTENTS
qpid/branches/qmf-devel0.7a/qpid/cpp/docs/src/DispatchHandle.odg
- copied unchanged from r926606, qpid/trunk/qpid/cpp/docs/src/DispatchHandle.odg
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h
- copied unchanged from r926606, qpid/trunk/qpid/cpp/include/qpid/client/amqp0_10/FailoverUpdates.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Handle.h
- copied unchanged from r926606, qpid/trunk/qpid/cpp/include/qpid/messaging/Handle.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ImportExport.h
- copied unchanged from r926606, qpid/trunk/qpid/cpp/include/qpid/messaging/ImportExport.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/FailoverUpdates.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SimpleUrlParser.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementDirectExchange.h
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/management/ManagementDirectExchange.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementTopicExchange.h
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/management/ManagementTopicExchange.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/SecuritySettings.h
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/qpid/sys/SecuritySettings.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/testagent.cpp
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/tests/testagent.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/testagent.mk
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/tests/testagent.mk
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/testagent.xml
- copied unchanged from r926606, qpid/trunk/qpid/cpp/src/tests/testagent.xml
qpid/branches/qmf-devel0.7a/qpid/doc/book/Makefile
- copied unchanged from r926606, qpid/trunk/qpid/doc/book/Makefile
qpid/branches/qmf-devel0.7a/qpid/doc/book/README.txt
- copied unchanged from r926606, qpid/trunk/qpid/doc/book/README.txt
qpid/branches/qmf-devel0.7a/qpid/doc/book/build.sh
- copied unchanged from r926606, qpid/trunk/qpid/doc/book/build.sh
qpid/branches/qmf-devel0.7a/qpid/doc/book/build.xml
- copied unchanged from r926606, qpid/trunk/qpid/doc/book/build.xml
qpid/branches/qmf-devel0.7a/qpid/extras/qmf/.gitignore
- copied unchanged from r926606, qpid/trunk/qpid/extras/qmf/.gitignore
qpid/branches/qmf-devel0.7a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
- copied unchanged from r926606, qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/TransportBuilder.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkTransport.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Transport.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoContext.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayer.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/
- copied from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
- copied unchanged from r926606, qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLUtil.java
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/
- copied from r926606, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
- copied unchanged from r926606, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/
- copied from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/CA_db/
- copied from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/CA_db/
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/CA_db/cert8.db
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/CA_db/key3.db
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/CA_db/rootca.crt
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/CA_db/secmod.db
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/app1.crt
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/app1.crt
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/app1.req
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/app1.req
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/app2.crt
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/app2.crt
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/app2.req
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/app2.req
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/certstore.jks
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/certstore.jks
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/keystore.jks
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/keystore.jks
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/pfile
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/pfile
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/server_db/
- copied from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/server_db/
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/server_db/cert8.db
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/server_db/key3.db
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/server_db/key3.db
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/server_db/secmod.db
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/server_db/server.crt
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/server_db/server.crt
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ssl/server_db/server.req
- copied unchanged from r926606, qpid/trunk/qpid/java/test-profiles/test_resources/ssl/server_db/server.req
qpid/branches/qmf-devel0.7a/qpid/tools/.gitignore
- copied unchanged from r926606, qpid/trunk/qpid/tools/.gitignore
Removed:
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementExchange.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementExchange.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/testagent/Makefile.am
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/testagent/schema.xml
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/testagent/testagent.cpp
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicBinding.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/ssl/
Modified:
qpid/branches/qmf-devel0.7a/qpid/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake
qpid/branches/qmf-devel0.7a/qpid/cpp/CMakeLists.txt
qpid/branches/qmf-devel0.7a/qpid/cpp/INSTALL
qpid/branches/qmf-devel0.7a/qpid/cpp/Makefile.am
qpid/branches/qmf-devel0.7a/qpid/cpp/SSL
qpid/branches/qmf-devel0.7a/qpid/cpp/bootstrap
qpid/branches/qmf-devel0.7a/qpid/cpp/configure.ac
qpid/branches/qmf-devel0.7a/qpid/cpp/docs/api/CMakeLists.txt
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/README.txt
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/examples.sln
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/client.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/drain.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_receiver.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_sender.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_receiver.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_sender.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/server.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/spout.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_receiver.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_sender.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/pub-sub/verify_python_cpp.in
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify
qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify_all
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Agent.h (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Console.h (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/framing/FieldValue.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Address.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Codec.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Connection.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListContent.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListView.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapContent.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapView.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Message.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Receiver.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Sender.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Session.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Uuid.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Variant.h
qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/schema.py
qpid/branches/qmf-devel0.7a/qpid/cpp/src/CMakeLists.txt
qpid/branches/qmf-devel0.7a/qpid/cpp/src/Makefile.am
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/Agent.cpp (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/Version.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/Connection.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/Connection.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/ConnectionFactory.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/ConnectionFactory.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/IncompleteMessageList.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/Message.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/Message.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/SecureConnectionFactory.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/SecureConnectionFactory.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/ConnectionHandler.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/Connector.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/RdmaConnector.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/Sasl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/SaslFactory.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/SslConnector.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/TCPConnector.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/TCPConnector.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/Codecs.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Cluster.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Cluster.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Connection.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Connection.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/ConnectionCodec.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/ConnectionCodec.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/InitialStatusMap.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Multicaster.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/Multicaster.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/PollableQueue.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/StoreStatus.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (contents, props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.h (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/framing/FieldValue.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.cpp (contents, props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/management/ManagementAgent.h (contents, props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Connection.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Receiver.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Sender.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/SenderImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Session.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/SessionImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Variant.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/ConnectionCodec.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/SslPlugin.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/ssl/SslHandler.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/ssl/SslIo.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/ssl/SslIo.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/xml/XmlExchange.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ClusterFixture.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/InitialStatusMap.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Makefile.am
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/MessagingSessionTests.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Variant.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/cluster_tests.fail
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/cluster_tests.py (contents, props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/qpid_recv.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/qpid_send.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/qpid_stream.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/quick_topictest.ps1
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/topictest.ps1
qpid/branches/qmf-devel0.7a/qpid/cpp/xml/cluster.xml
qpid/branches/qmf-devel0.7a/qpid/doc/book/src/SASL-Compatibility.xml
qpid/branches/qmf-devel0.7a/qpid/doc/book/src/schemas.xml
qpid/branches/qmf-devel0.7a/qpid/dotnet/TestClient/TestClient.csproj
qpid/branches/qmf-devel0.7a/qpid/dotnet/TopicListener/TopicListener.csproj
qpid/branches/qmf-devel0.7a/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
qpid/branches/qmf-devel0.7a/qpid/dotnet/build-msbuild.bat (props changed)
qpid/branches/qmf-devel0.7a/qpid/dotnet/build-nant-release (props changed)
qpid/branches/qmf-devel0.7a/qpid/dotnet/build-nant.bat (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/bin/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/ManagementExchange.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/Binding.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfig.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeFactory.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicExchangeResult.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersBindingTest.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
qpid/branches/qmf-devel0.7a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
qpid/branches/qmf-devel0.7a/qpid/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
qpid/branches/qmf-devel0.7a/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/ssl/SSLContextFactory.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
qpid/branches/qmf-devel0.7a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoTransport.java
qpid/branches/qmf-devel0.7a/qpid/java/lib/org.osgi.core_1.0.0.jar (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/client/src/main/java/org/apache/qpid/management/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/client/src/test/java/org/apache/qpid/management/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/08StandaloneExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/CPPExcludes (contents, props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaStandaloneExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/clean-dir (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/default.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/java-derby.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/java.testprofile (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/examples/api/spout (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/examples/pubsub/verify.in
qpid/branches/qmf-devel0.7a/qpid/python/qpid/brokertest.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/concurrency.py (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/constants.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/driver.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/endpoints.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/message.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/tests/messaging/__init__.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/tests/messaging/endpoints.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/tests/messaging/message.py
qpid/branches/qmf-devel0.7a/qpid/python/qpid/validator.py
qpid/branches/qmf-devel0.7a/qpid/ruby/ext/sasl/extconf.rb (props changed)
qpid/branches/qmf-devel0.7a/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
qpid/branches/qmf-devel0.7a/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py (props changed)
Propchange: qpid/branches/qmf-devel0.7a/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar 23 18:00:49 2010
@@ -0,0 +1,3 @@
+/qpid/branches/0.5.x-dev/qpid:892761,894875
+/qpid/branches/java-network-refactor/qpid:805429-825319
+/qpid/trunk/qpid:919043-926606
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/BuildInstallSettings.cmake Tue Mar 23 18:00:49 2010
@@ -20,8 +20,17 @@
# Settings related to the Qpid build and install CMake/CTest/CPack procedure.
# These are used by both the C++ and WCF components.
-set (QPID_VERSION_MAJOR 0)
-set (QPID_VERSION_MINOR 6)
+# Parse the version from QPID_VERSION.txt.
+# Use the top level qpid/ file if we're in an SVN checkout, source dir otherwise.
+if(EXISTS "${PROJECT_SOURCE_DIR}/../QPID_VERSION.txt")
+ file(READ "${PROJECT_SOURCE_DIR}/../QPID_VERSION.txt" QPID_VERSION)
+elseif (EXISTS "${PROJECT_SOURCE_DIR}/QPID_VERSION.txt")
+ file(READ "${PROJECT_SOURCE_DIR}/QPID_VERSION.txt" QPID_VERSION)
+else()
+ message(FATAL_ERROR "Cannot find QPID_VERSION.txt")
+endif(EXISTS "${PROJECT_SOURCE_DIR}/../QPID_VERSION.txt")
+string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\1" QPID_VERSION_MAJOR "${QPID_VERSION}")
+string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\2" QPID_VERSION_MINOR "${QPID_VERSION}")
# When doing installs, there are a number of components that the item can
# be associated with. Since there may be different sets of components desired
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/CMakeLists.txt?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/CMakeLists.txt (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/CMakeLists.txt Tue Mar 23 18:00:49 2010
@@ -43,37 +43,6 @@ if (WIN32)
set (CPACK_NSIS_URL_INFO_ABOUT "http://qpid.apache.org/")
# Needs this to correctly set up Start menu links later.
set (CPACK_PACKAGE_EXECUTABLES "")
-
- # The WCF/C++ client is built separately (it doesn't build via CMake)
- # but is installed with the C++ components on Windows.
- install (PROGRAMS
- ${CMAKE_SOURCE_DIR}/../wcf/src/Apache/Qpid/Channel/bin/Release/Apache.Qpid.Channel.dll
- ${CMAKE_SOURCE_DIR}/../wcf/src/Apache/Qpid/Channel/bin/Release/Apache.Qpid.Interop.dll
- DESTINATION ${QPID_INSTALL_LIBDIR}
- COMPONENT ${QPID_COMPONENT_CLIENT})
- install (DIRECTORY ${CMAKE_SOURCE_DIR}/../wcf/samples/Channel
- DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
- COMPONENT ${QPID_COMPONENT_EXAMPLES}
- PATTERN ".svn" EXCLUDE)
-
- # Find where gacutil is; it's not usually on the default PATH. If it can't
- # be located, the WCF assemblies can't be inserted in the GAC.
- # The gacutil stuff is disabled for now; to re-enable it, one must be able
- # to either find the gacutil somehow and specify the directory where
- # gacutil lives, add it to PATH, or use the FUSE API in a program that
- # inserts the DLLs programatically without gacutil. Or use WiX, which can
- # supposedly do this in an easier way.
- #
- # See jira QPID-2310 for more info; update that if you change this.
- #set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
- # ExecWait 'gacutil -I \\\"$INSTDIR\\\\${QPID_INSTALL_LIBDIR}\\\\Apache.Qpid.Channel.dll\\\"'
- # ExecWait 'gacutil -I \\\"$INSTDIR\\\\${QPID_INSTALL_LIBDIR}\\\\Apache.Qpid.Interop.dll\\\"'
- # ")
- #set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
- # ExecWait 'gacutil /u \\\"Apache.Qpid.Channel\\\"'
- # ExecWait 'gacutil /u \\\"Apache.Qpid.Interop\\\"'
- # ")
-
endif (WIN32)
set (QPIDC_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidc.conf CACHE STRING
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/INSTALL
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/INSTALL?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/INSTALL (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/INSTALL Tue Mar 23 18:00:49 2010
@@ -114,6 +114,8 @@ The optional clustering packages changed
# yum install openais-devel cman-devel
On Fedora 10 or later
# yum install corosync-devel cmanlib-devel
+On Fedora 12 they changed again:
+ # yum install corosynclib-devel clusterlib-devel
For SASL and SSL, include
# yum install cyrus-sasl-devel
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/Makefile.am?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/Makefile.am (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/Makefile.am Tue Mar 23 18:00:49 2010
@@ -25,7 +25,7 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
LICENSE NOTICE README SSL RELEASE_NOTES DESIGN \
xml/cluster.xml INSTALL-WINDOWS CMakeLists.txt BuildInstallSettings.cmake \
- packaging/NSIS
+ packaging/NSIS QPID_VERSION.txt
SUBDIRS = managementgen etc src docs/api docs/man examples bindings/qmf
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/SSL
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/SSL?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/SSL (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/SSL Tue Mar 23 18:00:49 2010
@@ -13,16 +13,16 @@ providing the ssl.so module is loaded):
SSL Settings:
--ssl-use-export-policy Use NSS export policy
- --ssl-cert-password-file PATH File containing password to use for
- accessing certificate database
+ --ssl-cert-password-file PATH File containing password to use for accessing
+ certificate database
--ssl-cert-db PATH Path to directory containing certificate
database
- --ssl-cert-name NAME (thinkpad) Name of the certificate to use
- --ssl-port PORT (5671) Port on which to listen for SSL
- connections
- --ssl-require-client-authentication Forces clients to authenticate in order
+ --ssl-cert-name NAME (hostname) Name of the certificate to use
+ --ssl-port PORT (5671) Port on which to listen for SSL connections
+ --ssl-require-client-authentication Forces clients to authenticate in order
to establish an SSL connection
-
+ --ssl-sasl-no-dict Disables SASL mechanisms that are vulner able to
+ passive dictionary-based password attacks
The first four of these are also available as client options (where
they must either be in the client config file or set as environment
@@ -66,6 +66,12 @@ and run e.g.
./src/tests/perftest --count 10000 -P ssl --port 5671 \
--broker myhost.mydomain
+When authentication is enabled, the EXTERNAL mechanism will be
+available on client authenticated SSL connections. This allows the
+clients authorisation id to be taken from the validated client
+certificate (it will be the CN with any DCs present appended as the
+domain, e.g. CN=bob,DC=acme,DC=com would result in an identity of
+bob@acme.com).
[1] http://www.mozilla.org/projects/security/pki/nss/ref/ssl/gtstd.html
[2] http://www.mozilla.org/projects/security/pki/nss/tools/certutil.html
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/bootstrap
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/bootstrap?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/bootstrap (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/bootstrap Tue Mar 23 18:00:49 2010
@@ -1,5 +1,8 @@
#!/bin/sh
-set -e
+
+# Copy the global QPID_VERSION.txt file into the source tree.
+cp ../QPID_VERSION.txt .
+
aclocal -I m4
autoheader
libtoolize --automake
@@ -15,10 +18,10 @@ cat > src/managementgen.mk <<EOF
\$(mgen_cmd)
EOF
-
automake
autoconf
+# Optionally do the build as well.
if [ "$1" = "-build" -o "$1" = "--build" ] ; then
shift
./configure "$@"
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/configure.ac?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/configure.ac (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/configure.ac Tue Mar 23 18:00:49 2010
@@ -8,10 +8,13 @@ dnl This program is distributed in the h
dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
dnl
-dnl When updating the name/version number here, also update it in
-dnl src/qpid/Version.h
-AC_INIT([qpidc], [0.7], [dev@qpid.apache.org])
+# Pick up the version from QPID_VERSION.txt in the qpid/cpp source tree.
+# NB. You need to re-run bootstrap if the global qpid/QPID_VERSION.txt changes.
+AC_INIT([qpidc],
+ [m4_esyscmd([cat QPID_VERSION.txt | tr -d '\n'])],
+ [dev@qpid.apache.org])
+
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
@@ -232,8 +235,7 @@ if test -n "$PYTHON" ; then
fi
AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test -f $PYTHON_INC/Python.h && test -n "$SWIG"])
-
-specdir=`pwd`/$srcdir/../specs
+specdir=`pwd`/$srcdir/../specs
AMQP_FINAL_XML=$specdir/amqp.0-10-qpid-errata.xml
AC_SUBST(AMQP_FINAL_XML)
AM_CONDITIONAL([GENERATE], [test -f $AMQP_FINAL_XML])
@@ -346,6 +348,8 @@ esac
test $want_xml = no && use_xml=no
+
+
# If the user doesn't say not to use XML, see if it's available.
if test $use_xml != no; then
# Then see if XQilla is available
@@ -364,6 +368,13 @@ if test $use_xml != no; then
# Else XQilla is available - use it to build
test $use_xml = yes &&
AC_DEFINE([HAVE_XML], [1], [Compile-in XML Exchange support.])
+
+ # Check to see if we need to use legacy calls for effective boolean value
+ xqilla_has_ebv=yes
+ AC_CHECK_HEADER([xqilla/ast/XQEffectiveBooleanValue.hpp], , [xqilla_has_ebv=no])
+ test $xqilla_has_ebv = yes &&
+ AC_DEFINE([XQ_EFFECTIVE_BOOLEAN_VALUE_HPP], [1], [XQilla version has xqilla/ast/XQEffectiveBooleanValue.hpp.])
+
fi
AM_CONDITIONAL([HAVE_XML], [test $use_xml = yes])
@@ -525,7 +536,6 @@ AC_CONFIG_FILES([
src/Makefile
src/tests/Makefile
src/tests/test_env.sh
- src/tests/testagent/Makefile
docs/man/Makefile
docs/api/Makefile
docs/api/user.doxygen
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/docs/api/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/docs/api/CMakeLists.txt?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/docs/api/CMakeLists.txt (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/docs/api/CMakeLists.txt Tue Mar 23 18:00:49 2010
@@ -26,7 +26,10 @@ if (GEN_DOXYGEN)
set (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/user.doxygen.in
${CMAKE_CURRENT_BINARY_DIR}/user.doxygen)
- add_custom_target (user-api-docs COMMAND ${DOXYGEN_EXECUTABLE} user.doxygen)
+ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/developer.doxygen.in
+ ${CMAKE_CURRENT_BINARY_DIR}/develeoper.doxygen)
+ add_custom_target (docs-user-api COMMAND ${DOXYGEN_EXECUTABLE} user.doxygen)
+ add_custom_target (docs-developer COMMAND ${DOXYGEN_EXECUTABLE} developer.doxygen)
# HTML files are generated to ./html - put those in the install.
install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/README.txt
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/README.txt?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/README.txt (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/README.txt Tue Mar 23 18:00:49 2010
@@ -16,12 +16,12 @@ On Linux:
# ./declare_queues host1 9999
On Windows:
- C:\Program Files\qpidc-0.6\examples\direct> declare_queues host1 9999
+ C:\Program Files\qpidc-0.7\examples\direct> declare_queues host1 9999
The qpid C++ broker executable is named qpidd on Linux and qpidd.exe
on Windows. The default install locations are:
- Linux: /usr/sbin
-- Windows: C:\Program Files\qpidc-0.6\bin
+- Windows: C:\Program Files\qpidc-0.7\bin
In a C++ source distribution the broker is located in the src subdirectory
(generally, from this examples directory, ../src).
@@ -52,9 +52,9 @@ On Linux:
# ./listener
On Windows:
- C:\Program Files\qpidc-0.6\examples\direct> declare_queues
- C:\Program Files\qpidc-0.6\examples\direct> direct_producer
- C:\Program Files\qpidc-0.6\examples\direct> listener
+ C:\Program Files\qpidc-0.7\examples\direct> declare_queues
+ C:\Program Files\qpidc-0.7\examples\direct> direct_producer
+ C:\Program Files\qpidc-0.7\examples\direct> listener
Note that there is no requirement for the listener to be running before the
messages are published. The messages are stored in the queue until consumed
@@ -86,9 +86,9 @@ On Linux:
# ./fanout_producer
On Windows:
- C:\Program Files\qpidc-0.6\examples\fanout> listener
+ C:\Program Files\qpidc-0.7\examples\fanout> listener
- C:\Program Files\qpidc-0.6\examples\direct> fanout_producer
+ C:\Program Files\qpidc-0.7\examples\direct> fanout_producer
== Publisher/Subscriber ==
@@ -122,9 +122,9 @@ On Linux:
# ./topic_publisher
On Windows:
- C:\Program Files\qpidc-0.6\examples\pub-sub> topic_listener
+ C:\Program Files\qpidc-0.7\examples\pub-sub> topic_listener
- C:\Program Files\qpidc-0.6\examples\pub-sub> topic_publisher
+ C:\Program Files\qpidc-0.7\examples\pub-sub> topic_publisher
== Request/Response ==
@@ -147,8 +147,8 @@ On Linux:
# ./client
On Windows:
- C:\Program Files\qpidc-0.6\examples\request-response> server
- C:\Program Files\qpidc-0.6\examples\request-response> client
+ C:\Program Files\qpidc-0.7\examples\request-response> server
+ C:\Program Files\qpidc-0.7\examples\request-response> client
== QMF Agent ==
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/examples.sln
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/examples.sln?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/examples.sln (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/examples.sln Tue Mar 23 18:00:49 2010
@@ -295,6 +295,18 @@ Global
{E614CC2C-FECA-1BAD-23CE-CD4095BD3C8B}.Release|Win32.Build.0 = Release|Win32
{E614CC2C-FECA-1BAD-23CE-CD4095BD3C8B}.Release|x64.ActiveCfg = Release|x64
{E614CC2C-FECA-1BAD-23CE-CD4095BD3C8B}.Release|x64.Build.0 = Release|x64
+ {D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|Win32.Build.0 = Debug|Win32
+ {D79791E5-C593-4F23-B545-0CE72D181F2A}.Debug|x64.ActiveCfg = Debug|Win32
+ {D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|Win32.ActiveCfg = Release|Win32
+ {D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|Win32.Build.0 = Release|Win32
+ {D79791E5-C593-4F23-B545-0CE72D181F2A}.Release|x64.ActiveCfg = Release|Win32
+ {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|Win32.Build.0 = Debug|Win32
+ {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Debug|x64.ActiveCfg = Debug|Win32
+ {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|Win32.ActiveCfg = Release|Win32
+ {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|Win32.Build.0 = Release|Win32
+ {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/client.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/client.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/client.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/client.cpp Tue Mar 23 18:00:49 2010
@@ -39,8 +39,8 @@ using std::string;
int main(int argc, char** argv) {
const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
+ Connection connection;
try {
- Connection connection;
connection.open(url);
Session session = connection.newSession();
@@ -70,6 +70,7 @@ int main(int argc, char** argv) {
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
return 1;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/drain.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/drain.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/drain.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/drain.cpp Tue Mar 23 18:00:49 2010
@@ -93,8 +93,8 @@ int main(int argc, char** argv)
{
Options options(argv[0]);
if (options.parse(argc, argv)) {
+ Connection connection(options.connectionOptions);
try {
- Connection connection(options.connectionOptions);
connection.open(options.url);
Session session = connection.newSession();
Receiver receiver = session.createReceiver(options.address);
@@ -116,6 +116,7 @@ int main(int argc, char** argv)
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
}
return 1;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_receiver.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_receiver.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_receiver.cpp Tue Mar 23 18:00:49 2010
@@ -38,8 +38,8 @@ using std::string;
int main(int argc, char** argv) {
const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
+ Connection connection;
try {
- Connection connection;
connection.open(url);
Session session = connection.newSession();
Receiver receiver = session.createReceiver("message_queue");
@@ -52,6 +52,7 @@ int main(int argc, char** argv) {
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
return 1;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_sender.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_sender.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_sender.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/map_sender.cpp Tue Mar 23 18:00:49 2010
@@ -37,9 +37,8 @@ using std::string;
int main(int argc, char** argv) {
const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-
+ Connection connection;
try {
- Connection connection;
connection.open(url);
Session session = connection.newSession();
Sender sender = session.createSender("message_queue");
@@ -64,6 +63,7 @@ int main(int argc, char** argv) {
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
return 1;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_receiver.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_receiver.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_receiver.cpp Tue Mar 23 18:00:49 2010
@@ -31,8 +31,8 @@ using namespace qpid::messaging;
int main(int argc, char** argv) {
const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
+ Connection connection;
try {
- Connection connection;
connection.open(url);
Session session = connection.newSession();
Receiver receiver = session.createReceiver("message_queue");
@@ -51,6 +51,7 @@ int main(int argc, char** argv) {
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
return 1;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_sender.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_sender.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_sender.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/queue_sender.cpp Tue Mar 23 18:00:49 2010
@@ -34,8 +34,8 @@ int main(int argc, char** argv) {
const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
int count = argc>2 ? atoi(argv[2]) : 10;
+ Connection connection;
try {
- Connection connection;
connection.open(url);
Session session = connection.newSession();
Sender sender = session.createSender("message_queue");
@@ -50,10 +50,10 @@ int main(int argc, char** argv) {
// And send a final message to indicate termination.
sender.send(Message("That's all, folks!"));
session.sync();
- connection.close();
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
return 1;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/server.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/server.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/server.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/server.cpp Tue Mar 23 18:00:49 2010
@@ -41,8 +41,8 @@ using std::string;
int main(int argc, char** argv) {
const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
+ Connection connection;
try {
- Connection connection;
connection.open(url);
Session session = connection.newSession();
Receiver receiver = session.createReceiver("service_queue; {create: always}");
@@ -70,6 +70,7 @@ int main(int argc, char** argv) {
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
return 1;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/spout.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/spout.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/spout.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/spout.cpp Tue Mar 23 18:00:49 2010
@@ -156,8 +156,8 @@ int main(int argc, char** argv)
{
Options options(argv[0]);
if (options.parse(argc, argv)) {
+ Connection connection(options.connectionOptions);
try {
- Connection connection(options.connectionOptions);
connection.open(options.url);
Session session = connection.newSession();
Sender sender = session.createSender(options.address);
@@ -183,6 +183,7 @@ int main(int argc, char** argv)
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
}
return 1;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_receiver.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_receiver.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_receiver.cpp Tue Mar 23 18:00:49 2010
@@ -34,8 +34,8 @@ int main(int argc, char** argv) {
const std::string url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
const std::string pattern = argc>2 ? argv[2] : "#.#";
+ Connection connection;
try {
- Connection connection;
connection.open(url);
Session session = connection.newSession();
Receiver receiver = session.createReceiver("news_service; {filter:[control, " + pattern + "]}");
@@ -53,6 +53,7 @@ int main(int argc, char** argv) {
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
return 1;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_sender.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_sender.cpp?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_sender.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/messaging/topic_sender.cpp Tue Mar 23 18:00:49 2010
@@ -51,8 +51,8 @@ int main(int argc, char** argv) {
const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
int count = argc>2 ? atoi(argv[2]) : 10;
+ Connection connection;
try {
- Connection connection;
connection.open(url);
Session session = connection.newSession();
Sender sender = session.createSender("news_service");
@@ -72,6 +72,7 @@ int main(int argc, char** argv) {
return 0;
} catch(const std::exception& error) {
std::cout << error.what() << std::endl;
+ connection.close();
}
return 1;
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/pub-sub/verify_python_cpp.in
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/pub-sub/verify_python_cpp.in?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/pub-sub/verify_python_cpp.in (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/pub-sub/verify_python_cpp.in Tue Mar 23 18:00:49 2010
@@ -5,6 +5,10 @@ Declaring queue: news
Declaring queue: usa
Declaring queue: weather
Listening for messages ...
+Message: That's all, folks! from europe
+Message: That's all, folks! from news
+Message: That's all, folks! from usa
+Message: That's all, folks! from weather
Message: europe.news 0 from europe
Message: europe.news 0 from news
Message: europe.news 1 from europe
@@ -25,10 +29,6 @@ Message: europe.weather 3 from europe
Message: europe.weather 3 from weather
Message: europe.weather 4 from europe
Message: europe.weather 4 from weather
-Message: That's all, folks! from europe
-Message: That's all, folks! from news
-Message: That's all, folks! from usa
-Message: That's all, folks! from weather
Message: usa.news 0 from news
Message: usa.news 0 from usa
Message: usa.news 1 from news
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify Tue Mar 23 18:00:49 2010
@@ -19,6 +19,7 @@
# under the License.
#
+export LC_ALL=C
# Driver script to verify installed examples (also used for build tests.)
#
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify_all
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify_all?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify_all (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/examples/verify_all Tue Mar 23 18:00:49 2010
@@ -48,7 +48,7 @@ if test -z "$exclude_regexp"; then
run_examples=$all_examples
else
for f in $all_examples; do
- { cat $f | grep $exclude_regexp > /dev/null ; } || run_examples="$run_examples $f"
+ { echo $f | grep $exclude_regexp > /dev/null ; } || run_examples="$run_examples $f"
done
fi
$verify $topsrcdir $topbuilddir $run_examples
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:00:49 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:919043-926606
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 23 18:00:49 2010
@@ -0,0 +1 @@
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:919043-926606
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/agent/QmfAgentImportExport.h Tue Mar 23 18:00:49 2010
@@ -21,7 +21,7 @@
*/
#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-#if defined(QMF_AGENT_EXPORT) || defined (qmfagent_EXPORTS)
+#if defined (qmf_EXPORTS)
#define QMF_AGENT_EXTERN __declspec(dllexport)
#else
#define QMF_AGENT_EXTERN __declspec(dllimport)
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/framing/FieldValue.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/framing/FieldValue.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/framing/FieldValue.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/framing/FieldValue.h Tue Mar 23 18:00:49 2010
@@ -335,6 +335,16 @@ class Str16Value : public FieldValue {
QPID_COMMON_EXTERN Str16Value(const std::string& v);
};
+class Var16Value : public FieldValue {
+ public:
+ QPID_COMMON_EXTERN Var16Value(const std::string& v, uint8_t code);
+};
+
+class Var32Value : public FieldValue {
+ public:
+ QPID_COMMON_EXTERN Var32Value(const std::string& v, uint8_t code);
+};
+
class Struct32Value : public FieldValue {
public:
QPID_COMMON_EXTERN Struct32Value(const std::string& v);
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Address.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Address.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Address.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Address.h Tue Mar 23 18:00:49 2010
@@ -24,7 +24,7 @@
#include <string>
#include "qpid/Exception.h"
#include "qpid/messaging/Variant.h"
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
#include <ostream>
namespace qpid {
@@ -79,6 +79,11 @@ class AddressImpl;
* nide when a sender or receiver is cancelled. Can be one of <i>always</i>,
* <i>never</i>, <i>sender</i> or <i>receiver</i>.</td></tr>
*
+ * <tr valign=top><td>reliability</td><td>indicates the level of
+ * reliability expected. Can be one of unreliable, at-most-once,
+ * at-least-once or exactly-once (the latter is not yet correctly
+ * supported).</td></tr>
+ *
* <tr valign=top><td>node-properties</td><td>A nested map of properties of the addressed
* entity or 'node'. These can be used when automatically creating it,
* or to assert certain properties.
@@ -109,16 +114,14 @@ class AddressImpl;
* receiver does not want to receiver messages published to the topic
* that originate from a sender on the same connection</td></tr>
*
- * <tr valign=top><td>browse</td><td>(only relevant for queues) specifies that the receiver
- * does not wish to consume the messages, but merely browse them</td></tr>
+ * <tr valign=top><td>mode</td><td>(only relevant for queues)
+ * indicates whether the subscribe should consume (the default) or
+ * merely browse the messages. Valid values are 'consume' and
+ * 'browse'</td></tr>
*
* <tr valign=top><td>durable</td><td>(only relevant for topics at present) specifies that a
* durable subscription is required</td></tr>
*
- * <tr valign=top><td>reliability</td><td>indicates the level of reliability that the receiver
- * expects. Can be one of unreliable, at-most-once, at-least-once or
- * exactly-once (the latter is not yet correctly supported).</td></tr>
- *
* <tr valign=top><td>filter</td><td>(only relevant for topics at present) allows bindings to
* be created for the queue that match the given criteria (or list of
* criteria).</td></tr>
@@ -133,7 +136,7 @@ class AddressImpl;
* <li>exclusive, which requests an exclusive subscription and
* is only relevant for queues</li>
*
- * <li>x-queue-arguments, which ais only relevant for topics and
+ * <li>x-queue-arguments, which is only relevant for topics and
* allows arguments to the queue-declare for the subscription
* queue to be specified</li>
* </ul>
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Codec.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Codec.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Codec.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Codec.h Tue Mar 23 18:00:49 2010
@@ -22,7 +22,7 @@
*
*/
#include <string>
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
namespace qpid {
namespace messaging {
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Connection.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Connection.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Connection.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Connection.h Tue Mar 23 18:00:49 2010
@@ -22,19 +22,14 @@
*
*/
#include <string>
-#include "qpid/client/ClientImportExport.h"
-#include "qpid/client/Handle.h"
+#include "qpid/messaging/ImportExport.h"
+#include "qpid/messaging/Handle.h"
#include "qpid/messaging/Variant.h"
namespace qpid {
-namespace client {
-
-template <class> class PrivateImplRef;
-
-}
-
namespace messaging {
+template <class> class PrivateImplRef;
class ConnectionImpl;
class Session;
@@ -43,7 +38,7 @@ struct InvalidOptionString : public qpid
InvalidOptionString(const std::string& msg);
};
-class Connection : public qpid::client::Handle<ConnectionImpl>
+class Connection : public qpid::messaging::Handle<ConnectionImpl>
{
public:
QPID_CLIENT_EXTERN Connection(ConnectionImpl* impl);
@@ -58,30 +53,38 @@ class Connection : public qpid::client::
* sasl-mechanism
* sasl-min-ssf
* sasl-max-ssf
+ * protocol
+ * urls
*
- * (note also bounds, locale, max-channels and max-framesize, but not sure whether those should be docuemented here)
+ * (note also bounds, locale, max-channels and max-framesize, but
+ * not sure whether those should be documented here)
*
- * Retry behaviour can be controlled through the following options:
- *
- * reconnection-timeout - determines how long it will try to
- * reconnect for -1 means forever, 0
- * means don't try to reconnect
- * min-retry-interval
- * max-retry-interval
+ * Reconnect behaviour can be controlled through the following options:
*
- * The retry-interval is the time that the client waits for
- * after a failed attempt to reconnect before retrying. It
+ * reconnect: true/false (enables/disables reconnect entirely)
+ * reconnect-timeout: number of seconds (give up and report failure after specified time)
+ * reconnect-limit: n (give up and report failure after specified number of attempts)
+ * reconnect-interval-min: number of seconds (initial delay between failed reconnection attempts)
+ * reconnect-interval-max: number of seconds (maximum delay between failed reconnection attempts)
+ * reconnect-interval: shorthand for setting the same reconnect_interval_min/max
+ *
+ * The reconnect-interval is the time that the client waits
+ * for after a failed attempt to reconnect before retrying. It
* starts at the value of the min-retry-interval and is
* doubled every failure until the value of max-retry-interval
* is reached.
- *
- *
*/
QPID_CLIENT_EXTERN Connection(const Variant::Map& options = Variant::Map());
QPID_CLIENT_EXTERN Connection(const std::string& options);
QPID_CLIENT_EXTERN ~Connection();
QPID_CLIENT_EXTERN Connection& operator=(const Connection&);
+ QPID_CLIENT_EXTERN void setOption(const std::string& name, const Variant& value);
QPID_CLIENT_EXTERN void open(const std::string& url);
+ /**
+ * Closes a connection and all sessions associated with it. An
+ * opened connection must be closed before the last handle is
+ * allowed to go out of scope.
+ */
QPID_CLIENT_EXTERN void close();
QPID_CLIENT_EXTERN Session newSession(bool transactional, const std::string& name = std::string());
QPID_CLIENT_EXTERN Session newSession(const std::string& name = std::string());
@@ -89,7 +92,7 @@ class Connection : public qpid::client::
QPID_CLIENT_EXTERN Session getSession(const std::string& name) const;
private:
- friend class qpid::client::PrivateImplRef<Connection>;
+ friend class qpid::messaging::PrivateImplRef<Connection>;
};
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListContent.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListContent.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListContent.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListContent.h Tue Mar 23 18:00:49 2010
@@ -21,7 +21,7 @@
* under the License.
*
*/
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
#include "Variant.h"
namespace qpid {
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListView.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListView.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListView.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/ListView.h Tue Mar 23 18:00:49 2010
@@ -22,7 +22,7 @@
*
*/
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
#include "Variant.h"
namespace qpid {
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapContent.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapContent.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapContent.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapContent.h Tue Mar 23 18:00:49 2010
@@ -22,7 +22,7 @@
*
*/
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
#include "Variant.h"
#include <map>
#include <string>
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapView.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapView.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapView.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/MapView.h Tue Mar 23 18:00:49 2010
@@ -21,7 +21,7 @@
* under the License.
*
*/
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
#include "Variant.h"
#include <map>
#include <string>
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Message.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Message.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Message.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Message.h Tue Mar 23 18:00:49 2010
@@ -25,12 +25,9 @@
#include <string>
#include "qpid/messaging/Duration.h"
#include "qpid/messaging/Variant.h"
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
namespace qpid {
-namespace client {
-}
-
namespace messaging {
class Address;
@@ -87,6 +84,7 @@ class Message
QPID_CLIENT_EXTERN const std::string& getContent() const;
QPID_CLIENT_EXTERN std::string& getContent();
+
QPID_CLIENT_EXTERN void setContent(const std::string&);
QPID_CLIENT_EXTERN void setContent(const char* chars, size_t count);
QPID_CLIENT_EXTERN void getContent(std::pair<const char*, size_t>& content) const;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Receiver.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Receiver.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Receiver.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Receiver.h Tue Mar 23 18:00:49 2010
@@ -22,19 +22,15 @@
*
*/
#include "qpid/Exception.h"
-#include "qpid/client/ClientImportExport.h"
-#include "qpid/client/Handle.h"
+#include "qpid/messaging/ImportExport.h"
+#include "qpid/messaging/Handle.h"
#include "qpid/messaging/Duration.h"
namespace qpid {
-namespace client {
+namespace messaging {
template <class> class PrivateImplRef;
-}
-
-namespace messaging {
-
class Message;
class ReceiverImpl;
class Session;
@@ -42,7 +38,7 @@ class Session;
/**
* Interface through which messages are received.
*/
-class Receiver : public qpid::client::Handle<ReceiverImpl>
+class Receiver : public qpid::messaging::Handle<ReceiverImpl>
{
public:
struct NoMessageAvailable : qpid::Exception {};
@@ -60,14 +56,16 @@ class Receiver : public qpid::client::Ha
QPID_CLIENT_EXTERN bool get(Message& message, Duration timeout=INFINITE_DURATION);
/**
* Retrieves a message from this receivers local queue, or waits
- * for upto the specified timeout for a message to become
- * available. Throws NoMessageAvailable if there is no
- * message to give after waiting for the specified timeout.
+ * for up to the specified timeout for a message to become
+ * available.
+ *
+ *@exception NoMessageAvailable if there is no message to give
+ * after waiting for the specified timeout.
*/
QPID_CLIENT_EXTERN Message get(Duration timeout=INFINITE_DURATION);
/**
* Retrieves a message for this receivers subscription or waits
- * for upto the specified timeout for one to become
+ * for up to the specified timeout for one to become
* available. Unlike get() this method will check with the server
* that there is no message for the subscription this receiver is
* serving before returning false.
@@ -79,6 +77,9 @@ class Receiver : public qpid::client::Ha
* available. Unlike get() this method will check with the server
* that there is no message for the subscription this receiver is
* serving before throwing an exception.
+ *
+ *@exception NoMessageAvailable if there is no message to give
+ * after waiting for the specified timeout.
*/
QPID_CLIENT_EXTERN Message fetch(Duration timeout=INFINITE_DURATION);
/**
@@ -123,7 +124,7 @@ class Receiver : public qpid::client::Ha
QPID_CLIENT_EXTERN Session getSession() const;
private:
- friend class qpid::client::PrivateImplRef<Receiver>;
+ friend class qpid::messaging::PrivateImplRef<Receiver>;
};
}} // namespace qpid::messaging
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Sender.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Sender.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Sender.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Sender.h Tue Mar 23 18:00:49 2010
@@ -21,27 +21,22 @@
* under the License.
*
*/
-#include "qpid/client/ClientImportExport.h"
-#include "qpid/client/Handle.h"
+#include "qpid/messaging/ImportExport.h"
+#include "qpid/messaging/Handle.h"
#include "qpid/sys/IntegerTypes.h"
#include <string>
namespace qpid {
-namespace client {
-
-template <class> class PrivateImplRef;
-
-}
-
namespace messaging {
+template <class> class PrivateImplRef;
class Message;
class SenderImpl;
class Session;
/**
* Interface through which messages are sent.
*/
-class Sender : public qpid::client::Handle<SenderImpl>
+class Sender : public qpid::messaging::Handle<SenderImpl>
{
public:
QPID_CLIENT_EXTERN Sender(SenderImpl* impl = 0);
@@ -79,7 +74,7 @@ class Sender : public qpid::client::Hand
*/
QPID_CLIENT_EXTERN Session getSession() const;
private:
- friend class qpid::client::PrivateImplRef<Sender>;
+ friend class qpid::messaging::PrivateImplRef<Sender>;
};
}} // namespace qpid::messaging
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Session.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Session.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Session.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Session.h Tue Mar 23 18:00:49 2010
@@ -23,20 +23,15 @@
*/
#include "qpid/Exception.h"
#include "qpid/messaging/Duration.h"
-#include "qpid/client/ClientImportExport.h"
-#include "qpid/client/Handle.h"
+#include "qpid/messaging/ImportExport.h"
+#include "qpid/messaging/Handle.h"
#include "qpid/sys/Time.h"
#include <string>
namespace qpid {
-namespace client {
-
-template <class> class PrivateImplRef;
-
-}
-
namespace messaging {
+template <class> class PrivateImplRef;
class Address;
class Connection;
class Message;
@@ -55,7 +50,7 @@ struct KeyError : qpid::Exception
* A session represents a distinct 'conversation' which can involve
* sending and receiving messages to and from different addresses.
*/
-class Session : public qpid::client::Handle<SessionImpl>
+class Session : public qpid::messaging::Handle<SessionImpl>
{
public:
QPID_CLIENT_EXTERN Session(SessionImpl* impl = 0);
@@ -63,6 +58,12 @@ class Session : public qpid::client::Han
QPID_CLIENT_EXTERN ~Session();
QPID_CLIENT_EXTERN Session& operator=(const Session&);
+ /**
+ * Closes a session and all associated senders and receivers. An
+ * opened session should be closed before the last handle to it
+ * goes out of scope. All a connections sessions can be closed by
+ * a call to Connection::close().
+ */
QPID_CLIENT_EXTERN void close();
QPID_CLIENT_EXTERN void commit();
@@ -83,8 +84,8 @@ class Session : public qpid::client::Han
QPID_CLIENT_EXTERN void flush();
/**
- * Returns the number of messages received and waiting to be
- * fetched.
+ * Returns the total number of messages received and waiting to be
+ * fetched by all Receivers belonging to this session.
*/
QPID_CLIENT_EXTERN uint32_t available();
/**
@@ -99,14 +100,15 @@ class Session : public qpid::client::Han
* to the specified timeout waiting for one to arrive. Returns
* true if a message was available at the point of return, in
* which case the passed in receiver reference will be set to the
- * receiver for that message or fals if no message was available.
+ * receiver for that message or false if no message was available.
*/
QPID_CLIENT_EXTERN bool nextReceiver(Receiver&, Duration timeout=INFINITE_DURATION);
/**
* Returns the receiver for the next available message. If there
* are no available messages at present the call will block for up
- * to the specified timeout waiting for one to arrive. Will throw
- * Receiver::NoMessageAvailable if no message became available in
+ * to the specified timeout waiting for one to arrive.
+ *
+ *@exception Receiver::NoMessageAvailable if no message became available in
* time.
*/
QPID_CLIENT_EXTERN Receiver nextReceiver(Duration timeout=INFINITE_DURATION);
@@ -126,13 +128,13 @@ class Session : public qpid::client::Han
QPID_CLIENT_EXTERN Receiver createReceiver(const std::string& address);
/**
- * Returns the sender with the specified name or throws KeyError
- * if there is none for that name.
+ * Returns the sender with the specified name.
+ *@exception KeyError if there is none for that name.
*/
QPID_CLIENT_EXTERN Sender getSender(const std::string& name) const;
/**
- * Returns the receiver with the specified name or throws KeyError
- * if there is none for that name.
+ * Returns the receiver with the specified name.
+ *@exception KeyError if there is none for that name.
*/
QPID_CLIENT_EXTERN Receiver getReceiver(const std::string& name) const;
/**
@@ -142,7 +144,7 @@ class Session : public qpid::client::Han
QPID_CLIENT_EXTERN Connection getConnection() const;
private:
- friend class qpid::client::PrivateImplRef<Session>;
+ friend class qpid::messaging::PrivateImplRef<Session>;
};
}} // namespace qpid::messaging
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Uuid.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Uuid.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Uuid.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Uuid.h Tue Mar 23 18:00:49 2010
@@ -22,7 +22,7 @@
*
*/
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
#include <iosfwd>
#include <string>
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Variant.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Variant.h?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Variant.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Variant.h Tue Mar 23 18:00:49 2010
@@ -28,7 +28,7 @@
#include "Uuid.h"
#include "qpid/Exception.h"
#include "qpid/sys/IntegerTypes.h"
-#include "qpid/client/ClientImportExport.h"
+#include "qpid/messaging/ImportExport.h"
namespace qpid {
namespace messaging {
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/schema.py
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/schema.py?rev=926686&r1=926685&r2=926686&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/schema.py (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/schema.py Tue Mar 23 18:00:49 2010
@@ -1315,13 +1315,14 @@ class SchemaClass:
def genPrimaryKey (self, stream, variables):
first = 1
for prop in self.properties:
- if prop.isIndex == 1:
- if first:
- first = None
- else:
- stream.write(" << \",\";\n")
- var = prop.type.type.stream.replace("#", prop.getName())
- stream.write(" key << %s" % var)
+ if prop.getName() != "vhostRef": # Limit how deep the v2Key strings get
+ if prop.isIndex == 1:
+ if first:
+ first = None
+ else:
+ stream.write(" << \",\";\n")
+ var = prop.type.type.stream.replace("#", prop.getName())
+ stream.write(" key << %s" % var)
if not first:
stream.write(";")
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org