You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2010/03/30 23:35:13 UTC
svn commit: r929307 [1/5] - in /qpid/branches/qmf-devel0.7a: ./ qpid/
qpid/cpp/bindings/qmf/python/ qpid/cpp/bindings/qmf/ruby/
qpid/cpp/bindings/qmf/tests/ qpid/cpp/examples/messaging/
qpid/cpp/examples/tradedemo/ qpid/cpp/include/qmf/engine/ qpid/cpp...
Author: tross
Date: Tue Mar 30 21:35:08 2010
New Revision: 929307
URL: http://svn.apache.org/viewvc?rev=929307&view=rev
Log:
Merged the trunk back into the QMF branch.
All the make-check tests now pass with the QMF updates.
Added:
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/types/
- copied from r929244, qpid/trunk/qpid/cpp/include/qpid/types/
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/types/Uuid.h
- copied unchanged from r929244, qpid/trunk/qpid/cpp/include/qpid/types/Uuid.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/types/Variant.h
- copied unchanged from r929244, qpid/trunk/qpid/cpp/include/qpid/types/Variant.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Duration.cpp
- copied unchanged from r929244, qpid/trunk/qpid/cpp/src/qpid/messaging/Duration.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/types/
- copied from r929244, qpid/trunk/qpid/cpp/src/qpid/types/
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/types/Uuid.cpp
- copied unchanged from r929244, qpid/trunk/qpid/cpp/src/qpid/types/Uuid.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/types/Variant.cpp
- copied unchanged from r929244, qpid/trunk/qpid/cpp/src/qpid/types/Variant.cpp
qpid/branches/qmf-devel0.7a/qpid/extras/qmf/LICENSE.txt
- copied unchanged from r929244, qpid/trunk/qpid/extras/qmf/LICENSE.txt
qpid/branches/qmf-devel0.7a/qpid/extras/qmf/NOTICE.txt
- copied unchanged from r929244, qpid/trunk/qpid/extras/qmf/NOTICE.txt
qpid/branches/qmf-devel0.7a/qpid/java/broker/etc/virtualhosts.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/broker/etc/virtualhosts.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-acl-settings.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-systests-acl.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-acl.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby-settings.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-systests-derby.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall-2.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall-3.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-systests.xml
- copied unchanged from r929244, qpid/trunk/qpid/java/systests/etc/virtualhosts-systests.xml
qpid/branches/qmf-devel0.7a/qpid/tests/LICENSE.txt
- copied unchanged from r929244, qpid/trunk/qpid/tests/LICENSE.txt
qpid/branches/qmf-devel0.7a/qpid/tests/NOTICE.txt
- copied unchanged from r929244, qpid/trunk/qpid/tests/NOTICE.txt
qpid/branches/qmf-devel0.7a/qpid/tools/LICENSE.txt
- copied unchanged from r929244, qpid/trunk/qpid/tools/LICENSE.txt
qpid/branches/qmf-devel0.7a/qpid/tools/NOTICE.txt
- copied unchanged from r929244, qpid/trunk/qpid/tools/NOTICE.txt
Removed:
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/src/qpid/messaging/Uuid.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Variant.cpp
qpid/branches/qmf-devel0.7a/qpid/java/broker/etc/persistent_config.xml
qpid/branches/qmf-devel0.7a/qpid/java/broker/etc/transient_config.xml
Modified:
qpid/branches/qmf-devel0.7a/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/ (props changed)
qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/python/qmf.py
qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/ruby/qmf.rb
qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_agent.py
qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_console.py
qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
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/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/tradedemo/tradedemo_topic_publisher.vcproj (props changed)
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/client/amqp0_10/Codecs.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementEvent.h
qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementObject.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/Duration.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/Session.h
qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/management-types.xml
qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/schema.py
qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.h
qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.h
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/qmf/engine/ValueImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/ValueImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/acl/Acl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/broker/System.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.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/CodecsInternal.h
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/FailoverUpdates.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
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.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/cluster/Cluster.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (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/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/management/ManagementObject.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Address.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/AddressParser.h
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/ListContent.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/ListView.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapContent.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MapView.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/Message.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/qpid/messaging/MessageImpl.h
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Address.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ClientMessage.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/ManagementTest.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/MessagingSessionTests.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Uuid.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/Variant.cpp
qpid/branches/qmf-devel0.7a/qpid/cpp/src/tests/cluster_tests.py (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/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/extras/qmf/src/py/qmf/console.py
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/build.xml
qpid/branches/qmf-devel0.7a/qpid/java/broker/etc/config.xml
qpid/branches/qmf-devel0.7a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.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/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/branches/qmf-devel0.7a/qpid/java/client/test/example_build.xml
qpid/branches/qmf-devel0.7a/qpid/java/common.xml
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/module.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-acl-settings.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-acl.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-derby-settings.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-derby.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-firewall-2.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-firewall-3.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-firewall-settings.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-firewall.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests-settings.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/config-systests.xml
qpid/branches/qmf-devel0.7a/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
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/server/configuration/ServerConfigurationFileTest.java
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
qpid/branches/qmf-devel0.7a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.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/utils/QpidTestCase.java
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/08StandaloneExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/Excludes (contents, props changed)
qpid/branches/qmf-devel0.7a/qpid/java/test-profiles/JavaExcludes (contents, 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 (contents, 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/packaging/windows/ (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/qpid/concurrency.py (props changed)
qpid/branches/qmf-devel0.7a/qpid/python/qpid/messaging/endpoints.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_9/queue.py (props changed)
Propchange: qpid/branches/qmf-devel0.7a/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -1,3 +1,3 @@
/qpid/branches/0.5.x-dev:892761,894875
/qpid/branches/java-network-refactor:805429-825319
-/qpid/trunk:919043-928107
+/qpid/trunk:919043-929244
Propchange: qpid/branches/qmf-devel0.7a/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -2,4 +2,4 @@
/qpid/branches/0.6-release-windows-installer:926803
/qpid/branches/0.6-release-windows-installer/qpid:926803,927233
/qpid/branches/java-network-refactor/qpid:805429-825319
-/qpid/trunk/qpid:919043-928107
+/qpid/trunk/qpid:919043-929244
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/python/qmf.py
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/python/qmf.py?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/python/qmf.py (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/python/qmf.py Tue Mar 30 21:35:08 2010
@@ -58,10 +58,9 @@ def qmf_to_native(val):
elif typecode == TYPE_INT32: return val.asInt()
elif typecode == TYPE_INT64: return val.asInt64()
elif typecode == TYPE_MAP: return value_to_dict(val)
+ elif typecode == TYPE_LIST: return value_to_list(val)
else:
# when TYPE_OBJECT
- # when TYPE_LIST
- # when TYPE_ARRAY
logging.error( "Unsupported type for get_attr? '%s'" % str(val.getType()) )
return None
@@ -98,11 +97,9 @@ def native_to_qmf(target, value):
elif typecode == TYPE_INT32: val.setInt(value)
elif typecode == TYPE_INT64: val.setInt64(value)
elif typecode == TYPE_MAP: dict_to_value(val, value)
+ elif typecode == TYPE_LIST: list_to_value(val, value)
else:
- # when TYPE_MAP
# when TYPE_OBJECT
- # when TYPE_LIST
- # when TYPE_ARRAY
logging.error("Unsupported type for get_attr? '%s'" % str(val.getType()))
return None
return val
@@ -129,6 +126,7 @@ def pick_qmf_type(value):
if value.__class__ == bool: return TYPE_BOOL
if value == None: return TYPE_BOOL
if value.__class__ == dict: return TYPE_MAP
+ if value.__class__ == list: return TYPE_LIST
raise "QMF type not known for native type %s" % value.__class__
@@ -140,7 +138,7 @@ def value_to_dict(val):
key = val.key(i)
mymap[key] = qmf_to_native(val.byKey(key))
return mymap
-
+
def dict_to_value(val, mymap):
for key, value in mymap.items():
@@ -149,6 +147,26 @@ def dict_to_value(val, mymap):
val.insert(key, native_to_qmf(typecode, value))
+def value_to_list(val):
+ mylist = []
+ if val.isList():
+ for i in range(val.listItemCount()):
+ mylist.append(qmf_to_native(val.listItem(i)))
+ return mylist
+ #if val.isArray():
+ # for i in range(val.arrayItemCount()):
+ # mylist.append(qmf_to_native(val.arrayItem(i)))
+ # return mylist
+
+ raise "value_to_list must be given a list value"
+
+
+def list_to_value(val, mylist):
+ for item in mylist:
+ typecode = pick_qmf_type(item)
+ val.appendToList(native_to_qmf(typecode, item))
+
+
##==============================================================================
## CONNECTION
##==============================================================================
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/ruby/qmf.rb
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/ruby/qmf.rb?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/ruby/qmf.rb (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/ruby/qmf.rb Tue Mar 30 21:35:08 2010
@@ -48,8 +48,8 @@ module Qmf
when TYPE_INT8, TYPE_INT16, TYPE_INT32 then val.asInt
when TYPE_INT64 then val.asInt64
when TYPE_MAP then value_to_dict(val)
+ when TYPE_LIST then value_to_list(val)
when TYPE_OBJECT
- when TYPE_LIST
when TYPE_ARRAY
end
end
@@ -77,8 +77,8 @@ module Qmf
when TYPE_INT8, TYPE_INT16, TYPE_INT32 then val.setInt(value)
when TYPE_INT64 then val.setInt64(value)
when TYPE_MAP then dict_to_value(val, value)
+ when TYPE_LIST then list_to_value(val, value)
when TYPE_OBJECT
- when TYPE_LIST
when TYPE_ARRAY
end
return val
@@ -112,6 +112,7 @@ module Qmf
return TYPE_BOOL if value.class == NilClass
return TYPE_MAP if value.class == Hash
+ return TYPE_LIST if value.class == Array
raise ArgumentError, "QMF type not known for native type #{value.class}"
end
@@ -134,6 +135,23 @@ module Qmf
val.insert(key, native_to_qmf(typecode, value))
end
end
+
+ def value_to_list(val)
+ # Assume val is of type Qmfengine::Value
+ raise ArgumentError, "value_to_dict must be given a map value" if !val.isList
+ list = []
+ for i in 0...val.listItemCount
+ list.push(qmf_to_native(val.listItem(i)))
+ end
+ return list
+ end
+
+ def list_to_value(val, list)
+ list.each do |value|
+ typecode = pick_qmf_type(value)
+ val.appendToList(native_to_qmf(typecode, value))
+ end
+ end
end
$util = Util.new
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/agent_ruby.rb Tue Mar 30 21:35:08 2010
@@ -44,6 +44,7 @@ class Model
@parent_class.add_property(Qmf::SchemaProperty.new("lstrval", Qmf::TYPE_LSTR))
@parent_class.add_property(Qmf::SchemaProperty.new("mapval", Qmf::TYPE_MAP))
+ @parent_class.add_property(Qmf::SchemaProperty.new("listval", Qmf::TYPE_LIST))
@parent_class.add_statistic(Qmf::SchemaStatistic.new("queryCount", Qmf::TYPE_UINT32, :unit => "query", :desc => "Query count"))
@@ -246,6 +247,11 @@ class App < Qmf::AgentHandler
@parent.int16val = 0
@parent.int8val = 0
+ # a list containing a list that contains a map (so there!)
+ @parent.listval = ['a', 1, 'b', 2,
+ ['c', true, 3.1415,
+ {"hi" => 10, "lo" => 5}]]
+
@parent_oid = @agent.alloc_object_id(1)
@parent.set_object_id(@parent_oid)
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_agent.py
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_agent.py?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_agent.py (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_agent.py Tue Mar 30 21:35:08 2010
@@ -45,6 +45,7 @@ class Model:
self.parent_class.add_property(qmf.SchemaProperty("lstrval", qmf.TYPE_LSTR))
self.parent_class.add_property(qmf.SchemaProperty("mapval", qmf.TYPE_MAP))
+ self.parent_class.add_property(qmf.SchemaProperty("listval", qmf.TYPE_LIST))
self.parent_class.add_statistic(qmf.SchemaStatistic("queryCount", qmf.TYPE_UINT32, {"unit":"query", "desc":"Query count"}))
@@ -274,7 +275,7 @@ class App(qmf.AgentHandler):
## @todo how do we force a test failure?
# verify the properties() and statistics() object methods:
- assert len(self._parent.properties()) == 13
+ assert len(self._parent.properties()) == 14
assert len(self._parent.statistics()) == 1
self._parent.set_attr("name", "Parent One")
@@ -290,6 +291,11 @@ class App(qmf.AgentHandler):
self._parent.set_attr("int16val", 0)
self._parent.set_attr("int8val", 0)
+ # a list containing a list that contains a map (so there!)
+ self._parent.set_attr("listval", ['a', 1, 'b', 2,
+ ['c', True, 3.1415,
+ {"hi": 10, "lo": 5}]])
+
self._parent_oid = self._agent.alloc_object_id(1)
self._parent.set_object_id(self._parent_oid)
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_console.py
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_console.py?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_console.py (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/python_console.py Tue Mar 30 21:35:08 2010
@@ -48,7 +48,7 @@ class QmfInteropTests(TestBase010):
self.assertEqual(len(parents), 1)
parent = parents[0]
for seq in range(10):
- result = parent.echo(seq)
+ result = parent.echo(seq, _timeout=5)
self.assertEqual(result.status, 0)
self.assertEqual(result.text, "OK")
self.assertEqual(result.sequence, seq)
@@ -202,7 +202,26 @@ class QmfInteropTests(TestBase010):
self.assertEqual(queue[3].arguments["strval"], "TEST")
self.assertEqual(queue[4].arguments["uint32val"], 0)
self.assertEqual(queue[4].arguments["strval"], "LONG_TEST")
-
+
+
+ def test_G_basic_map_list_data(self):
+ self.startQmf();
+ qmf = self.qmf
+
+ parents = qmf.getObjects(_class="parent")
+ self.assertEqual(len(parents), 1)
+ parent = parents[0]
+
+ # see agent for structure of listval
+
+ self.assertTrue(isinstance(parent.listval, list))
+ self.assertEqual(len(parent.listval), 5)
+ self.assertTrue(isinstance(parent.listval[4], list))
+ self.assertEqual(len(parent.listval[4]), 4)
+ self.assertTrue(isinstance(parent.listval[4][3], dict))
+ self.assertEqual(parent.listval[4][3]["hi"], 10)
+ self.assertEqual(parent.listval[4][3]["lo"], 5)
+
def getProperty(self, msg, name):
for h in msg.headers:
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/bindings/qmf/tests/ruby_console_test.rb Tue Mar 30 21:35:08 2010
@@ -266,6 +266,23 @@ class ConsoleTest < ConsoleTestBase
end
end
+
+
+ def test_G_basic_map_list_data
+ parent = @qmfc.object(:class => "parent")
+ assert(parent, "Number of 'parent' objects")
+
+ # see agent for structure of listval
+
+ assert(parent.listval.class == Array)
+ assert_equal(parent.listval.length, 5)
+ assert(parent.listval[4].class == Array)
+ assert_equal(parent.listval[4].length, 4)
+ assert(parent.listval[4][3].class == Hash)
+ assert_equal(parent.listval[4][3]["hi"], 10)
+ assert_equal(parent.listval[4][3]["lo"], 5)
+ end
+
end
app = ConsoleTest.new
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -32,6 +32,7 @@
#include <iostream>
using namespace qpid::messaging;
+using namespace qpid::types;
struct Options : public qpid::Options
{
@@ -63,8 +64,8 @@ struct Options : public qpid::Options
Duration getTimeout()
{
- if (forever) return INFINITE_DURATION;
- else return timeout*DURATION_SEC;
+ if (forever) return Duration::FOREVER;
+ else return timeout*Duration::SECOND;
}
bool parse(int argc, char** argv)
@@ -101,7 +102,7 @@ int main(int argc, char** argv)
Duration timeout = options.getTimeout();
Message message;
while (receiver.fetch(message, timeout)) {
- std::cout << "Message(properties=" << message.getHeaders() << ", content='" ;
+ std::cout << "Message(properties=" << message.getProperties() << ", content='" ;
if (message.getContentType() == "amqp/map") {
std::cout << MapView(message);
} else {
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -31,6 +31,7 @@
#include <sstream>
using namespace qpid::messaging;
+using namespace qpid::types;
using std::stringstream;
using std::string;
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -31,6 +31,7 @@
#include <sstream>
using namespace qpid::messaging;
+using namespace qpid::types;
using std::stringstream;
using std::string;
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -25,7 +25,6 @@
#include <qpid/messaging/Receiver.h>
#include <qpid/messaging/Sender.h>
#include <qpid/messaging/Session.h>
-#include <qpid/messaging/Variant.h>
#include <algorithm>
#include <cstdlib>
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -25,7 +25,7 @@
#include <qpid/messaging/Message.h>
#include <qpid/messaging/Sender.h>
#include <qpid/messaging/Session.h>
-#include <qpid/messaging/Variant.h>
+#include <qpid/types/Variant.h>
#include <qpid/Exception.h>
#include <qpid/Options.h>
#include <qpid/log/Logger.h>
@@ -38,6 +38,7 @@
#include <boost/format.hpp>
using namespace qpid::messaging;
+using namespace qpid::types;
using qpid::sys::AbsTime;
using qpid::sys::now;
using qpid::sys::TIME_INFINITE;
@@ -124,9 +125,9 @@ struct Options : public qpid::Options
std::string name;
std::string value;
if (nameval(property, name, value)) {
- message.getHeaders()[name] = value;
+ message.getProperties()[name] = value;
} else {
- message.getHeaders()[name] = Variant();
+ message.getProperties()[name] = Variant();
}
}
@@ -176,7 +177,7 @@ int main(int argc, char** argv)
for (uint count = 0; (count < options.count || options.count == 0) && end > now(); count++) {
if (!options.replyto.empty()) message.setReplyTo(Address(options.replyto));
std::string id = options.id.empty() ? Uuid(true).str() : options.id;
- message.getHeaders()["spout-id"] = (boost::format("%1%:%2%") % id % count).str();
+ message.getProperties()["spout-id"] = (boost::format("%1%:%2%") % id % count).str();
sender.send(message);
}
connection.close();
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -23,7 +23,6 @@
#include <qpid/messaging/Message.h>
#include <qpid/messaging/Receiver.h>
#include <qpid/messaging/Session.h>
-#include <qpid/messaging/Variant.h>
#include <cstdlib>
#include <iostream>
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -2,4 +2,4 @@
/qpid/branches/0.6-release-windows-installer/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:926803
/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/trunk/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:919043-928107
+/qpid/trunk/qpid/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj:919043-929244
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:919043-928107
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:919043-929244
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:919043-928107
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:919043-929244
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/client/amqp0_10/Codecs.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/client/amqp0_10/Codecs.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/client/amqp0_10/Codecs.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/client/amqp0_10/Codecs.h Tue Mar 30 21:35:08 2010
@@ -35,8 +35,8 @@ namespace amqp0_10 {
class MapCodec : public qpid::messaging::Codec
{
public:
- void encode(const qpid::messaging::Variant&, std::string&);
- void decode(const std::string&, qpid::messaging::Variant&);
+ void encode(const qpid::types::Variant&, std::string&);
+ void decode(const std::string&, qpid::types::Variant&);
static const std::string contentType;
private:
@@ -49,8 +49,8 @@ class MapCodec : public qpid::messaging:
class ListCodec : public qpid::messaging::Codec
{
public:
- void encode(const qpid::messaging::Variant&, std::string&);
- void decode(const std::string&, qpid::messaging::Variant&);
+ void encode(const qpid::types::Variant&, std::string&);
+ void decode(const std::string&, qpid::types::Variant&);
static const std::string contentType;
private:
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementEvent.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementEvent.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementEvent.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementEvent.h Tue Mar 30 21:35:08 2010
@@ -46,7 +46,7 @@ class ManagementEvent : public Managemen
virtual uint8_t* getMd5Sum() const = 0;
virtual uint8_t getSeverity() const = 0;
virtual void encode(std::string&) const = 0;
- virtual void mapEncode(qpid::messaging::VariantMap&) const = 0;
+ virtual void mapEncode(qpid::types::VariantMap&) const = 0;
};
}}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementObject.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementObject.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementObject.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/management/ManagementObject.h Tue Mar 30 21:35:08 2010
@@ -25,6 +25,7 @@
#include "qpid/sys/Time.h"
#include "qpid/sys/Mutex.h"
#include "qpid/CommonImportExport.h"
+#include "qpid/types/Variant.h"
#include "qpid/messaging/MapContent.h"
#include "qpid/messaging/MapView.h"
#include <map>
@@ -60,7 +61,7 @@ protected:
void fromString(const std::string&);
public:
QPID_COMMON_EXTERN ObjectId() : agent(0), first(0), second(0), agentEpoch(0) {}
- QPID_COMMON_EXTERN ObjectId(const messaging::Variant& map) :
+ QPID_COMMON_EXTERN ObjectId(const types::Variant& map) :
agent(0), first(0), second(0), agentEpoch(0) { mapDecode(map.asMap()); }
QPID_COMMON_EXTERN ObjectId(uint8_t flags, uint16_t seq, uint32_t broker);
QPID_COMMON_EXTERN ObjectId(AgentAttachment* _agent, uint8_t flags, uint16_t seq);
@@ -70,9 +71,9 @@ public:
QPID_COMMON_EXTERN ObjectId(uint8_t flags, uint16_t seq, uint32_t broker, uint64_t object);
QPID_COMMON_EXTERN bool operator==(const ObjectId &other) const;
QPID_COMMON_EXTERN bool operator<(const ObjectId &other) const;
- QPID_COMMON_EXTERN void mapEncode(messaging::VariantMap& map) const;
- QPID_COMMON_EXTERN void mapDecode(const messaging::VariantMap& map);
- QPID_COMMON_EXTERN operator messaging::VariantMap() const;
+ QPID_COMMON_EXTERN void mapEncode(types::VariantMap& map) const;
+ QPID_COMMON_EXTERN void mapDecode(const types::VariantMap& map);
+ QPID_COMMON_EXTERN operator types::VariantMap() const;
QPID_COMMON_EXTERN uint32_t encodedSize() const { return 16; };
QPID_COMMON_EXTERN void encode(std::string& buffer) const;
QPID_COMMON_EXTERN void decode(const std::string& buffer);
@@ -148,9 +149,9 @@ protected:
QPID_COMMON_EXTERN int getThreadIndex();
QPID_COMMON_EXTERN void writeTimestamps(std::string& buf) const;
- QPID_COMMON_EXTERN void writeTimestamps(messaging::VariantMap& map) const;
+ QPID_COMMON_EXTERN void writeTimestamps(types::VariantMap& map) const;
QPID_COMMON_EXTERN void readTimestamps(const std::string& buf);
- QPID_COMMON_EXTERN void readTimestamps(const messaging::VariantMap& buf);
+ QPID_COMMON_EXTERN void readTimestamps(const types::VariantMap& buf);
QPID_COMMON_EXTERN uint32_t writeTimestampsSize() const;
public:
@@ -171,13 +172,13 @@ protected:
// Encode & Decode the property and statistics values
// for this object.
- virtual void mapEncodeValues(messaging::VariantMap& map,
+ virtual void mapEncodeValues(types::VariantMap& map,
bool includeProperties,
bool includeStatistics) = 0;
- virtual void mapDecodeValues(const messaging::VariantMap& map) = 0;
+ virtual void mapDecodeValues(const types::VariantMap& map) = 0;
virtual void doMethod(std::string& methodName,
- const messaging::VariantMap& inMap,
- messaging::VariantMap& outMap) = 0;
+ const types::VariantMap& inMap,
+ types::VariantMap& outMap) = 0;
/**
* The following five methods are not pure-virtual because they will only
@@ -224,11 +225,11 @@ protected:
//QPID_COMMON_EXTERN uint32_t encodedSize() const { return writePropertiesSize(); }
// Encode/Decode the entire object as a map
- QPID_COMMON_EXTERN void mapEncode(messaging::VariantMap& map,
+ QPID_COMMON_EXTERN void mapEncode(types::VariantMap& map,
bool includeProperties=true,
bool includeStatistics=true);
- QPID_COMMON_EXTERN void mapDecode(const messaging::VariantMap& map);
+ QPID_COMMON_EXTERN void mapDecode(const types::VariantMap& map);
};
typedef std::map<ObjectId, ManagementObject*> ManagementObjectMap;
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -23,7 +23,7 @@
*/
#include <string>
#include "qpid/Exception.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qpid/messaging/ImportExport.h"
#include <ostream>
@@ -124,7 +124,7 @@ class Address
QPID_CLIENT_EXTERN Address();
QPID_CLIENT_EXTERN Address(const std::string& address);
QPID_CLIENT_EXTERN Address(const std::string& name, const std::string& subject,
- const Variant::Map& options, const std::string& type = "");
+ const qpid::types::Variant::Map& options, const std::string& type = "");
QPID_CLIENT_EXTERN Address(const Address& address);
QPID_CLIENT_EXTERN ~Address();
QPID_CLIENT_EXTERN Address& operator=(const Address&);
@@ -133,14 +133,14 @@ class Address
QPID_CLIENT_EXTERN const std::string& getSubject() const;
QPID_CLIENT_EXTERN void setSubject(const std::string&);
QPID_CLIENT_EXTERN bool hasSubject() const;
- QPID_CLIENT_EXTERN const Variant::Map& getOptions() const;
- QPID_CLIENT_EXTERN Variant::Map& getOptions();
- QPID_CLIENT_EXTERN void setOptions(const Variant::Map&);
+ QPID_CLIENT_EXTERN const qpid::types::Variant::Map& getOptions() const;
+ QPID_CLIENT_EXTERN qpid::types::Variant::Map& getOptions();
+ QPID_CLIENT_EXTERN void setOptions(const qpid::types::Variant::Map&);
QPID_CLIENT_EXTERN std::string getType() const;
QPID_CLIENT_EXTERN void setType(const std::string&);
- QPID_CLIENT_EXTERN const Variant& getOption(const std::string& key) const;
+ QPID_CLIENT_EXTERN const qpid::types::Variant& getOption(const std::string& key) const;
QPID_CLIENT_EXTERN std::string toStr() const;
QPID_CLIENT_EXTERN operator bool() const;
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -25,9 +25,11 @@
#include "qpid/messaging/ImportExport.h"
namespace qpid {
+namespace types{
+class Variant;
+}
namespace messaging {
-class Variant;
/**
*
*/
@@ -35,8 +37,8 @@ class Codec
{
public:
QPID_CLIENT_EXTERN virtual ~Codec() {}
- virtual void encode(const Variant&, std::string&) = 0;
- virtual void decode(const std::string&, Variant&) = 0;
+ virtual void encode(const qpid::types::Variant&, std::string&) = 0;
+ virtual void decode(const std::string&, qpid::types::Variant&) = 0;
private:
};
}} // namespace qpid::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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -24,7 +24,7 @@
#include <string>
#include "qpid/messaging/ImportExport.h"
#include "qpid/messaging/Handle.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
namespace qpid {
namespace messaging {
@@ -74,11 +74,11 @@ class Connection : public qpid::messagin
* 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 qpid::types::Variant::Map& options = qpid::types::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 setOption(const std::string& name, const qpid::types::Variant& value);
QPID_CLIENT_EXTERN void open(const std::string& url);
/**
* Closes a connection and all sessions associated with it. An
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Duration.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Duration.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Duration.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/include/qpid/messaging/Duration.h Tue Mar 30 21:35:08 2010
@@ -21,8 +21,9 @@
* under the License.
*
*/
+
+#include "qpid/client/ClientImportExport.h"
#include "qpid/sys/IntegerTypes.h"
-#include <limits>
namespace qpid {
namespace messaging {
@@ -30,9 +31,23 @@ namespace messaging {
/**
* A duration is a time in milliseconds.
*/
-typedef uint64_t Duration;
-const Duration INFINITE_DURATION = std::numeric_limits<uint64_t>::max();
-const Duration DURATION_SEC = 1000;
+class Duration
+{
+ public:
+ QPID_CLIENT_EXTERN explicit Duration(uint64_t milliseconds);
+ QPID_CLIENT_EXTERN uint64_t getMilliseconds() const;
+ QPID_CLIENT_EXTERN static const Duration FOREVER;
+ QPID_CLIENT_EXTERN static const Duration IMMEDIATE;
+ QPID_CLIENT_EXTERN static const Duration SECOND;
+ QPID_CLIENT_EXTERN static const Duration MINUTE;
+ private:
+ uint64_t milliseconds;
+};
+
+QPID_CLIENT_EXTERN Duration operator*(const Duration& duration,
+ uint64_t multiplier);
+QPID_CLIENT_EXTERN Duration operator*(uint64_t multiplier,
+ const Duration& duration);
}} // namespace qpid::messaging
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -22,7 +22,7 @@
*
*/
#include "qpid/messaging/ImportExport.h"
-#include "Variant.h"
+#include "qpid/types/Variant.h"
namespace qpid {
namespace messaging {
@@ -36,13 +36,13 @@ class Message;
class ListContent
{
public:
- typedef Variant::List::iterator iterator;
- typedef Variant::List::reverse_iterator reverse_iterator;
- typedef Variant::List::const_iterator const_iterator;
- typedef Variant::List::const_reverse_iterator const_reverse_iterator;
+ typedef qpid::types::Variant::List::iterator iterator;
+ typedef qpid::types::Variant::List::reverse_iterator reverse_iterator;
+ typedef qpid::types::Variant::List::const_iterator const_iterator;
+ typedef qpid::types::Variant::List::const_reverse_iterator const_reverse_iterator;
QPID_CLIENT_EXTERN ListContent(Message&);
- QPID_CLIENT_EXTERN ListContent(Message&, const Variant::List&);
+ QPID_CLIENT_EXTERN ListContent(Message&, const qpid::types::Variant::List&);
QPID_CLIENT_EXTERN ~ListContent();
QPID_CLIENT_EXTERN const_iterator begin() const;
@@ -57,27 +57,27 @@ class ListContent
QPID_CLIENT_EXTERN bool empty() const;
QPID_CLIENT_EXTERN size_t size() const;
- QPID_CLIENT_EXTERN const Variant& front() const;
- QPID_CLIENT_EXTERN Variant& front();
- QPID_CLIENT_EXTERN const Variant& back() const;
- QPID_CLIENT_EXTERN Variant& back();
+ QPID_CLIENT_EXTERN const qpid::types::Variant& front() const;
+ QPID_CLIENT_EXTERN qpid::types::Variant& front();
+ QPID_CLIENT_EXTERN const qpid::types::Variant& back() const;
+ QPID_CLIENT_EXTERN qpid::types::Variant& back();
- QPID_CLIENT_EXTERN void push_front(const Variant&);
- QPID_CLIENT_EXTERN void push_back(const Variant&);
+ QPID_CLIENT_EXTERN void push_front(const qpid::types::Variant&);
+ QPID_CLIENT_EXTERN void push_back(const qpid::types::Variant&);
QPID_CLIENT_EXTERN void pop_front();
QPID_CLIENT_EXTERN void pop_back();
- QPID_CLIENT_EXTERN iterator insert(iterator position, const Variant&);
- QPID_CLIENT_EXTERN void insert(iterator position, size_t n, const Variant&);
+ QPID_CLIENT_EXTERN iterator insert(iterator position, const qpid::types::Variant&);
+ QPID_CLIENT_EXTERN void insert(iterator position, size_t n, const qpid::types::Variant&);
QPID_CLIENT_EXTERN iterator erase(iterator position);
QPID_CLIENT_EXTERN iterator erase(iterator first, iterator last);
QPID_CLIENT_EXTERN void clear();
QPID_CLIENT_EXTERN void encode();
- QPID_CLIENT_EXTERN const Variant::List& asList() const;
- QPID_CLIENT_EXTERN Variant::List& asList();
+ QPID_CLIENT_EXTERN const qpid::types::Variant::List& asList() const;
+ QPID_CLIENT_EXTERN qpid::types::Variant::List& asList();
private:
ListContentImpl* impl;
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -23,7 +23,7 @@
*/
#include "qpid/messaging/ImportExport.h"
-#include "Variant.h"
+#include "qpid/types/Variant.h"
namespace qpid {
namespace messaging {
@@ -37,8 +37,8 @@ class Message;
class ListView
{
public:
- typedef Variant::List::const_iterator const_iterator;
- typedef Variant::List::const_reverse_iterator const_reverse_iterator;
+ typedef qpid::types::Variant::List::const_iterator const_iterator;
+ typedef qpid::types::Variant::List::const_reverse_iterator const_reverse_iterator;
QPID_CLIENT_EXTERN ListView(const Message&);
QPID_CLIENT_EXTERN ~ListView();
@@ -52,10 +52,10 @@ class ListView
QPID_CLIENT_EXTERN bool empty() const;
QPID_CLIENT_EXTERN size_t size() const;
- QPID_CLIENT_EXTERN const Variant& front() const;
- QPID_CLIENT_EXTERN const Variant& back() const;
+ QPID_CLIENT_EXTERN const qpid::types::Variant& front() const;
+ QPID_CLIENT_EXTERN const qpid::types::Variant& back() const;
- QPID_CLIENT_EXTERN const Variant::List& asList() const;
+ QPID_CLIENT_EXTERN const qpid::types::Variant::List& asList() const;
private:
ListViewImpl* impl;
};
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -23,7 +23,7 @@
*/
#include "qpid/messaging/ImportExport.h"
-#include "Variant.h"
+#include "qpid/types/Variant.h"
#include <map>
#include <string>
@@ -40,14 +40,14 @@ class MapContent
{
public:
typedef std::string key_type;
- typedef std::pair<std::string, Variant> value_type;
- typedef std::map<key_type, Variant>::const_iterator const_iterator;
- typedef std::map<key_type, Variant>::iterator iterator;
- typedef std::map<key_type, Variant>::const_reverse_iterator const_reverse_iterator;
- typedef std::map<key_type, Variant>::reverse_iterator reverse_iterator;
+ typedef std::pair<std::string, qpid::types::Variant> value_type;
+ typedef std::map<key_type, qpid::types::Variant>::const_iterator const_iterator;
+ typedef std::map<key_type, qpid::types::Variant>::iterator iterator;
+ typedef std::map<key_type, qpid::types::Variant>::const_reverse_iterator const_reverse_iterator;
+ typedef std::map<key_type, qpid::types::Variant>::reverse_iterator reverse_iterator;
QPID_CLIENT_EXTERN MapContent(Message&);
- QPID_CLIENT_EXTERN MapContent(Message&, const Variant::Map&);
+ QPID_CLIENT_EXTERN MapContent(Message&, const qpid::types::Variant::Map&);
QPID_CLIENT_EXTERN ~MapContent();
QPID_CLIENT_EXTERN const_iterator begin() const;
@@ -64,8 +64,8 @@ class MapContent
QPID_CLIENT_EXTERN const_iterator find(const key_type&) const;
QPID_CLIENT_EXTERN iterator find(const key_type&);
- QPID_CLIENT_EXTERN const Variant& operator[](const key_type&) const;
- QPID_CLIENT_EXTERN Variant& operator[](const key_type&);
+ QPID_CLIENT_EXTERN const qpid::types::Variant& operator[](const key_type&) const;
+ QPID_CLIENT_EXTERN qpid::types::Variant& operator[](const key_type&);
QPID_CLIENT_EXTERN std::pair<iterator,bool> insert(const value_type&);
QPID_CLIENT_EXTERN iterator insert(iterator position, const value_type&);
@@ -76,8 +76,8 @@ class MapContent
QPID_CLIENT_EXTERN void encode();
- QPID_CLIENT_EXTERN const std::map<key_type, Variant>& asMap() const;
- QPID_CLIENT_EXTERN std::map<key_type, Variant>& asMap();
+ QPID_CLIENT_EXTERN const std::map<key_type, qpid::types::Variant>& asMap() const;
+ QPID_CLIENT_EXTERN std::map<key_type, qpid::types::Variant>& asMap();
private:
MapContentImpl* impl;
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -22,7 +22,7 @@
*
*/
#include "qpid/messaging/ImportExport.h"
-#include "Variant.h"
+#include "qpid/types/Variant.h"
#include <map>
#include <string>
@@ -39,9 +39,9 @@ class MapView
{
public:
typedef std::string key_type;
- typedef std::pair<key_type, Variant> value_type;
- typedef std::map<key_type, Variant>::const_iterator const_iterator;
- typedef std::map<key_type, Variant>::const_reverse_iterator const_reverse_iterator;
+ typedef std::pair<key_type, qpid::types::Variant> value_type;
+ typedef std::map<key_type, qpid::types::Variant>::const_iterator const_iterator;
+ typedef std::map<key_type, qpid::types::Variant>::const_reverse_iterator const_reverse_iterator;
QPID_CLIENT_EXTERN MapView(const Message&);
QPID_CLIENT_EXTERN ~MapView();
@@ -56,9 +56,9 @@ class MapView
QPID_CLIENT_EXTERN size_t size() const;
QPID_CLIENT_EXTERN const_iterator find(const key_type&) const;
- QPID_CLIENT_EXTERN const Variant& operator[](const key_type&) const;
+ QPID_CLIENT_EXTERN const qpid::types::Variant& operator[](const key_type&) const;
- QPID_CLIENT_EXTERN const std::map<key_type, Variant>& asMap() const;
+ QPID_CLIENT_EXTERN const std::map<key_type, qpid::types::Variant>& asMap() const;
private:
MapViewImpl* impl;
};
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -24,7 +24,7 @@
#include <string>
#include "qpid/messaging/Duration.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
#include "qpid/messaging/ImportExport.h"
namespace qpid {
@@ -65,6 +65,9 @@ class Message
QPID_CLIENT_EXTERN void setCorrelationId(const std::string&);
QPID_CLIENT_EXTERN const std::string& getCorrelationId() const;
+ QPID_CLIENT_EXTERN void setPriority(uint8_t);
+ QPID_CLIENT_EXTERN uint8_t getPriority() const;
+
/**
* Set the time to live for this message in milliseconds.
*/
@@ -77,10 +80,11 @@ class Message
QPID_CLIENT_EXTERN void setDurable(bool durable);
QPID_CLIENT_EXTERN bool getDurable() const;
- QPID_CLIENT_EXTERN bool isRedelivered() const;
+ QPID_CLIENT_EXTERN bool getRedelivered() const;
+ QPID_CLIENT_EXTERN void setRedelivered(bool);
- QPID_CLIENT_EXTERN const Variant::Map& getHeaders() const;
- QPID_CLIENT_EXTERN Variant::Map& getHeaders();
+ QPID_CLIENT_EXTERN const qpid::types::Variant::Map& getProperties() const;
+ QPID_CLIENT_EXTERN qpid::types::Variant::Map& getProperties();
QPID_CLIENT_EXTERN const std::string& getContent() const;
QPID_CLIENT_EXTERN std::string& getContent();
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -53,7 +53,7 @@ class Receiver : public qpid::messaging:
* available. Returns false if there is no message to give after
* waiting for the specified timeout.
*/
- QPID_CLIENT_EXTERN bool get(Message& message, Duration timeout=INFINITE_DURATION);
+ QPID_CLIENT_EXTERN bool get(Message& message, Duration timeout=Duration::FOREVER);
/**
* Retrieves a message from this receivers local queue, or waits
* for up to the specified timeout for a message to become
@@ -62,7 +62,7 @@ class Receiver : public qpid::messaging:
*@exception NoMessageAvailable if there is no message to give
* after waiting for the specified timeout.
*/
- QPID_CLIENT_EXTERN Message get(Duration timeout=INFINITE_DURATION);
+ QPID_CLIENT_EXTERN Message get(Duration timeout=Duration::FOREVER);
/**
* Retrieves a message for this receivers subscription or waits
* for up to the specified timeout for one to become
@@ -70,7 +70,7 @@ class Receiver : public qpid::messaging:
* that there is no message for the subscription this receiver is
* serving before returning false.
*/
- QPID_CLIENT_EXTERN bool fetch(Message& message, Duration timeout=INFINITE_DURATION);
+ QPID_CLIENT_EXTERN bool fetch(Message& message, Duration timeout=Duration::FOREVER);
/**
* Retrieves a message for this receivers subscription or waits
* for up to the specified timeout for one to become
@@ -81,7 +81,7 @@ class Receiver : public qpid::messaging:
*@exception NoMessageAvailable if there is no message to give
* after waiting for the specified timeout.
*/
- QPID_CLIENT_EXTERN Message fetch(Duration timeout=INFINITE_DURATION);
+ QPID_CLIENT_EXTERN Message fetch(Duration timeout=Duration::FOREVER);
/**
* Sets the capacity for the receiver. The capacity determines how
* many incoming messages can be held in the receiver before being
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -102,7 +102,7 @@ class Session : public qpid::messaging::
* which case the passed in receiver reference will be set to the
* receiver for that message or false if no message was available.
*/
- QPID_CLIENT_EXTERN bool nextReceiver(Receiver&, Duration timeout=INFINITE_DURATION);
+ QPID_CLIENT_EXTERN bool nextReceiver(Receiver&, Duration timeout=Duration::FOREVER);
/**
* Returns the receiver for the next available message. If there
* are no available messages at present the call will block for up
@@ -111,7 +111,7 @@ class Session : public qpid::messaging::
*@exception Receiver::NoMessageAvailable if no message became available in
* time.
*/
- QPID_CLIENT_EXTERN Receiver nextReceiver(Duration timeout=INFINITE_DURATION);
+ QPID_CLIENT_EXTERN Receiver nextReceiver(Duration timeout=Duration::FOREVER);
/**
* Create a new sender through which messages can be sent to the
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/management-types.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/management-types.xml?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/management-types.xml (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/management-types.xml Tue Mar 30 21:35:08 2010
@@ -42,19 +42,19 @@ stream="#.getV2Key()" size="16" accessor
<type name="deltaTime" base="DELTATIME" cpp="uint64_t" encode="@.putLongLong(#)" decode="# = @.getLongLong()" stream="#" size="8" accessor="direct" init="0"/>
<type name="float" base="FLOAT" cpp="float" encode="@.putFloat(#)" decode="# = @.getFloat()" stream="#" size="4" accessor="direct" init="0."/>
<type name="double" base="DOUBLE" cpp="double" encode="@.putDouble(#)" decode="# = @.getDouble()" stream="#" size="8" accessor="direct" init="0."/>
-<type name="uuid" base="UUID" cpp="::qpid::messaging::Uuid"
+<type name="uuid" base="UUID" cpp="::qpid::types::Uuid"
encode="{::qpid::framing::Uuid _u(#.data()); _u.encode(@); }"
- decode="{::qpid::framing::Uuid _u; _u.decode(@); # = ::qpid::messaging::Uuid(_u.data());}"
- stream="#" size="16" accessor="direct" init="::qpid::messaging::Uuid()" byRef="y" unmap="(#).asUuid().data()" map="::qpid::messaging::Uuid((#).data())" />
-<type name="map" base="FTABLE" cpp="::qpid::messaging::VariantMap"
+ decode="{::qpid::framing::Uuid _u; _u.decode(@); # = ::qpid::types::Uuid(_u.data());}"
+ stream="#" size="16" accessor="direct" init="::qpid::types::Uuid()" byRef="y" unmap="(#).asUuid().data()" map="::qpid::types::Uuid((#).data())" />
+<type name="map" base="FTABLE" cpp="::qpid::types::VariantMap"
encode="{::qpid::framing::FieldTable _f = ManagementAgent::fromMap(#); _f.encode(@);}"
decode="{::qpid::framing::FieldTable _f; _f.decode(@); # = ManagementAgent::toMap(_f);}"
size="::qpid::framing::FieldTable(ManagementAgent::fromMap(#)).encodedSize()"
-stream="#" accessor="direct" init="::qpid::messaging::VariantMap()" byRef="y" unmap="::qpid::messaging::VariantMap(); assert(false); /*TBD*/"/>
-<type name="list" base="LIST" cpp="::qpid::messaging::Variant::List"
+stream="#" accessor="direct" init="::qpid::types::VariantMap()" byRef="y" unmap="::qpid::types::VariantMap(); assert(false); /*TBD*/"/>
+<type name="list" base="LIST" cpp="::qpid::types::Variant::List"
encode="{::qpid::framing::List _l = ManagementAgent::fromList(#); _l.encode(@);}"
decode="{::qpid::framing::List _l; _l.decode(@); # = ManagementAgent::toList(_l);}"
-stream="#" size="#.encodedSize()" accessor="direct" init="::qpid::messaging::Variant::List()" byRef="y" unmap="::qpid::messaging::Variant::List(); assert(false); /*TBD*/"/>
+stream="#" size="#.encodedSize()" accessor="direct" init="::qpid::types::Variant::List()" byRef="y" unmap="::qpid::types::Variant::List(); assert(false); /*TBD*/"/>
<type name="hilo8" base="U8" cpp="uint8_t" encode="@.putOctet(#)" decode="# = @.getOctet()" style="wm" stream="#" size="1" accessor="counter" init="0"/>
<type name="hilo16" base="U16" cpp="uint16_t" encode="@.putShort(#)" decode="# = @.getShort()" style="wm" stream="#" size="2" accessor="counter" init="0"/>
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=929307&r1=929306&r2=929307&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 30 21:35:08 2010
@@ -260,26 +260,26 @@ class SchemaType:
key = varName
if self.style != "mma":
var_cast = self.map.replace("#", varName)
- stream.write(indent + mapName + "[\"" + key + "\"] = Variant(" + var_cast + ");\n")
+ stream.write(indent + mapName + "[\"" + key + "\"] = ::qpid::types::Variant(" + var_cast + ");\n")
if self.style == "wm":
var_cast_hi = self.map.replace("#", varName + "High")
var_cast_lo = self.map.replace("#", varName + "Low")
stream.write(indent + mapName + "[\"" + key + "High\"] = " +
- "Variant(" + var_cast_hi + ");\n")
+ "::qpid::types::Variant(" + var_cast_hi + ");\n")
stream.write(indent + mapName + "[\"" + key + "Low\"] = " +
- "Variant(" + var_cast_lo + ");\n")
+ "::qpid::types::Variant(" + var_cast_lo + ");\n")
if self.style == "mma":
var_cast = self.map.replace("#", varName + "Count")
- stream.write(indent + mapName + "[\"" + key + "Count\"] = " + "Variant(" + var_cast + ");\n")
+ stream.write(indent + mapName + "[\"" + key + "Count\"] = " + "::qpid::types::Variant(" + var_cast + ");\n")
var_cast = self.map.replace("#", varName + "Min")
stream.write(indent + mapName + "[\"" + key + "Min\"] = " +
- "(" + varName + "Count ? Variant(" + var_cast + ") : Variant(0));\n")
+ "(" + varName + "Count ? ::qpid::types::Variant(" + var_cast + ") : ::qpid::types::Variant(0));\n")
var_cast = self.map.replace("#", varName + "Max")
- stream.write(indent + mapName + "[\"" + key + "Max\"] = " + "Variant(" + var_cast + ");\n")
+ stream.write(indent + mapName + "[\"" + key + "Max\"] = " + "::qpid::types::Variant(" + var_cast + ");\n")
var_cast = self.map.replace("#", "(" + varName + "Total / " + varName + "Count)")
stream.write(indent + mapName + "[\"" + key + "Avg\"] = " +
- "(" + varName + "Count ? Variant(" + var_cast + ") : Variant(0));\n")
+ "(" + varName + "Count ? ::qpid::types::Variant(" + var_cast + ") : ::qpid::types::Variant(0));\n")
def getReadCode (self, varName, bufName):
result = self.decode.replace ("@", bufName).replace ("#", varName)
@@ -445,7 +445,7 @@ class SchemaProperty:
def genSchemaMap(self, stream):
stream.write (" {\n")
- stream.write (" ::qpid::messaging::VariantMap _value;\n")
+ stream.write (" ::qpid::types::VariantMap _value;\n")
stream.write (" _value[TYPE] = TYPE_" + self.type.type.base +";\n")
stream.write (" _value[ACCESS] = ACCESS_" + self.access + ";\n")
stream.write (" _value[IS_INDEX] = " + str (self.isIndex) + ";\n")
@@ -604,7 +604,7 @@ class SchemaStatistic:
def genSchemaTextMap(self, stream, name, desc):
stream.write (" {\n")
- stream.write (" ::qpid::messaging::VariantMap _value;\n")
+ stream.write (" ::qpid::types::VariantMap _value;\n")
stream.write (" _value[TYPE] = TYPE_" + self.type.type.base +";\n")
if self.unit != None:
stream.write (" _value[UNIT] = \"" + self.unit + "\";\n")
@@ -803,7 +803,7 @@ class SchemaArg:
def genSchemaMap (self, stream, event=False):
stream.write (" {\n")
- stream.write (" ::qpid::messaging::VariantMap _avalue;\n")
+ stream.write (" ::qpid::types::VariantMap _avalue;\n")
stream.write (" _avalue[TYPE] = TYPE_" + self.type.type.base +";\n")
if (not event):
stream.write (" _avalue[DIR] = \"" + self.dir + "\";\n")
@@ -906,8 +906,8 @@ class SchemaMethod:
def genSchemaMap (self, stream, variables):
stream.write (" {\n")
- stream.write (" ::qpid::messaging::VariantMap _value;\n")
- stream.write (" ::qpid::messaging::VariantMap _args;\n")
+ stream.write (" ::qpid::types::VariantMap _value;\n")
+ stream.write (" ::qpid::types::VariantMap _args;\n")
stream.write (" _value[ARGCOUNT] = " + str(len(self.args)) + ";\n")
if self.desc != None:
stream.write (" _value[DESC] = \"" + self.desc + "\";\n")
@@ -1247,17 +1247,17 @@ class SchemaClass:
if methodCount == 0:
stream.write ("string&," +
- " const ::qpid::messaging::VariantMap&," +
- " ::qpid::messaging::VariantMap& outMap")
+ " const ::qpid::types::VariantMap&," +
+ " ::qpid::types::VariantMap& outMap")
else:
if inArgCount == 0:
stream.write ("string& methodName," +
- " const ::qpid::messaging::VariantMap&," +
- " ::qpid::messaging::VariantMap& outMap")
+ " const ::qpid::types::VariantMap&," +
+ " ::qpid::types::VariantMap& outMap")
else:
stream.write ("string& methodName," +
- " const ::qpid::messaging::VariantMap& inMap," +
- " ::qpid::messaging::VariantMap& outMap")
+ " const ::qpid::types::VariantMap& inMap," +
+ " ::qpid::types::VariantMap& outMap")
def genHiLoStatResets (self, stream, variables):
for inst in self.statistics:
@@ -1389,7 +1389,7 @@ class SchemaClass:
stream.write (" ::qpid::management::ArgsNone ioArgs;\n")
else:
stream.write (" Args" + method.getFullName () + " ioArgs;\n")
- stream.write (" ::qpid::messaging::VariantMap::const_iterator _i;\n")
+ stream.write (" ::qpid::types::VariantMap::const_iterator _i;\n")
# decode each input argument from the input map
for arg in method.args:
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.cpp Tue Mar 30 21:35:08 2010
@@ -30,7 +30,6 @@
#include <iostream>
using namespace qmf::/*MGEN:Class.Namespace*/;
-using namespace qpid::messaging;
using qpid::management::ManagementAgent;
using qpid::management::Manageable;
using qpid::management::ManagementObject;
@@ -274,11 +273,11 @@ std::string /*MGEN:Class.NameCap*/::getK
-void /*MGEN:Class.NameCap*/::mapEncodeValues (::qpid::messaging::VariantMap& _map,
+void /*MGEN:Class.NameCap*/::mapEncodeValues (::qpid::types::VariantMap& _map,
bool includeProperties,
bool includeStatistics)
{
- using namespace ::qpid::messaging;
+ using namespace ::qpid::types;
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
if (includeProperties) {
@@ -317,9 +316,9 @@ void /*MGEN:Class.NameCap*/::mapEncodeVa
}
}
-void /*MGEN:Class.NameCap*/::mapDecodeValues (const ::qpid::messaging::VariantMap& _map)
+void /*MGEN:Class.NameCap*/::mapDecodeValues (const ::qpid::types::VariantMap& _map)
{
- ::qpid::messaging::VariantMap::const_iterator _i;
+ ::qpid::types::VariantMap::const_iterator _i;
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
/*MGEN:IF(Class.ExistOptionals)*/
bool _found;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Class.h Tue Mar 30 21:35:08 2010
@@ -75,13 +75,13 @@ class /*MGEN:Class.NameCap*/ : public ::
/*MGEN:ENDIF*/
public:
static void writeSchema(std::string& schema);
- void mapEncodeValues(::qpid::messaging::VariantMap& map,
+ void mapEncodeValues(::qpid::types::VariantMap& map,
bool includeProperties=true,
bool includeStatistics=true);
- void mapDecodeValues(const ::qpid::messaging::VariantMap& map);
+ void mapDecodeValues(const ::qpid::types::VariantMap& map);
void doMethod(std::string& methodName,
- const ::qpid::messaging::VariantMap& inMap,
- ::qpid::messaging::VariantMap& outMap);
+ const ::qpid::types::VariantMap& inMap,
+ ::qpid::types::VariantMap& outMap);
std::string getKey() const;
/*MGEN:IF(Root.GenQMFv1)*/
uint32_t writePropertiesSize() const;
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.cpp Tue Mar 30 21:35:08 2010
@@ -68,7 +68,6 @@ void Event/*MGEN:Event.NameCap*/::writeS
buf.putShortString (packageName); // Package Name
buf.putShortString (eventName); // Event Name
buf.putBin128 (md5Sum); // Schema Hash
- buf.putOctet (0); // No Superclass
buf.putShort (/*MGEN:Event.ArgCount*/); // Argument Count
// Arguments
@@ -94,8 +93,8 @@ void Event/*MGEN:Event.NameCap*/::encode
buf.getRawData(_sBuf, _bufLen);
}
-void Event/*MGEN:Event.NameCap*/::mapEncode(::qpid::messaging::VariantMap& map) const
+void Event/*MGEN:Event.NameCap*/::mapEncode(::qpid::types::VariantMap& map) const
{
- using namespace ::qpid::messaging;
+ using namespace ::qpid::types;
/*MGEN:Event.ArgMap*/
}
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.h
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.h?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.h (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/managementgen/qmfgen/templates/Event.h Tue Mar 30 21:35:08 2010
@@ -52,7 +52,7 @@ class Event/*MGEN:Event.NameCap*/ : publ
uint8_t* getMd5Sum() const { return md5Sum; }
uint8_t getSeverity() const { return /*MGEN:Event.Severity*/; }
void encode(std::string& buffer) const;
- void mapEncode(::qpid::messaging::VariantMap& map) const;
+ void mapEncode(::qpid::types::VariantMap& map) const;
};
}/*MGEN:Event.CloseNamespaces*/
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/CMakeLists.txt?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/CMakeLists.txt Tue Mar 30 21:35:08 2010
@@ -567,6 +567,8 @@ set (qpidcommon_SOURCES
qpid/SessionId.cpp
qpid/StringUtils.cpp
qpid/Url.cpp
+ qpid/types/Uuid.cpp
+ qpid/types/Variant.cpp
qpid/amqp_0_10/SessionHandler.cpp
qpid/framing/AccumulatedAck.cpp
qpid/framing/AMQBody.cpp
@@ -677,6 +679,7 @@ set (qpidclient_SOURCES
qpid/messaging/AddressParser.cpp
qpid/messaging/Connection.cpp
qpid/messaging/ConnectionImpl.h
+ qpid/messaging/Duration.cpp
qpid/messaging/ListContent.cpp
qpid/messaging/ListView.cpp
qpid/messaging/MapContent.cpp
@@ -690,8 +693,6 @@ set (qpidclient_SOURCES
qpid/messaging/SessionImpl.h
qpid/messaging/Sender.cpp
qpid/messaging/SenderImpl.h
- qpid/messaging/Uuid.cpp
- qpid/messaging/Variant.cpp
qpid/client/amqp0_10/AcceptTracker.h
qpid/client/amqp0_10/AcceptTracker.cpp
qpid/client/amqp0_10/AddressResolution.h
Modified: qpid/branches/qmf-devel0.7a/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/qmf-devel0.7a/qpid/cpp/src/Makefile.am?rev=929307&r1=929306&r2=929307&view=diff
==============================================================================
--- qpid/branches/qmf-devel0.7a/qpid/cpp/src/Makefile.am (original)
+++ qpid/branches/qmf-devel0.7a/qpid/cpp/src/Makefile.am Tue Mar 30 21:35:08 2010
@@ -427,6 +427,8 @@ libqpidcommon_la_SOURCES += \
qpid/memory.h \
qpid/pointer_to_other.h \
qpid/ptr_map.h \
+ qpid/types/Uuid.cpp \
+ qpid/types/Variant.cpp \
qpid/sys/AggregateOutput.cpp \
qpid/sys/AggregateOutput.h \
qpid/sys/AsynchIO.h \
@@ -707,6 +709,7 @@ libqpidclient_la_SOURCES = \
qpid/messaging/AddressParser.h \
qpid/messaging/AddressParser.cpp \
qpid/messaging/Connection.cpp \
+ qpid/messaging/Duration.cpp \
qpid/messaging/ListContent.cpp \
qpid/messaging/ListView.cpp \
qpid/messaging/MapContent.cpp \
@@ -718,8 +721,6 @@ libqpidclient_la_SOURCES = \
qpid/messaging/Sender.cpp \
qpid/messaging/Receiver.cpp \
qpid/messaging/Session.cpp \
- qpid/messaging/Uuid.cpp \
- qpid/messaging/Variant.cpp \
qpid/messaging/ConnectionImpl.h \
qpid/messaging/SenderImpl.h \
qpid/messaging/ReceiverImpl.h \
@@ -832,8 +833,8 @@ nobase_include_HEADERS += \
../include/qpid/messaging/Receiver.h \
../include/qpid/messaging/Sender.h \
../include/qpid/messaging/Session.h \
- ../include/qpid/messaging/Uuid.h \
- ../include/qpid/messaging/Variant.h \
+ ../include/qpid/types/Uuid.h \
+ ../include/qpid/types/Variant.h \
../include/qpid/client/amqp0_10/Codecs.h \
../include/qpid/client/amqp0_10/FailoverUpdates.h
Propchange: qpid/branches/qmf-devel0.7a/qpid/cpp/src/qmf/engine/Agent.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 30 21:35:08 2010
@@ -1 +1 @@
-/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:919043-928107
+/qpid/trunk/qpid/cpp/src/qmf/engine/Agent.cpp:919043-929244
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org