You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2009/10/05 14:52:10 UTC

svn commit: r821779 [1/11] - in /qpid/branches/java-broker-0-10/qpid: ./ cpp/ cpp/bindings/qmf/ cpp/bindings/qmf/python/ cpp/bindings/qmf/python/qmf/ cpp/bindings/qmf/ruby/ cpp/bindings/qmf/tests/ cpp/examples/messaging/ cpp/include/qmf/ cpp/include/qp...

Author: rgodfrey
Date: Mon Oct  5 12:51:57 2009
New Revision: 821779

URL: http://svn.apache.org/viewvc?rev=821779&view=rev
Log:
Merged from trunk up to r816580

Added:
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/qmf.py
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/bindings/qmf/python/qmf.py
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/tests/python_agent.py
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/bindings/qmf/tests/python_agent.py
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/tests/ruby_console.rb
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/bindings/qmf/tests/ruby_console.rb
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/BrokerProxyImpl.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qmf/BrokerProxyImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/BrokerProxyImpl.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qmf/BrokerProxyImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ConsoleEngineImpl.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qmf/ConsoleEngineImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ConsoleEngineImpl.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qmf/ConsoleEngineImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/Protocol.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qmf/Protocol.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/Protocol.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qmf/Protocol.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/SequenceManager.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qmf/SequenceManager.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/SequenceManager.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qmf/SequenceManager.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/CodecsInternal.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/CodecsInternal.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/MessageImpl.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/messaging/MessageImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/sys/uuid.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/sys/uuid.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/sys/windows/uuid.h
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/qpid_stream.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/cpp/src/tests/qpid_stream.cpp
    qpid/branches/java-broker-0-10/qpid/java/doc/broker-priority-queue-subscription.dia
      - copied unchanged from r816580, qpid/trunk/qpid/java/doc/broker-priority-queue-subscription.dia
    qpid/branches/java-broker-0-10/qpid/java/doc/broker-queue-subscription.dia
      - copied unchanged from r816580, qpid/trunk/qpid/java/doc/broker-queue-subscription.dia
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-New.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/config-systests-acl-settings.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/config-systests-acl-settings.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/config-systests-acl.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/config-systests-acl.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/config-systests-derby-settings.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/config-systests-derby-settings.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/config-systests-derby.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/config-systests-settings.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/config-systests-settings.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/config-systests.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/config-systests.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/etc/virtualhosts-ServerConfigurationTest-New.xml
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
      - copied unchanged from r816580, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
    qpid/branches/java-broker-0-10/qpid/python/qpid/concurrency.py
      - copied unchanged from r816580, qpid/trunk/qpid/python/qpid/concurrency.py
    qpid/branches/java-broker-0-10/qpid/python/qpid/driver.py
      - copied unchanged from r816580, qpid/trunk/qpid/python/qpid/driver.py
    qpid/branches/java-broker-0-10/qpid/wcf/
      - copied from r816580, qpid/trunk/qpid/wcf/
    qpid/branches/java-broker-0-10/qpid/wcf/QpidWcf.sln
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/QpidWcf.sln
    qpid/branches/java-broker-0-10/qpid/wcf/ReadMe.txt
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/ReadMe.txt
    qpid/branches/java-broker-0-10/qpid/wcf/samples/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/
      - copied from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
    qpid/branches/java-broker-0-10/qpid/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
    qpid/branches/java-broker-0-10/qpid/wcf/src/
      - copied from r816580, qpid/trunk/qpid/wcf/src/
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/
      - copied from r816580, qpid/trunk/qpid/wcf/src/Apache/
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/
      - copied from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/
      - copied from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/
      - copied from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/
      - copied from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/Channel.csproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/Channel.csproj
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/Properties/
      - copied from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/Properties/
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/RawMessage.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/RawMessage.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/
      - copied from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/InputLink.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/InputLink.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/QpidException.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/QpidException.h
    qpid/branches/java-broker-0-10/qpid/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
    qpid/branches/java-broker-0-10/qpid/wcf/test/
      - copied from r816580, qpid/trunk/qpid/wcf/test/
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/
      - copied from r816580, qpid/trunk/qpid/wcf/test/Apache/
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/
      - copied from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/
      - copied from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/
      - copied from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/
      - copied from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/
      - copied from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
    qpid/branches/java-broker-0-10/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
    qpid/branches/java-broker-0-10/qpid/wcf/tools/
      - copied from r816580, qpid/trunk/qpid/wcf/tools/
    qpid/branches/java-broker-0-10/qpid/wcf/tools/QCreate/
      - copied from r816580, qpid/trunk/qpid/wcf/tools/QCreate/
    qpid/branches/java-broker-0-10/qpid/wcf/tools/QCreate/QCreate.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/tools/QCreate/QCreate.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/tools/QCreate/QCreate.sln
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/tools/QCreate/QCreate.sln
    qpid/branches/java-broker-0-10/qpid/wcf/tools/QCreate/QCreate.vcproj
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/tools/QCreate/QCreate.vcproj
    qpid/branches/java-broker-0-10/qpid/wcf/tools/QCreate/ReadMe.txt
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/tools/QCreate/ReadMe.txt
    qpid/branches/java-broker-0-10/qpid/wcf/tools/QCreate/stdafx.cpp
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/tools/QCreate/stdafx.cpp
    qpid/branches/java-broker-0-10/qpid/wcf/tools/QCreate/stdafx.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/tools/QCreate/stdafx.h
    qpid/branches/java-broker-0-10/qpid/wcf/tools/QCreate/targetver.h
      - copied unchanged from r816580, qpid/trunk/qpid/wcf/tools/QCreate/targetver.h
Removed:
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/qmf/
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/sys/uuid.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/sys/windows/uuid.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/CompletionTracker.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/CompletionTracker.h
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/acl.config.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/config-systests-derby.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/config-systests.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/persistent_config-config-test.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/sample-parsed-config.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/virtualhosts-config-test.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/virtualhosts-systests.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/virtualhosts.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/network/FirewallFactory.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/SelectorTest.java
Modified:
    qpid/branches/java-broker-0-10/qpid/   (props changed)
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/Makefile.am
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/Makefile.am
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/python.i
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/qmfengine.i
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/ruby/qmf.rb
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/tests/Makefile.am
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/tests/agent_ruby.rb
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/tests/python_console.py
    qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/tests/run_interop_tests
    qpid/branches/java-broker-0-10/qpid/cpp/configure.ac
    qpid/branches/java-broker-0-10/qpid/cpp/examples/messaging/server.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/include/qmf/QmfImportExport.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/framing/FieldTable.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/framing/List.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/framing/Uuid.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/management/Manageable.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/messaging/Connection.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/messaging/Message.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/messaging/Receiver.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/messaging/Sender.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/messaging/Session.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/messaging/Variant.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/sys/windows/Condition.h
    qpid/branches/java-broker-0-10/qpid/cpp/include/qpid/sys/windows/Mutex.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/CMakeLists.txt
    qpid/branches/java-broker-0-10/qpid/cpp/src/Makefile.am
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf.mk
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/AgentEngine.cpp   (contents, props changed)
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/AgentEngine.h   (contents, props changed)
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ConsoleEngine.h   (contents, props changed)
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/Object.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ObjectId.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ObjectIdImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ObjectIdImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ObjectImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ObjectImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/Query.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/QueryImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/QueryImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ResilientConnection.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ResilientConnection.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/Schema.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/SchemaImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/SchemaImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/Value.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ValueImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qmf/ValueImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/acl/AclData.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/acl/AclData.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/acl/AclReader.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/AclModule.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/Broker.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/Connection.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/Exchange.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/Link.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/Message.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/Message.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/PersistableMessage.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/PersistableMessage.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/Queue.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/QueueRegistry.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/Dispatcher.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/Codecs.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/MessageSink.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/cluster/Connection.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/framing/Uuid.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/management/Manageable.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/management/ManagementAgent.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/Address.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/Message.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/Receiver.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/Sender.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/SenderImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/Session.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/SessionImpl.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/messaging/Variant.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/qpid/xml/XmlExchange.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/AccumulatedAckTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/Array.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/AsyncCompletion.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/AtomicValue.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/BrokerFixture.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/CMakeLists.txt
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ClientMessageTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ClientSessionTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ClusterFailover.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ClusterFixture.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ClusterFixture.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ConnectionOptions.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ConsoleTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/DeliveryRecordTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/DispatcherTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/DtxWorkRecordTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ExchangeTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/FieldTable.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/FieldValue.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ForkedBroker.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ForkedBroker.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/Frame.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/FrameDecoder.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/FramingTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/HeaderTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/HeadersExchangeTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/IncompleteMessageList.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/InlineAllocator.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/InlineVector.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/Makefile.am
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ManagementTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/MessageBuilderTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/MessageReplayTracker.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/MessageTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/MessageUtils.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/MessagingSessionTests.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/PartialFailure.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/PollableCondition.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ProxyTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/QueueEvents.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/QueueOptionsTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/QueuePolicyTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/QueueRegistryTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/QueueTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/RangeSet.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/RateFlowcontrolTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/RefCounted.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/ReplicationTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/RetryList.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/SequenceNumberTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/SequenceSet.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/SessionState.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/Shlib.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/SocketProxy.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/TestMessageStore.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/TestOptions.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/TimerTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/TopicExchangeTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/TxBufferTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/TxMocks.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/TxPublishTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/Url.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/Uuid.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/Variant.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/XmlClientSessionTest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/acl.py
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/client_test.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/cluster_python_tests_failing.txt
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/cluster_test.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/consume.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/datagen.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/echotest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/exception_test.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/failover_soak.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/federation.py
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/latencytest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/logging.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/perftest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/publish.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/qpid_ping.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/qrsh.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/qrsh_server.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/receiver.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/replaying_sender.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/resuming_receiver.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/sender.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/shlibtest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/test_store.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/test_tools.h
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/topic_listener.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/topic_publisher.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/txjob.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/txshift.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/tests/txtest.cpp
    qpid/branches/java-broker-0-10/qpid/cpp/src/windows/QpiddBroker.cpp
    qpid/branches/java-broker-0-10/qpid/java/   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/broker/   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/broker/bin/   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/broker/bin/qpid-passwd
    qpid/branches/java-broker-0-10/qpid/java/broker/bin/qpid-server
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/config.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/etc/log4j.xml
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/StartupRootMessageLogger.java
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/management/   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicACLPlugin.java
    qpid/branches/java-broker-0-10/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
    qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
    qpid/branches/java-broker-0-10/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/ExchangeDenier.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/AMQAuthenticationException.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionTuneMethodHandler.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQIoTransportProtocolSession.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
    qpid/branches/java-broker-0-10/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AlertingTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/DerbyMessageStoreLoggingTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/MemoryMessageStoreLoggingTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/VirtualHostLoggingTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
    qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/010Excludes   (contents, props changed)
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/08Excludes   (contents, props changed)
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/08TransientExcludes   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/Excludes   (contents, props changed)
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/XAExcludes   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.excludes   (props changed)
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile
    qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile
    qpid/branches/java-broker-0-10/qpid/python/Makefile
    qpid/branches/java-broker-0-10/qpid/python/qpid/datatypes.py
    qpid/branches/java-broker-0-10/qpid/python/qpid/delegates.py
    qpid/branches/java-broker-0-10/qpid/python/qpid/messaging.py
    qpid/branches/java-broker-0-10/qpid/python/qpid/ops.py
    qpid/branches/java-broker-0-10/qpid/python/qpid/tests/messaging.py
    qpid/branches/java-broker-0-10/qpid/python/qpid/util.py
    qpid/branches/java-broker-0-10/qpid/python/tests/datatypes.py
    qpid/branches/java-broker-0-10/qpid/python/tests_0-10/alternate_exchange.py
    qpid/branches/java-broker-0-10/qpid/python/tests_0-10/management.py
    qpid/branches/java-broker-0-10/qpid/python/tests_0-9/queue.py   (props changed)
    qpid/branches/java-broker-0-10/qpid/specs/management-schema.xml

Propchange: qpid/branches/java-broker-0-10/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct  5 12:51:57 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:796196-807984
+/qpid/trunk/qpid:796196-816580

Modified: qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/Makefile.am?rev=821779&r1=821778&r2=821779&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/Makefile.am (original)
+++ qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/Makefile.am Mon Oct  5 12:51:57 2009
@@ -20,6 +20,14 @@
 if HAVE_SWIG
 
 EXTRA_DIST = qmfengine.i
-SUBDIRS = ruby tests
+SUBDIRS = tests
+
+if HAVE_RUBY_DEVEL
+SUBDIRS += ruby
+endif
+
+if HAVE_PYTHON_DEVEL
+SUBDIRS += python
+endif
 
 endif

Modified: qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/Makefile.am?rev=821779&r1=821778&r2=821779&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/Makefile.am (original)
+++ qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/Makefile.am Mon Oct  5 12:51:57 2009
@@ -29,17 +29,18 @@
 BUILT_SOURCES = $(generated_file_list)
 
 $(generated_file_list): $(srcdir)/python.i $(srcdir)/../qmfengine.i
-	swig -python -c++ -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp $(srcdir)/python.i
+	swig -c++ -python -Wall -I/usr/include $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -o qmfengine.cpp $(srcdir)/python.i
 
 pylibdir = $(PYTHON_LIB)
 
 lib_LTLIBRARIES = _qmfengine.la
 
-_qmfengine_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
-_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmfcommon.la
+#_qmfengine_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)"
+#_qmfengine_la_LDFLAGS = -avoid-version -module -shrext ".so"
+_qmfengine_la_LDFLAGS = -avoid-version -module -shared
+_qmfengine_la_LIBADD = $(PYTHON_LIBS) -L$(top_builddir)/src/.libs -lqpidclient $(top_builddir)/src/libqmfagent.la
 _qmfengine_la_CXXFLAGS = $(INCLUDES) -I$(srcdir)/qmf -I$(PYTHON_INC)
-_qmfengine_la_SOURCES = \
-	qmfengine.cpp
+nodist__qmfengine_la_SOURCES = qmfengine.cpp
 
 CLEANFILES = $(generated_file_list)
 

Modified: qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/python.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/python.i?rev=821779&r1=821778&r2=821779&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/python.i (original)
+++ qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/python/python.i Mon Oct  5 12:51:57 2009
@@ -19,17 +19,125 @@
 
 %module qmfengine
 
-// These are probably wrong.. just to get it to compile for now.
-%typemap (in) void *
-{
-    $1 = (void *) $input;
+
+/* unsigned32 Convert from Python --> C */
+%typemap(in) uint32_t {
+    if (PyInt_Check($input)) {
+        $1 = (uint32_t) PyInt_AsUnsignedLongMask($input);
+    } else if (PyLong_Check($input)) {
+        $1 = (uint32_t) PyLong_AsUnsignedLong($input);
+    } else {
+        SWIG_exception_fail(SWIG_ValueError, "unknown integer type");
+    }
+}
+
+/* unsinged32 Convert from C --> Python */
+%typemap(out) uint32_t {
+    $result = PyInt_FromLong((long)$1);
+}
+
+
+/* unsigned16 Convert from Python --> C */
+%typemap(in) uint16_t {
+    if (PyInt_Check($input)) {
+        $1 = (uint16_t) PyInt_AsUnsignedLongMask($input);
+    } else if (PyLong_Check($input)) {
+        $1 = (uint16_t) PyLong_AsUnsignedLong($input);
+    } else {
+        SWIG_exception_fail(SWIG_ValueError, "unknown integer type");
+    }
+}
+
+/* unsigned16 Convert from C --> Python */
+%typemap(out) uint16_t {
+    $result = PyInt_FromLong((long)$1);
+}
+
+
+/* signed32 Convert from Python --> C */
+%typemap(in) int32_t {
+    if (PyInt_Check($input)) {
+        $1 = (int32_t) PyInt_AsLong($input);
+    } else if (PyLong_Check($input)) {
+        $1 = (int32_t) PyLong_AsLong($input);
+    } else {
+        SWIG_exception_fail(SWIG_ValueError, "unknown integer type");
+    }
+}
+
+/* signed32 Convert from C --> Python */
+%typemap(out) int32_t {
+    $result = PyInt_FromLong((long)$1);
+}
+
+
+/* unsigned64 Convert from Python --> C */
+%typemap(in) uint64_t {
+%#ifdef HAVE_LONG_LONG
+    if (PyLong_Check($input)) {
+        $1 = (uint64_t)PyLong_AsUnsignedLongLong($input);
+    } else if (PyInt_Check($input)) {
+        $1 = (uint64_t)PyInt_AsUnsignedLongLongMask($input);
+    } else
+%#endif
+    {
+        SWIG_exception_fail(SWIG_ValueError, "unsupported integer size - uint64_t input too large");
+    }
+}
+
+/* unsigned64 Convert from C --> Python */
+%typemap(out) uint64_t {
+%#ifdef HAVE_LONG_LONG
+    $result = PyLong_FromUnsignedLongLong((unsigned PY_LONG_LONG)$1);
+%#else
+    SWIG_exception_fail(SWIG_ValueError, "unsupported integer size - uint64_t output too large");
+%#endif
+}
+
+/* signed64 Convert from Python --> C */
+%typemap(in) int64_t {
+%#ifdef HAVE_LONG_LONG
+    if (PyLong_Check($input)) {
+        $1 = (int64_t)PyLong_AsLongLong($input);
+    } else if (PyInt_Check($input)) {
+        $1 = (int64_t)PyInt_AsLong($input);
+    } else
+%#endif
+    {
+        SWIG_exception_fail(SWIG_ValueError, "unsupported integer size - int64_t input too large");
+    }
+}
+
+/* signed64 Convert from C --> Python */
+%typemap(out) int64_t {
+%#ifdef HAVE_LONG_LONG
+    $result = PyLong_FromLongLong((PY_LONG_LONG)$1);
+%#else
+    SWIG_exception_fail(SWIG_ValueError, "unsupported integer size - int64_t output too large");
+%#endif
 }
 
-%typemap (out) void *
-{
+
+/* Convert from Python --> C */
+%typemap(in) void * {
+    $1 = (void *)$input;
+}
+
+/* Convert from C --> Python */
+%typemap(out) void * {
     $result = (PyObject *) $1;
+    Py_INCREF($result);
+}
+
+%typemap (typecheck, precedence=SWIG_TYPECHECK_UINT64) uint64_t {
+    $1 = PyLong_Check($input) ? 1 : 0;
 }
 
+%typemap (typecheck, precedence=SWIG_TYPECHECK_UINT32) uint32_t {
+    $1 = PyInt_Check($input) ? 1 : 0;
+}
+
+
 
 %include "../qmfengine.i"
 

Modified: qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/qmfengine.i
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/qmfengine.i?rev=821779&r1=821778&r2=821779&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/qmfengine.i (original)
+++ qpid/branches/java-broker-0-10/qpid/cpp/bindings/qmf/qmfengine.i Mon Oct  5 12:51:57 2009
@@ -20,7 +20,8 @@
 %{
 
 #include "qmf/AgentEngine.h"
-#include <qmf/ResilientConnection.h>
+#include "qmf/ConsoleEngine.h"
+#include "qmf/ResilientConnection.h"
 
 %}
 
@@ -28,6 +29,7 @@
 %include <qmf/Query.h>
 %include <qmf/Message.h>
 %include <qmf/AgentEngine.h>
+%include <qmf/ConsoleEngine.h>
 %include <qmf/ConnectionSettings.h>
 %include <qmf/ResilientConnection.h>
 %include <qmf/Typecode.h>



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